Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b15f7b2 authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Greg Kroah-Hartman
Browse files

powerpc/traps: Make unrecoverable NMIs die instead of panic 



[ Upstream commit 265d6e588d87194c2fe2d6c240247f0264e0c19b ]

System Reset and Machine Check interrupts that are not recoverable due
to being nested or interrupting when RI=0 currently panic. This is not
necessary, and can often just kill the current context and recover.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Link: https://lore.kernel.org/r/20200508043408.886394-16-npiggin@gmail.com


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent ac819692

arch/powerpc/kernel/traps.c

+3 −3
Original line number Diff line number Diff line
@@ -430,11 +430,11 @@ void system_reset_exception(struct pt_regs *regs) 
#ifdef CONFIG_PPC_BOOK3S_64

	BUG_ON(get_paca()->in_nmi == 0);

	if (get_paca()->in_nmi > 1)

		nmi_panic(regs, "Unrecoverable nested System Reset");

		die("Unrecoverable nested System Reset", regs, SIGABRT);

#endif

	/* Must die if the interrupt is not recoverable */

	if (!(regs->msr & MSR_RI))

		nmi_panic(regs, "Unrecoverable System Reset");

		die("Unrecoverable System Reset", regs, SIGABRT);



	if (!nested)

		nmi_exit();
@@ -775,7 +775,7 @@ void machine_check_exception(struct pt_regs *regs) 


	/* Must die if the interrupt is not recoverable */

	if (!(regs->msr & MSR_RI))

		nmi_panic(regs, "Unrecoverable Machine check");

		die("Unrecoverable Machine check", regs, SIGBUS);



	return;