x86/mce: Use idtentry_nmi_enter/exit() (bc21a291) · Commits · 戴 / test

The recent fix for NMI vs. IRQ state tracking missed to apply the cure to the MCE handler. Fixes: ("x86/entry: Fix NMI vs IRQ state tracking") Signed-off-by:

Thomas Gleixner <tglx@linutronix.de> Signed-off-by:

Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/87mu17ism2.fsf@nanos.tec.linutronix.de

arch/x86/kernel/cpu/mce/core.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1904,6 +1904,8 @@ void (machine_check_vector)(struct pt_regs ) = unexpected_machine_check;

		static __always_inline void exc_machine_check_kernel(struct pt_regs *regs)
		{
		bool irq_state;

		WARN_ON_ONCE(user_mode(regs));

		/*
		@@ -1914,7 +1916,7 @@ static __always_inline void exc_machine_check_kernel(struct pt_regs *regs)
		mce_check_crashing_cpu())
		return;

		nmi_enter();
		irq_state = idtentry_enter_nmi(regs);
		/*
		* The call targets are marked noinstr, but objtool can't figure
		* that out because it's an indirect call. Annotate it.
		@@ -1925,7 +1927,7 @@ static __always_inline void exc_machine_check_kernel(struct pt_regs *regs)
		if (regs->flags & X86_EFLAGS_IF)
		trace_hardirqs_on_prepare();
		instrumentation_end();
		nmi_exit();
		idtentry_exit_nmi(regs, irq_state);
		}

		static __always_inline void exc_machine_check_user(struct pt_regs *regs)

Admin message