If there are no objections, my plan is to take this through the KVM tree
for 6.6.
Instead of having the reboot code blindly try to disable virtualization
during an emergency, use the existing callback into KVM to disable virt
as "needed". In quotes because KVM still somewhat blindly attempts to
disable virt, e.g. if KVM is loaded but doesn't have active VMs and thus
hasn't enabled hardware. That could theoretically be "fixed", but due to
the callback being invoked from NMI context, I'm not convinced it would
be worth the complexity. E.g. false positives would still be possible,
and KVM would have to play games with the per-CPU hardware_enabled flag
to ensure there are no false negatives.
The callback is currently used only to VMCLEAR the per-CPU list of VMCSes,
but not using the callback to disable virt isn't intentional. Arguably, a
callback should have been used in the initial "disable virt" code added by
commit d176720d34c7 ("x86: disable VMX on all CPUs on reboot"). And the
kexec logic added (much later) by commit f23d1f4a1160 ("x86/kexec: VMCLEAR
VMCSs loaded on all cpus if necessary") simply missed the opportunity to
use the callback for all virtualization needs.
Once KVM handles disabling virt, move all of the helpers provided by
virtext.h into KVM proper.
There's one outlier patch, "Make KVM_AMD depend on CPU_SUP_AMD or
CPU_SUP_HYGON", that I included here because it felt weird to pull in the
"must be AMD or Hygon" check without KVM demanding that at build time.
v4:
- Collect reviews. [Kai]
- Skip VMCLEAR during reboot if CR4.VMXE=0. [Kai]
- Call out that disabling virtualization iff there's a callback also
avoids an unnecessary NMI shootdown. [Kai]
- Move "Disable virtualization during reboot iff callback is
registered" patch after "Hoist "disable virt" helpers above \"emergency
reboot\"" patch to fix an intermediate build error.
v3:
- https://lore.kernel.org/all/20230512235026.808058-1-seanjc@xxxxxxxxxx
- Massage changelogs to avoid talking about out-of-tree hypervisors. [Kai]
- Move #ifdef "KVM" addition later. [Kai]
v2:
- https://lore.kernel.org/all/20230310214232.806108-1-seanjc@xxxxxxxxxx
- Disable task migration when probing basic SVM and VMX support to avoid
logging misleading info (wrong CPU) if probing fails.
v1: https://lore.kernel.org/all/20221201232655.290720-1-seanjc@xxxxxxxxxx
Sean Christopherson (19):
x86/reboot: VMCLEAR active VMCSes before emergency reboot
x86/reboot: Harden virtualization hooks for emergency reboot
x86/reboot: KVM: Handle VMXOFF in KVM's reboot callback
x86/reboot: KVM: Disable SVM during reboot via virt/KVM reboot
callback
x86/reboot: Assert that IRQs are disabled when turning off
virtualization
x86/reboot: Hoist "disable virt" helpers above "emergency reboot" path
x86/reboot: Disable virtualization during reboot iff callback is
registered
x86/reboot: Expose VMCS crash hooks if and only if KVM_{INTEL,AMD} is
enabled
x86/virt: KVM: Open code cpu_has_vmx() in KVM VMX
x86/virt: KVM: Move VMXOFF helpers into KVM VMX
KVM: SVM: Make KVM_AMD depend on CPU_SUP_AMD or CPU_SUP_HYGON
x86/virt: Drop unnecessary check on extended CPUID level in
cpu_has_svm()
x86/virt: KVM: Open code cpu_has_svm() into kvm_is_svm_supported()
KVM: SVM: Check that the current CPU supports SVM in
kvm_is_svm_supported()
KVM: VMX: Ensure CPU is stable when probing basic VMX support
x86/virt: KVM: Move "disable SVM" helper into KVM SVM
KVM: x86: Force kvm_rebooting=true during emergency reboot/crash
KVM: SVM: Use "standard" stgi() helper when disabling SVM
KVM: VMX: Skip VMCLEAR logic during emergency reboots if CR4.VMXE=0
arch/x86/include/asm/kexec.h | 2 -
arch/x86/include/asm/reboot.h | 7 ++
arch/x86/include/asm/virtext.h | 154 ---------------------------------
arch/x86/kernel/crash.c | 31 -------
arch/x86/kernel/reboot.c | 66 ++++++++++----
arch/x86/kvm/Kconfig | 2 +-
arch/x86/kvm/svm/svm.c | 71 ++++++++++++---
arch/x86/kvm/vmx/vmx.c | 76 ++++++++++++----
8 files changed, 176 insertions(+), 233 deletions(-)
delete mode 100644 arch/x86/include/asm/virtext.h
base-commit: fdf0eaf11452d72945af31804e2a1048ee1b574c
--
2.41.0.487.g6d72f3e995-goog
