| Message ID | 20240627010524.3732488-1-kai.huang@intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | KVM: VMX: Switch __vmx_exit() and kvm_x86_vendor_exit() in vmx_exit() | expand |
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
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);
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(-) base-commit: c2f38f75fc89ebd6c0be5856509329390102d8ba