openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

powerpc/traps: restore recoverability of machine_check interrupts 

commit b96672dd84 ("powerpc: Machine check interrupt is a non-
maskable interrupt") added a call to nmi_enter() at the beginning of
machine check restart exception handler. Due to that, in_interrupt()
always returns true regardless of the state before entering the
exception, and die() panics even when the system was not already in
interrupt.

This patch calls nmi_exit() before calling die() in order to restore
the interrupt state we had before calling nmi_enter()

Fixes: b96672dd84 ("powerpc: Machine check interrupt is a non-maskable interrupt")
Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Christophe Leroy 2018-10-13 09:16:22 +00:00 committed by Michael Ellerman
parent b851ba02a6
commit daf00ae71d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/powerpc/kernel/traps.c
View File

@ -763,12 +763,17 @@ void machine_check_exception(struct pt_regs *regs)
if (check_io_access(regs)) if (check_io_access(regs))
goto bail; goto bail;
die("Machine check", regs, SIGBUS);
/* Must die if the interrupt is not recoverable */ /* Must die if the interrupt is not recoverable */
if (!(regs->msr & MSR_RI)) if (!(regs->msr & MSR_RI))
nmi_panic(regs, "Unrecoverable Machine check"); nmi_panic(regs, "Unrecoverable Machine check");
if (!nested)
nmi_exit();
die("Machine check", regs, SIGBUS);
return;
bail: bail:
if (!nested) if (!nested)
nmi_exit(); nmi_exit();