summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorSean Christopherson <seanjc@google.com>2023-07-21 22:18:44 +0200
committerSean Christopherson <seanjc@google.com>2023-08-04 00:37:14 +0200
commitbaeb4de7ad12b700a91f2a7be8e1c0389a5c8fd4 (patch)
treee94d52ff9c7211d843c24b93f2cb27072edc5efc /arch/x86/kernel
parentx86/reboot: KVM: Handle VMXOFF in KVM's reboot callback (diff)
downloadlinux-baeb4de7ad12b700a91f2a7be8e1c0389a5c8fd4.tar.xz
linux-baeb4de7ad12b700a91f2a7be8e1c0389a5c8fd4.zip
x86/reboot: KVM: Disable SVM during reboot via virt/KVM reboot callback
Use the virt callback to disable SVM (and set GIF=1) during an emergency instead of blindly attempting to disable SVM. Like the VMX case, if a hypervisor, i.e. KVM, isn't loaded/active, SVM can't be in use. Acked-by: Kai Huang <kai.huang@intel.com> Link: https://lore.kernel.org/r/20230721201859.2307736-5-seanjc@google.com Signed-off-by: Sean Christopherson <seanjc@google.com>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/reboot.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index d2d0f2672a64..48ad2d1ff83d 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -826,9 +826,6 @@ void cpu_emergency_disable_virtualization(void)
if (callback)
callback();
rcu_read_unlock();
-
- /* KVM_AMD doesn't yet utilize the common callback. */
- cpu_emergency_svm_disable();
}
#if defined(CONFIG_SMP)