Commit 7a75f3d4 authored by Pekka Enberg's avatar Pekka Enberg Committed by Palmer Dabbelt

riscv/mm/fault: Simplify mm_fault_error()

Simplify the mm_fault_error() handling function by eliminating the
unnecessary gotos.
Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 6c11ffbf
...@@ -39,25 +39,18 @@ static inline void no_context(struct pt_regs *regs, unsigned long addr) ...@@ -39,25 +39,18 @@ static inline void no_context(struct pt_regs *regs, unsigned long addr)
static inline void mm_fault_error(struct pt_regs *regs, unsigned long addr, vm_fault_t fault) static inline void mm_fault_error(struct pt_regs *regs, unsigned long addr, vm_fault_t fault)
{ {
if (fault & VM_FAULT_OOM) if (fault & VM_FAULT_OOM) {
goto out_of_memory;
else if (fault & VM_FAULT_SIGBUS)
goto do_sigbus;
BUG();
/* /*
* We ran out of memory, call the OOM killer, and return the userspace * We ran out of memory, call the OOM killer, and return the userspace
* (which will retry the fault, or kill us if we got oom-killed). * (which will retry the fault, or kill us if we got oom-killed).
*/ */
out_of_memory:
if (!user_mode(regs)) { if (!user_mode(regs)) {
no_context(regs, addr); no_context(regs, addr);
return; return;
} }
pagefault_out_of_memory(); pagefault_out_of_memory();
return; return;
} else if (fault & VM_FAULT_SIGBUS) {
do_sigbus:
/* Kernel mode? Handle exceptions or die */ /* Kernel mode? Handle exceptions or die */
if (!user_mode(regs)) { if (!user_mode(regs)) {
no_context(regs, addr); no_context(regs, addr);
...@@ -65,6 +58,8 @@ static inline void mm_fault_error(struct pt_regs *regs, unsigned long addr, vm_f ...@@ -65,6 +58,8 @@ static inline void mm_fault_error(struct pt_regs *regs, unsigned long addr, vm_f
} }
do_trap(regs, SIGBUS, BUS_ADRERR, addr); do_trap(regs, SIGBUS, BUS_ADRERR, addr);
return; return;
}
BUG();
} }
static inline void bad_area(struct pt_regs *regs, struct mm_struct *mm, int code, unsigned long addr) static inline void bad_area(struct pt_regs *regs, struct mm_struct *mm, int code, unsigned long addr)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment