leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc: rearrange do_page_fault error case to be inside exception_enter

Browse Source 
This keeps the context tracking over the entire interrupt handler which
helps later with moving context tracking into interrupt wrappers.

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20210130130852.2952424-14-npiggin@gmail.com
This commit is contained in:
Nicholas Piggin 2021-01-30 23:08:23 +10:00 committed by Michael Ellerman
parent 71f47976fa
commit 4cb8428465
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arch/powerpc/mm/fault.c
View File

@ -545,19 +545,24 @@ NOKPROBE_SYMBOL(__do_page_fault);
long do_page_fault(struct pt_regs *regs) long do_page_fault(struct pt_regs *regs)
{ {
const struct exception_table_entry *entry; const struct exception_table_entry *entry;
enum ctx_state prev_state = exception_enter(); enum ctx_state prev_state;
int rc = __do_page_fault(regs, regs->dar, regs->dsisr); long err;
exception_exit(prev_state);
if (likely(!rc)) prev_state = exception_enter();
return 0; err = __do_page_fault(regs, regs->dar, regs->dsisr);
if (likely(!err))
goto out;
entry = search_exception_tables(regs->nip); entry = search_exception_tables(regs->nip);
if (unlikely(!entry)) if (likely(entry)) {
return rc; instruction_pointer_set(regs, extable_fixup(entry));
err = 0;
}
instruction_pointer_set(regs, extable_fixup(entry)); out:
exception_exit(prev_state);
return 0; return err;
} }
NOKPROBE_SYMBOL(do_page_fault); NOKPROBE_SYMBOL(do_page_fault);