Skip to contentSkip to conversation

KVM: VMX: Switch __vmx_exit() and kvm_x86_vendor_exit() in vmx_exit()

PATCH Applied Kai Huang 2 participants 2 messages Jun 27, 2024 – Jun 28, 2024

Subsystems (3)
lore
Share & tools
lore

Kai Huang

author
#0 lore raw

PATCH 1/1 KVM: VMX: Switch __vmx_exit() and kvm_x86_vendor_exit() in vmx_exit()

In the vmx_init() error handling path, the __vmx_exit() is done before kvm_x86_vendor_exit(). They should follow the same order in vmx_exit().

But currently __vmx_exit() is done after kvm_x86_vendor_exit() in vmx_exit(). Switch the order of them to fix.

Fixes e32b120071ea ("KVM: VMX: Do _all_ initialization before exposing /dev/kvm to userspace")
---
 arch/x86/kvm/vmx/vmx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/vmx/vmx.c +1 -1
index b3c83c06f826..8e7371c9648a 100644
@@ -8629,9 +8629,9 @@ static void __vmx_exit(void)
 static void vmx_exit(void)
 {
 	kvm_exit();
+	__vmx_exit();
 	kvm_x86_vendor_exit();
 
-	__vmx_exit();
 }
 module_exit(vmx_exit);
 

base-commit: c2f38f75fc89ebd6c0be5856509329390102d8ba

Signature · 1 line
2.43.2
maintainer Applied
#1 lore raw
Quoted 8 lines · Kai Huang

In the vmx_init() error handling path, the __vmx_exit() is done before kvm_x86_vendor_exit(). They should follow the same order in vmx_exit().

But currently __vmx_exit() is done after kvm_x86_vendor_exit() in vmx_exit(). Switch the order of them to fix.

[...]

Applied to kvm-x86 vmx, thanks!

[1/1] KVM: VMX: Switch __vmx_exit() and kvm_x86_vendor_exit() in vmx_exit()

      https://github.com/kvm-x86/linux/commit/92c1e3cbf0d0

--
https://github.com/kvm-x86/linux/tree/next