imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-10-30 22:03:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

riscv/mm/fault: Simplify fault error handling

Browse Source 
Move fault error handling after retry logic. This simplifies the code
flow and makes it easier to move fault error handling to its own
function.

Signed-off-by: Pekka Enberg <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
This commit is contained in:
Pekka Enberg authored and Palmer Dabbelt committed 2020-09-15 18:46:01 -07:00
1 parent ac416a724f
commit bda281d5bf
1 file changed
+8 -10
Download Patch File Download Diff File Expand all files Collapse all files
arch/riscv/mm/fault.c
+8 -10
View File
@@ -247,14 +247,6 @@ good_area:
if (fault_signal_pending(fault, regs))
return;
if (unlikely(fault & VM_FAULT_ERROR)) {
if (fault & VM_FAULT_OOM)
goto out_of_memory;
else if (fault & VM_FAULT_SIGBUS)
goto do_sigbus;
BUG();
}
if (unlikely((fault & VM_FAULT_RETRY) && (flags & FAULT_FLAG_ALLOW_RETRY))) {
flags |= FAULT_FLAG_TRIED;
@@ -267,6 +259,14 @@ good_area:
}
mmap_read_unlock(mm);
if (unlikely(fault & VM_FAULT_ERROR)) {
if (fault & VM_FAULT_OOM)
goto out_of_memory;
else if (fault & VM_FAULT_SIGBUS)
goto do_sigbus;
BUG();
}
return;
/*
@@ -274,7 +274,6 @@ good_area:
* (which will retry the fault, or kill us if we got oom-killed).
*/
out_of_memory:
mmap_read_unlock(mm);
if (!user_mode(regs)) {
no_context(regs, addr);
return;
@@ -283,7 +282,6 @@ out_of_memory:
return;
do_sigbus:
mmap_read_unlock(mm);
/* Kernel mode? Handle exceptions or die */
if (!user_mode(regs)) {
no_context(regs, addr);