x86/crash: Fix double NMI shootdown bug
v2 cover x86/crash: Fix double NMI shootdown bug
Fix a double NMI shootdown bug found and debugged by Guilherme, who did all the hard work. NMI shootdown is a one-time thing; the handler leaves NMIs blocked and enters halt. At best, a second (or third...) shootdown is an expensive nop, at worst it can hang the kernel and prevent kexec'ing into a new kernel, e.g. prior to the hardening of register_nmi_handler(), a double shootdown resulted in a double list_add(), which is fatal when running with CONFIG_BUG_ON_DATA_CORRUPTION=y.
With the "right" kexec/kdump configuration, emergency_vmx_disable_all() can be reached after kdump_nmi_shootdown_cpus() (currently the only two users of nmi_shootdown_cpus()).
To fix, move the disabling of virtualization into crash_nmi_callback(), remove emergency_vmx_disable_all()'s callback, and do a shootdown for emergency_vmx_disable_all() if and only if a shootdown hasn't yet occurred. The only thing emergency_vmx_disable_all() cares about is disabling VMX/SVM (obviously), and since I can't envision a use case for an NMI shootdown that doesn't want to disable virtualization, doing that in the core handler means emergency_vmx_disable_all() only needs to ensure _a_ shootdown occurs, it doesn't care when that shootdown happened or what callback may have run.
Patch 2 is a related bug fix found while exploring ideas for patch 1. Patch 3 is a cleanup to try to prevent future "fixed VMX but not SVM" style bugs.
Guilherme and Vitaly, I dropped your Tested-by and Reviewed-by tags since the relevant patches changed a decent amount.
v2:
- Use a NULL handler and crash_ipi_issued instead of a magic nop handler. [tglx]
- Add comments to call out that modifying the existing handler once the NMI is sent may cause explosions.
- Add a patch to cleanup cpu_emergency_vmxoff().
v1: https://lore.kernel.org/all/[email protected]
Sean Christopherson (3):
x86/crash: Disable virt in core NMI crash handler to avoid double
shootdown
x86/reboot: Disable virtualization in an emergency if SVM is supported x86/virt: Fold __cpu_emergency_vmxoff() into its sole caller
arch/x86/include/asm/reboot.h | 1 + arch/x86/include/asm/virtext.h | 14 +----- arch/x86/kernel/crash.c | 16 +----- arch/x86/kernel/reboot.c | 89 +++++++++++++++++++++++++--------- 4 files changed, 69 insertions(+), 51 deletions(-)
base-commit: a7fed5c0431dbfa707037848830f980e0f93cfb3
Signature · 1 line
2.36.0.550.gb090851708-goog
PATCH v2 1/3 x86/crash: Disable virt in core NMI crash handler to avoid double shootdown
Disable virtualization in crash_nmi_callback() and rework the emergency_vmx_disable_all() path to do an NMI shootdown if and only if a
shootdown has not already occurred. NMI crash shootdown fundamentally
can't support multiple invocations as responding CPUs are deliberately put into halt state without unblocking NMIs. But, the emergency reboot path doesn't have any work of its own, it simply cares about disabling virtualization, i.e. so long as a shootdown occurred, emergency reboot doesn't care who initiated the shootdown, or when.
If "crash_kexec_post_notifiers" is specified on the kernel command line, panic() will invoke crash_smp_send_stop() and result in a second call to nmi_shootdown_cpus() during native_machine_emergency_restart().
Invoke the callback _before_ disabling virtualization, as the current VMCS needs to be cleared before doing VMXOFF. Note, this results in a subtle change in ordering between disabling virtualization and stopping Intel PT on the responding CPUs. While VMX and Intel PT do interact, VMXOFF and writes to MSR_IA32_RTIT_CTL do not induce faults between one another, which is all that matters when panicking.
Harden nmi_shootdown_cpus() against multiple invocations to try and capture any such kernel bugs via a WARN instead of hanging the system during a crash/dump, e.g. prior to the recent hardening of register_nmi_handler(), re-registering the NMI handler would trigger a double list_add() and hang the system if CONFIG_BUG_ON_DATA_CORRUPTION=y.
list_add double add: new=ffffffff82220800, prev=ffffffff8221cfe8, next=ffffffff82220800.
WARNING: CPU: 2 PID: 1319 at lib/list_debug.c:29 __list_add_valid+0x67/0x70 Call Trace: __register_nmi_handler+0xcf/0x130 nmi_shootdown_cpus+0x39/0x90 native_machine_emergency_restart+0x1c9/0x1d0 panic+0x237/0x29b
Extract the disabling logic to a common helper to deduplicate code, and to prepare for doing the shootdown in the emergency reboot path if SVM is supported.
Note, prior to commit ed72736183c4 ("x86/reboot: Force all cpus to exit VMX root if VMX is supported"), nmi_shootdown_cpus() was subtly protected against a second invocation by a cpu_vmx_enabled() check as the kdump handler would disable VMX if it ran first.
--- arch/x86/include/asm/reboot.h | 1 + arch/x86/kernel/crash.c | 16 +-------- arch/x86/kernel/reboot.c | 66 ++++++++++++++++++++++++++++------- 3 files changed, 56 insertions(+), 27 deletions(-)
arch/x86/include/asm/reboot.h +1 -0
@@ -25,6 +25,7 @@ void __noreturn machine_real_restart(unsigned int type);#define MRR_BIOS 0#define MRR_APM 1 +void cpu_crash_disable_virtualization (void );typedef void (*nmi_shootdown_cb )(int ,struct pt_regs *);void nmi_panic_self_stop (struct pt_regs *regs);void nmi_shootdown_cpus (nmi_shootdown_cb callback);
arch/x86/kernel/crash.c +1 -15
@@ -81,15 +81,6 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)*/ cpu_crash_vmclear_loaded_vmcss (); -/* Disable VMX or SVM if needed. -* -* We need to disable virtualization on all CPUs. -* Having VMX or SVM enabled on any CPU may break rebooting -* after the kdump kernel has finished its task. -*/ -cpu_emergency_vmxoff (); -cpu_emergency_svm_disable (); -/* * Disable Intel PT to stop its logging */
@@ -148,12 +139,7 @@ void native_machine_crash_shutdown(struct pt_regs *regs)*/ cpu_crash_vmclear_loaded_vmcss (); -/* Booting kdump kernel with VMX or SVM enabled won't work, -* because (among other limitations) we can't disable paging -* with the virt flags. -*/ -cpu_emergency_vmxoff (); -cpu_emergency_svm_disable (); +cpu_crash_disable_virtualization ();/* * Disable Intel PT to stop its logging
arch/x86/kernel/reboot.c +54 -12
115 lines not on this page · raw message
Signature · 1 line
2.36.0.550.gb090851708-goog
Re: [PATCH v2 1/3] x86/crash: Disable virt in core NMI crash handler to avoid double shootdown
Quoted 8 lines · Sean Christopherson
[...]Fixes ed72736183c4 ("x86/reboot: Force all cpus to exit VMX root if VMX is supported)Reported-by Guilherme G. Piccoli <[email protected]>Cc Vitaly Kuznetsov <[email protected]>Cc Paolo Bonzini <[email protected]>Signed-off-by Sean Christopherson <[email protected]>
Quoted 5 lines
--- arch/x86/include/asm/reboot.h | 1 + arch/x86/kernel/crash.c | 16 +-------- arch/x86/kernel/reboot.c | 66 ++++++++++++++++++++++++++++------- 3 files changed, 56 insertions(+), 27 deletions(-)
Thanks Sean, great patch! It's working fine according to my tests, and the comments made the code very clear.
Feel free to add:
PATCH v2 2/3 x86/reboot: Disable virtualization in an emergency if SVM is supported
In reply to Sean ChristophersonDisable SVM on all CPUs via NMI shootdown during an emergency reboot. Like VMX, SVM can block INIT and thus prevent bringing up other CPUs via INIT-SIPI-SIPI.
--- arch/x86/kernel/reboot.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-)
arch/x86/kernel/reboot.c +11 -12
@@ -530,27 +530,26 @@ static inline void kb_wait(void)static inline void nmi_shootdown_cpus_on_restart (void ); -/* Use NMIs as IPIs to tell all CPUs to disable virtualization */ -static void emergency_vmx_disable_all (void ) +static void emergency_reboot_disable_virtualization (void ) {/* Just make sure we won't change CPUs while doing this */ local_irq_disable ();/* -* Disable VMX on all CPUs before rebooting, otherwise we risk hanging -* the machine, because the CPU blocks INIT when it's in VMX root. +* Disable virtualization on all CPUs before rebooting to avoid hanging +* the system, as VMX and SVM block INIT when running in the host. * * We can't take any locks and we may be on an inconsistent state, so -* use NMIs as IPIs to tell the other CPUs to exit VMX root and halt. +* use NMIs as IPIs to tell the other CPUs to disable VMX/SVM and halt. * -* Do the NMI shootdown even if VMX if off on _this_ CPU, as that -* doesn't prevent a different CPU from being in VMX root operation. +* Do the NMI shootdown even if virtualization is off on _this_ CPU, as +* other CPUs may have virtualization enabled. */ -if (cpu_has_vmx ()) { -/* Safely force _this_ CPU out of VMX root operation. */ -__cpu_emergency_vmxoff (); +if (cpu_has_vmx () ||cpu_has_svm (NULL )) { +/* Safely force _this_ CPU out of VMX/SVM operation. */ +cpu_crash_disable_virtualization (); -/* Halt and exit VMX root operation on the other CPUs. */ +/* Disable VMX/SVM and halt on other CPUs. */ nmi_shootdown_cpus_on_restart (); } }
@@ -587,7 +586,7 @@ static void native_machine_emergency_restart(void)unsigned short mode;if (reboot_emergency) -emergency_vmx_disable_all (); +emergency_reboot_disable_virtualization ();tboot_shutdown (TB_SHUTDOWN_REBOOT );
Signature · 1 line
2.36.0.550.gb090851708-goog
PATCH v2 3/3 x86/virt: Fold __cpu_emergency_vmxoff() into its sole caller
In reply to Sean ChristophersonFold __cpu_emergency_vmxoff() into cpu_emergency_vmxoff(), its sole remaining caller, to discourage crash/emergency code from handling VMX but not SVM. The behavior of VMX and SVM is so similar that it's highly unlikely that there will be a scenario where VMX needs to be disabled, but SVM can be left enabled. In other words, during a crash and/or emergency reboot, funnel all virtualization teardown sequences through cpu_crash_disable_virtualization().
No functional change intended.
--- arch/x86/include/asm/virtext.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
arch/x86/include/asm/virtext.h +2 -12
@@ -60,22 +60,12 @@ static inline int cpu_vmx_enabled(void)return __read_cr4 () &X86_CR4_VMXE ; } -/** Disable VMX if it is enabled on the current CPU -* -* You shouldn't call this if cpu_has_vmx() returns 0. -*/ -static inline void __cpu_emergency_vmxoff (void ) -{ -if (cpu_vmx_enabled ()) -cpu_vmxoff (); -} -/** Disable VMX if it is supported and enabled on the current CPU */ static inline void cpu_emergency_vmxoff (void ) { -if (cpu_has_vmx ()) -__cpu_emergency_vmxoff (); +if (cpu_has_vmx () &&cpu_vmx_enabled ()) +cpu_vmxoff (); }
Signature · 1 line
2.36.0.550.gb090851708-goog
Hi Sean / Thomas, was this merged anywhere? I just checked and seems it didn't reach mainline...patch 01 is especially relevant, IMHO.
Thanks in advance,
Guilherme
Quoted 7 lines · Sean Christopherson
Fix a double NMI shootdown bug found and debugged by Guilherme, who did all the hard work. NMI shootdown is a one-time thing; the handler leaves NMIs blocked and enters halt. At best, a second (or third...) shootdown is an expensive nop, at worst it can hang the kernel and prevent kexec'ing into a new kernel, e.g. prior to the hardening of
register_nmi_handler(), a double shootdown resulted in a doublelist_add(), which is fatal when running withCONFIG_BUG_ON_DATA_CORRUPTION=y.
...
Quoted 11 lines
Sean Christopherson (3):
x86/crash: Disable virt in core NMI crash handler to avoid double
shootdown
x86/reboot: Disable virtualization in an emergency if SVM is supported x86/virt: Fold__cpu_emergency_vmxoff()into its sole callerarch/x86/include/asm/reboot.h | 1 + arch/x86/include/asm/virtext.h | 14 +----- arch/x86/kernel/crash.c | 16 +----- arch/x86/kernel/reboot.c | 89 +++++++++++++++++++++++++--------- 4 files changed, 69 insertions(+), 51 deletions(-)
Ping! Still applies cleanly.
Quoted 43 lines · Sean Christopherson
Fix a double NMI shootdown bug found and debugged by Guilherme, who did all the hard work. NMI shootdown is a one-time thing; the handler leaves NMIs blocked and enters halt. At best, a second (or third...) shootdown is an expensive nop, at worst it can hang the kernel and prevent kexec'ing into a new kernel, e.g. prior to the hardening of
register_nmi_handler(), a double shootdown resulted in a doublelist_add(), which is fatal when running withCONFIG_BUG_ON_DATA_CORRUPTION=y.With the "right" kexec/kdump configuration,
emergency_vmx_disable_all()can be reached afterkdump_nmi_shootdown_cpus()(currently the only two users ofnmi_shootdown_cpus()).To fix, move the disabling of virtualization into
crash_nmi_callback(), remove emergency_vmx_disable_all()'s callback, and do a shootdown foremergency_vmx_disable_all()if and only if a shootdown hasn't yet occurred. The only thingemergency_vmx_disable_all()cares about is disabling VMX/SVM (obviously), and since I can't envision a use case for an NMI shootdown that doesn't want to disable virtualization, doing that in the core handler meansemergency_vmx_disable_all()only needs to ensure _a_ shootdown occurs, it doesn't care when that shootdown happened or what callback may have run.Patch 2 is a related bug fix found while exploring ideas for patch 1. Patch 3 is a cleanup to try to prevent future "fixed VMX but not SVM" style bugs.
Guilherme and Vitaly, I dropped your Tested-by and Reviewed-by tags since the relevant patches changed a decent amount.
v2:
- Use a NULL handler andcrash_ipi_issuedinstead of a magic nop handler. [tglx]
- Add comments to call out that modifying the existing handler once the NMI is sent may cause explosions.
- Add a patch to cleanupcpu_emergency_vmxoff().v1: https://lore.kernel.org/all/[email protected]
Sean Christopherson (3):
x86/crash: Disable virt in core NMI crash handler to avoid double
shootdown
x86/reboot: Disable virtualization in an emergency if SVM is supported x86/virt: Fold__cpu_emergency_vmxoff()into its sole caller
Quoted 8 lines
arch/x86/include/asm/reboot.h | 1 + arch/x86/include/asm/virtext.h | 14 +----- arch/x86/kernel/crash.c | 16 +----- arch/x86/kernel/reboot.c | 89 +++++++++++++++++++++++++--------- 4 files changed, 69 insertions(+), 51 deletions(-)base-commit:
a7fed5c0431dbfa707037848830f980e0f93cfb3
Hey folks, is there any news about this series?
I saw a ping from Sean some time ago...so, this is a re-ping heh
Thanks,
Guilherme
Quoted 43 lines · Sean Christopherson
Fix a double NMI shootdown bug found and debugged by Guilherme, who did all the hard work. NMI shootdown is a one-time thing; the handler leaves NMIs blocked and enters halt. At best, a second (or third...) shootdown is an expensive nop, at worst it can hang the kernel and prevent kexec'ing into a new kernel, e.g. prior to the hardening of
register_nmi_handler(), a double shootdown resulted in a doublelist_add(), which is fatal when running withCONFIG_BUG_ON_DATA_CORRUPTION=y.With the "right" kexec/kdump configuration,
emergency_vmx_disable_all()can be reached afterkdump_nmi_shootdown_cpus()(currently the only two users ofnmi_shootdown_cpus()).To fix, move the disabling of virtualization into
crash_nmi_callback(), remove emergency_vmx_disable_all()'s callback, and do a shootdown foremergency_vmx_disable_all()if and only if a shootdown hasn't yet occurred. The only thingemergency_vmx_disable_all()cares about is disabling VMX/SVM (obviously), and since I can't envision a use case for an NMI shootdown that doesn't want to disable virtualization, doing that in the core handler meansemergency_vmx_disable_all()only needs to ensure _a_ shootdown occurs, it doesn't care when that shootdown happened or what callback may have run.Patch 2 is a related bug fix found while exploring ideas for patch 1. Patch 3 is a cleanup to try to prevent future "fixed VMX but not SVM" style bugs.
Guilherme and Vitaly, I dropped your Tested-by and Reviewed-by tags since the relevant patches changed a decent amount.
v2:
- Use a NULL handler andcrash_ipi_issuedinstead of a magic nop handler. [tglx]
- Add comments to call out that modifying the existing handler once the NMI is sent may cause explosions.
- Add a patch to cleanupcpu_emergency_vmxoff().v1: https://lore.kernel.org/all/[email protected]
Sean Christopherson (3):
x86/crash: Disable virt in core NMI crash handler to avoid double
shootdown
x86/reboot: Disable virtualization in an emergency if SVM is supported x86/virt: Fold__cpu_emergency_vmxoff()into its sole caller
Quoted 8 lines
arch/x86/include/asm/reboot.h | 1 + arch/x86/include/asm/virtext.h | 14 +----- arch/x86/kernel/crash.c | 16 +----- arch/x86/kernel/reboot.c | 89 +++++++++++++++++++++++++--------- 4 files changed, 69 insertions(+), 51 deletions(-)base-commit:
a7fed5c0431dbfa707037848830f980e0f93cfb3
Hi folks, monthly ping!
Any news on this fix series? Just checked, still applies cleanly.
Thanks,
Guilherme