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

Commit 7d31464a authored by Julien Thierry's avatar Julien Thierry Committed by Catalin Marinas
Browse files

arm64: Handle serror in NMI context 



Per definition of the daifflags, Serrors can occur during any interrupt
context, that includes NMI contexts. Trying to nmi_enter in an nmi context
will crash.

Skip nmi_enter/nmi_exit when serror occurred during an NMI.

Suggested-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarJulien Thierry <julien.thierry@arm.com>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Dave Martin <dave.martin@arm.com>
Cc: James Morse <james.morse@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 101b35f7

arch/arm64/kernel/traps.c

+6 −2
Original line number Diff line number Diff line
@@ -898,12 +898,16 @@ bool arm64_is_fatal_ras_serror(struct pt_regs *regs, unsigned int esr) 


asmlinkage void do_serror(struct pt_regs *regs, unsigned int esr)

{

	const bool was_in_nmi = in_nmi();



	if (!was_in_nmi)

		nmi_enter();



	/* non-RAS errors are not containable */

	if (!arm64_is_ras_serror(esr) || arm64_is_fatal_ras_serror(regs, esr))

		arm64_serror_panic(regs, esr);



	if (!was_in_nmi)

		nmi_exit();

}