* [PATCH] KVM: VMX: Switch __vmx_exit() and kvm_x86_vendor_exit() in vmx_exit()
@ 2024-06-27 1:05 Kai Huang
2024-06-28 22:55 ` Sean Christopherson
0 siblings, 1 reply; 2+ messages in thread
From: Kai Huang @ 2024-06-27 1:05 UTC (permalink / raw)
To: kvm; +Cc: seanjc, pbonzini, linux-kernel
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")
Signed-off-by: Kai Huang <kai.huang@intel.com>
---
arch/x86/kvm/vmx/vmx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
index b3c83c06f826..8e7371c9648a 100644
--- a/arch/x86/kvm/vmx/vmx.c
+++ b/arch/x86/kvm/vmx/vmx.c
@@ -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
--
2.43.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] KVM: VMX: Switch __vmx_exit() and kvm_x86_vendor_exit() in vmx_exit()
2024-06-27 1:05 [PATCH] KVM: VMX: Switch __vmx_exit() and kvm_x86_vendor_exit() in vmx_exit() Kai Huang
@ 2024-06-28 22:55 ` Sean Christopherson
0 siblings, 0 replies; 2+ messages in thread
From: Sean Christopherson @ 2024-06-28 22:55 UTC (permalink / raw)
To: Sean Christopherson, kvm, Kai Huang; +Cc: pbonzini, linux-kernel
On Thu, 27 Jun 2024 13:05:24 +1200, Kai Huang wrote:
> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-28 22:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-27 1:05 [PATCH] KVM: VMX: Switch __vmx_exit() and kvm_x86_vendor_exit() in vmx_exit() Kai Huang
2024-06-28 22:55 ` Sean Christopherson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®