From: Sean Christopherson <seanjc@google.com>
To: Sean Christopherson <seanjc@google.com>,
Paolo Bonzini <pbonzini@redhat.com>
Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
Andrew Cooper <Andrew.Cooper3@citrix.com>,
Kai Huang <kai.huang@intel.com>, Chao Gao <chao.gao@intel.com>
Subject: [PATCH v3 06/18] x86/reboot: Assert that IRQs are disabled when turning off virtualization
Date: Fri, 12 May 2023 16:50:14 -0700 [thread overview]
Message-ID: <20230512235026.808058-7-seanjc@google.com> (raw)
In-Reply-To: <20230512235026.808058-1-seanjc@google.com>
Assert that IRQs are disabled when turning off virtualization in an
emergency. KVM enables hardware via on_each_cpu(), i.e. could re-enable
hardware if a pending IPI were delivered after disabling virtualization.
Remove a misleading comment from emergency_reboot_disable_virtualization()
about "just" needing to guarantee the CPU is stable (see above).
Signed-off-by: Sean Christopherson <seanjc@google.com>
---
arch/x86/kernel/reboot.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 20f7bdabc52e..fddfea5f1d20 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -531,7 +531,6 @@ static inline void nmi_shootdown_cpus_on_restart(void);
static void emergency_reboot_disable_virtualization(void)
{
- /* Just make sure we won't change CPUs while doing this */
local_irq_disable();
/*
@@ -820,6 +819,13 @@ void cpu_emergency_disable_virtualization(void)
{
cpu_emergency_virt_cb *callback;
+ /*
+ * IRQs must be disabled as KVM enables virtualization in hardware via
+ * function call IPIs, i.e. IRQs need to be disabled to guarantee
+ * virtualization stays disabled.
+ */
+ lockdep_assert_irqs_disabled();
+
rcu_read_lock();
callback = rcu_dereference(cpu_emergency_virt_callback);
if (callback)
--
2.40.1.606.ga4b1b128d6-goog
next prev parent reply other threads:[~2023-05-12 23:51 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-12 23:50 [PATCH v3 00/18] x86/reboot: KVM: Clean up "emergency" virt code Sean Christopherson
2023-05-12 23:50 ` [PATCH v3 01/18] x86/reboot: VMCLEAR active VMCSes before emergency reboot Sean Christopherson
2023-05-12 23:50 ` [PATCH v3 02/18] x86/reboot: Harden virtualization hooks for " Sean Christopherson
2023-05-22 12:46 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 03/18] x86/reboot: KVM: Handle VMXOFF in KVM's reboot callback Sean Christopherson
2023-05-22 12:55 ` Huang, Kai
2023-05-22 17:58 ` Sean Christopherson
2023-05-22 23:11 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 04/18] x86/reboot: KVM: Disable SVM during reboot via virt/KVM " Sean Christopherson
2023-05-22 12:56 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 05/18] x86/reboot: Disable virtualization during reboot iff callback is registered Sean Christopherson
2023-05-22 13:04 ` Huang, Kai
2023-05-22 17:51 ` Sean Christopherson
2023-05-22 23:13 ` Huang, Kai
2023-05-12 23:50 ` Sean Christopherson [this message]
2023-05-22 13:05 ` [PATCH v3 06/18] x86/reboot: Assert that IRQs are disabled when turning off virtualization Huang, Kai
2023-05-12 23:50 ` [PATCH v3 07/18] x86/reboot: Hoist "disable virt" helpers above "emergency reboot" path Sean Christopherson
2023-05-22 13:11 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 08/18] x86/reboot: Expose VMCS crash hooks if and only if KVM_{INTEL,AMD} is enabled Sean Christopherson
2023-05-22 13:11 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 09/18] x86/virt: KVM: Open code cpu_has_vmx() in KVM VMX Sean Christopherson
2023-05-22 23:41 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 10/18] x86/virt: KVM: Move VMXOFF helpers into " Sean Christopherson
2023-05-22 13:15 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 11/18] KVM: SVM: Make KVM_AMD depend on CPU_SUP_AMD or CPU_SUP_HYGON Sean Christopherson
2023-05-12 23:50 ` [PATCH v3 12/18] x86/virt: Drop unnecessary check on extended CPUID level in cpu_has_svm() Sean Christopherson
2023-05-12 23:50 ` [PATCH v3 13/18] x86/virt: KVM: Open code cpu_has_svm() into kvm_is_svm_supported() Sean Christopherson
2023-05-22 23:44 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 14/18] KVM: SVM: Check that the current CPU supports SVM in kvm_is_svm_supported() Sean Christopherson
2023-05-22 23:18 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 15/18] KVM: VMX: Ensure CPU is stable when probing basic VMX support Sean Christopherson
2023-05-22 23:30 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 16/18] x86/virt: KVM: Move "disable SVM" helper into KVM SVM Sean Christopherson
2023-05-22 23:26 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 17/18] KVM: x86: Force kvm_rebooting=true during emergency reboot/crash Sean Christopherson
2023-05-22 23:25 ` Huang, Kai
2023-05-23 2:02 ` Huang, Kai
2023-05-12 23:50 ` [PATCH v3 18/18] KVM: SVM: Use "standard" stgi() helper when disabling SVM Sean Christopherson
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=20230512235026.808058-7-seanjc@google.com \
--to=seanjc@google.com \
--cc=Andrew.Cooper3@citrix.com \
--cc=chao.gao@intel.com \
--cc=kai.huang@intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
/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