Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d780592b authored by Jan Kiszka's avatar Jan Kiszka Committed by Avi Kivity
Browse files

KVM: Clean up error handling during VCPU creation 



So far kvm_arch_vcpu_setup is responsible for freeing the vcpu struct if
it fails. Move this confusing resonsibility back into the hands of
kvm_vm_ioctl_create_vcpu. Only kvm_arch_vcpu_setup of x86 is affected,
all other archs cannot fail.

Signed-off-by: default avatarJan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent d462b819

arch/x86/kvm/x86.c

+0 −5
Original line number Diff line number Diff line
@@ -6126,12 +6126,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) 
	if (r == 0)

		r = kvm_mmu_setup(vcpu);

	vcpu_put(vcpu);

	if (r < 0)

		goto free_vcpu;



	return 0;

free_vcpu:

	kvm_x86_ops->vcpu_free(vcpu);

	return r;

}

virt/kvm/kvm_main.c

+6 −5
Original line number Diff line number Diff line
@@ -1615,18 +1615,18 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) 


	r = kvm_arch_vcpu_setup(vcpu);

	if (r)

		return r;

		goto vcpu_destroy;



	mutex_lock(&kvm->lock);

	if (atomic_read(&kvm->online_vcpus) == KVM_MAX_VCPUS) {

		r = -EINVAL;

		goto vcpu_destroy;

		goto unlock_vcpu_destroy;

	}



	kvm_for_each_vcpu(r, v, kvm)

		if (v->vcpu_id == id) {

			r = -EEXIST;

			goto vcpu_destroy;

			goto unlock_vcpu_destroy;

		}



	BUG_ON(kvm->vcpus[atomic_read(&kvm->online_vcpus)]);
@@ -1636,7 +1636,7 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) 
	r = create_vcpu_fd(vcpu);

	if (r < 0) {

		kvm_put_kvm(kvm);

		goto vcpu_destroy;

		goto unlock_vcpu_destroy;

	}



	kvm->vcpus[atomic_read(&kvm->online_vcpus)] = vcpu;
@@ -1650,8 +1650,9 @@ static int kvm_vm_ioctl_create_vcpu(struct kvm *kvm, u32 id) 
	mutex_unlock(&kvm->lock);

	return r;



vcpu_destroy:

unlock_vcpu_destroy:

	mutex_unlock(&kvm->lock);

vcpu_destroy:

	kvm_arch_vcpu_destroy(vcpu);

	return r;

}