From: Sean Christopherson <seanjc@google.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>,
linux-kernel@vger.kernel.org,
"Guilherme G . Piccoli" <gpiccoli@igalia.com>,
Vitaly Kuznetsov <vkuznets@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
Sean Christopherson <seanjc@google.com>,
Andrew Cooper <Andrew.Cooper3@citrix.com>,
Tom Lendacky <thomas.lendacky@amd.com>,
stable@vger.kernel
Subject: [PATCH v4 0/4] x86/crash: Fix double NMI shootdown bug
Date: Wed, 30 Nov 2022 23:36:46 +0000 [thread overview]
Message-ID: <20221130233650.1404148-1-seanjc@google.com> (raw)
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.
Patches 2-4 bring SVM on par with VMX.
v4:
- Set GIF=1 prior to disabling SVM. [Andrew, Tom]
- Name new helper cpu_emergency_disable_virtualization() instead of
cpu_crash_disable_virtualization().
- Add patch to handle SVM in the stop/reboot case.
- Drop patch to fold __cpu_emergency_vmxoff() into cpu_emergency_vmxoff(),
will be sent as part of a larger cleanup.
v3:
- https://lore.kernel.org/all/20221114233441.3895891-1-seanjc@google.com
- Re-collect Guilherme's Tested-by.
- Tweak comment in patch 1 to reference STGI instead of CLGI.
- Celebrate this series' half-birthday.
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().
- https://lore.kernel.org/all/20220518001647.1291448-1-seanjc@google.com
v1: https://lore.kernel.org/all/20220511234332.3654455-1-seanjc@google.com
Sean Christopherson (4):
x86/crash: Disable virt in core NMI crash handler to avoid double
shootdown
x86/virt: Force GIF=1 prior to disabling SVM (for reboot flows)
x86/reboot: Disable virtualization in an emergency if SVM is supported
x86/reboot: Disable SVM, not just VMX, when stopping CPUs
arch/x86/include/asm/reboot.h | 2 +
arch/x86/include/asm/virtext.h | 13 ++++-
arch/x86/kernel/crash.c | 17 +------
arch/x86/kernel/reboot.c | 88 ++++++++++++++++++++++++----------
arch/x86/kernel/smp.c | 6 +--
5 files changed, 82 insertions(+), 44 deletions(-)
base-commit: d800169041c0e035160c8b81f30d4b7e8f8ef777
--
2.38.1.584.g0f3c55d4c2-goog
next reply other threads:[~2022-11-30 23:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-30 23:36 Sean Christopherson [this message]
2022-11-30 23:36 ` [PATCH v4 1/4] x86/crash: Disable virt in core NMI crash handler to avoid double shootdown Sean Christopherson
2022-11-30 23:36 ` [PATCH v4 2/4] x86/virt: Force GIF=1 prior to disabling SVM (for reboot flows) Sean Christopherson
2022-12-01 22:46 ` Andrew Cooper
2022-12-01 23:04 ` Sean Christopherson
2022-12-02 0:08 ` Andrew Cooper
2022-11-30 23:36 ` [PATCH v4 3/4] x86/reboot: Disable virtualization in an emergency if SVM is supported Sean Christopherson
2022-11-30 23:36 ` [PATCH v4 4/4] x86/reboot: Disable SVM, not just VMX, when stopping CPUs Sean Christopherson
2022-11-30 23:38 ` Sean Christopherson
2022-12-02 17:10 ` [PATCH v4 0/4] x86/crash: Fix double NMI shootdown bug Thomas Gleixner
2023-01-28 0:05 ` Sean Christopherson
2023-01-28 14:52 ` Guilherme G. Piccoli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221130233650.1404148-1-seanjc@google.com \
--to=seanjc@google.com \
--cc=Andrew.Cooper3@citrix.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=gpiccoli@igalia.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=stable@vger.kernel \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=vkuznets@redhat.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®