diff options
| author | Kai Huang <kai.huang@intel.com> | 2024-06-27 13:05:24 +1200 |
|---|---|---|
| committer | Sean Christopherson <seanjc@google.com> | 2024-06-28 08:58:23 -0700 |
| commit | 92c1e3cbf0d02916ae0c6fc3b78864dcb77624ad (patch) | |
| tree | 98f307925ae250537400944d43e54ebedace6de9 | |
| parent | KVM: VMX: Remove unnecessary INVEPT[GLOBAL] from hardware enable path (diff) | |
| download | linux-92c1e3cbf0d02916ae0c6fc3b78864dcb77624ad.tar.gz linux-92c1e3cbf0d02916ae0c6fc3b78864dcb77624ad.zip | |
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")
Signed-off-by: Kai Huang <kai.huang@intel.com>
Link: https://lore.kernel.org/r/20240627010524.3732488-1-kai.huang@intel.com
Signed-off-by: Sean Christopherson <seanjc@google.com>
| -rw-r--r-- | arch/x86/kvm/vmx/vmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 525765aaaf3a..6643c2d5b3a0 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -8626,9 +8626,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); |