Commit 9941d224 authored by Sean Christopherson's avatar Sean Christopherson Committed by Paolo Bonzini
Browse files

KVM: Move putting of vcpu->pid to kvm_vcpu_destroy() 



Move the putting of vcpu->pid to kvm_vcpu_destroy().  vcpu->pid is
guaranteed to be NULL when kvm_vcpu_uninit() is called in the error path
of kvm_vm_ioctl_create_vcpu(), e.g. it is explicitly nullified by
kvm_vcpu_init() and is only changed by KVM_RUN.

No functional change intended.

Acked-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Signed-off-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent ddd259c9

virt/kvm/kvm_main.c

+7 −6
Original line number Diff line number Diff line
@@ -352,12 +352,6 @@ static int kvm_vcpu_init(struct kvm_vcpu *vcpu, struct kvm *kvm, unsigned id) 


static void kvm_vcpu_uninit(struct kvm_vcpu *vcpu)

{

	/*

	 * no need for rcu_read_lock as VCPU_RUN is the only place that

	 * will change the vcpu->pid pointer and on uninit all file

	 * descriptors are already gone.

	 */

	put_pid(rcu_dereference_protected(vcpu->pid, 1));

	free_page((unsigned long)vcpu->run);

}
@@ -365,6 +359,13 @@ void kvm_vcpu_destroy(struct kvm_vcpu *vcpu) 
{

	kvm_arch_vcpu_destroy(vcpu);



	/*

	 * No need for rcu_read_lock as VCPU_RUN is the only place that changes

	 * the vcpu->pid pointer, and at destruction time all file descriptors

	 * are already gone.

	 */

	put_pid(rcu_dereference_protected(vcpu->pid, 1));



	kvm_vcpu_uninit(vcpu);

	kmem_cache_free(kvm_vcpu_cache, vcpu);

}