Commit 16be9dde authored Dec 18, 2019 by Sean Christopherson Committed by Paolo Bonzini Jan 24, 2020

KVM: x86: Free wbinvd_dirty_mask if vCPU creation fails

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: f5f48ee1 ("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>

parent cb10bf91

arch/x86/kvm/x86.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -9243,7 +9243,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)

Admin message