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.
Note, there have been conversations at various times about supporting
additional in-tree users of virtualization. Somewhat counter-intuitively,
giving KVM full ownership of virt actually make it _easier_ to support
additional virt users as having all of the code in one place makes it
easier to extract the bits that need to be shared.
This applies on
git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/queue
plus two series (order shouldn't matter)
1. https://lore.kernel.org/all/20221130233650.1404148-1-seanjc@xxxxxxxxxx
2. https://lore.kernel.org/all/20221130230934.1014142-1-seanjc@xxxxxxxxxx
#1 is a cleanup of the related NMI shootdown logic. #2 is a large overhaul
of code surrouding KVM's hardware enabling/disabling. If/when folks are
happy with this series, my preference is to take it through the KVM tree as
I'm hoping #1 will get merged sooner than later (bug fixes), and there are
non-trivial conflicts with #2.
Sean Christopherson (16):
x86/reboot: VMCLEAR active VMCSes before emergency reboot
x86/reboot: Expose VMCS crash hooks if and only if KVM_INTEL is
enabled
x86/reboot: Harden virtualization hooks for emergency reboot
x86/reboot: Assert that IRQs are disabled when turning off
virtualization
x86/reboot: KVM: Handle VMXOFF in KVM's reboot callback
x86/reboot: KVM: Disable SVM during reboot via virt/KVM reboot
callback
x86/reboot: Hoist "disable virt" helpers above "emergency reboot" path
x86/reboot: Disable virtualization during reboot iff callback is
registered
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()
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
arch/x86/include/asm/kexec.h | 2 -
arch/x86/include/asm/reboot.h | 7 ++
arch/x86/include/asm/virtext.h | 151 ---------------------------------
arch/x86/kernel/crash.c | 31 -------
arch/x86/kernel/reboot.c | 59 ++++++++++---
arch/x86/kvm/Kconfig | 2 +-
arch/x86/kvm/svm/svm.c | 51 +++++++++--
arch/x86/kvm/vmx/vmx.c | 51 +++++++----
8 files changed, 133 insertions(+), 221 deletions(-)
delete mode 100644 arch/x86/include/asm/virtext.h
base-commit: 02f831ac0dcd7593f8dbb5495135406ffd55952c
--
2.39.0.rc0.267.gcb52ba06e7-goog
