| From 9d979c7e6ff43ca3200ffcb74f57415fd633a2da Mon Sep 17 00:00:00 2001 |
| From: Sean Christopherson <sean.j.christopherson@intel.com> |
| Date: Wed, 18 Dec 2019 13:55:05 -0800 |
| Subject: KVM: x86: Remove spurious kvm_mmu_unload() from vcpu destruction path |
| |
| From: Sean Christopherson <sean.j.christopherson@intel.com> |
| |
| commit 9d979c7e6ff43ca3200ffcb74f57415fd633a2da upstream. |
| |
| x86 does not load its MMU until KVM_RUN, which cannot be invoked until |
| after vCPU creation succeeds. Given that kvm_arch_vcpu_destroy() is |
| called if and only if vCPU creation fails, it is impossible for the MMU |
| to be loaded. |
| |
| Note, the bogus kvm_mmu_unload() call was added during an unrelated |
| refactoring of vCPU allocation, i.e. was presumably added as an |
| opportunstic "fix" for a perceived leak. |
| |
| Fixes: fb3f0f51d92d1 ("KVM: Dynamically allocate vcpus") |
| Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/x86/kvm/x86.c | 4 ---- |
| 1 file changed, 4 deletions(-) |
| |
| --- a/arch/x86/kvm/x86.c |
| +++ b/arch/x86/kvm/x86.c |
| @@ -9227,10 +9227,6 @@ void kvm_arch_vcpu_destroy(struct kvm_vc |
| { |
| vcpu->arch.apf.msr_val = 0; |
| |
| - vcpu_load(vcpu); |
| - kvm_mmu_unload(vcpu); |
| - vcpu_put(vcpu); |
| - |
| kvm_arch_vcpu_free(vcpu); |
| } |
| |
