| From 37fe59d714cf1d5dbd559e4a3a6b30b2761dada0 Mon Sep 17 00:00:00 2001 |
| From: Sean Christopherson <sean.j.christopherson@intel.com> |
| Date: Wed, 18 Dec 2019 13:54:48 -0800 |
| Subject: [PATCH] KVM: x86: Free wbinvd_dirty_mask if vCPU creation fails |
| |
| commit 16be9ddea268ad841457a59109963fff8c9de38d upstream. |
| |
| Free the vCPU's wbinvd_dirty_mask if vCPU creation fails after |
| kvm_arch_vcpu_init(), e.g. when installing the vCPU's file descriptor. |
| Do the freeing by calling kvm_arch_vcpu_free() instead of open coding |
| the freeing. This adds a likely superfluous, but ultimately harmless, |
| call to kvmclock_reset(), which only clears vcpu->arch.pv_time_enabled. |
| Using kvm_arch_vcpu_free() allows for additional cleanup in the future. |
| |
| Fixes: f5f48ee15c2ee ("KVM: VMX: Execute WBINVD to keep data consistency with assigned devices") |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c |
| index 3ecd6aeca860..fbbd96550c5f 100644 |
| --- a/arch/x86/kvm/x86.c |
| +++ b/arch/x86/kvm/x86.c |
| @@ -9010,7 +9010,7 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) |
| kvm_mmu_unload(vcpu); |
| vcpu_put(vcpu); |
| |
| - kvm_x86_ops->vcpu_free(vcpu); |
| + kvm_arch_vcpu_free(vcpu); |
| } |
| |
| void kvm_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) |
| -- |
| 2.7.4 |
| |
