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

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

KVM: Refactor srcu struct release on early errors 



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

virt/kvm/kvm_main.c

+6 −8
Original line number Original line Diff line number Diff line
@@ -401,23 +401,19 @@ static struct kvm *kvm_create_vm(void) 
	r = -ENOMEM;

	r = -ENOMEM;

	kvm->memslots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);

	kvm->memslots = kzalloc(sizeof(struct kvm_memslots), GFP_KERNEL);

	if (!kvm->memslots)

	if (!kvm->memslots)

		goto out_err;

		goto out_err_nosrcu;

	if (init_srcu_struct(&kvm->srcu))

	if (init_srcu_struct(&kvm->srcu))

		goto out_err;

		goto out_err_nosrcu;

	for (i = 0; i < KVM_NR_BUSES; i++) {

	for (i = 0; i < KVM_NR_BUSES; i++) {

		kvm->buses[i] = kzalloc(sizeof(struct kvm_io_bus),

		kvm->buses[i] = kzalloc(sizeof(struct kvm_io_bus),

					GFP_KERNEL);

					GFP_KERNEL);

		if (!kvm->buses[i]) {

		if (!kvm->buses[i])

			cleanup_srcu_struct(&kvm->srcu);

			goto out_err;

			goto out_err;

	}

	}

	}





	r = kvm_init_mmu_notifier(kvm);

	r = kvm_init_mmu_notifier(kvm);

	if (r) {

	if (r)

		cleanup_srcu_struct(&kvm->srcu);

		goto out_err;

		goto out_err;

	}





	kvm->mm = current->mm;

	kvm->mm = current->mm;

	atomic_inc(&kvm->mm->mm_count);

	atomic_inc(&kvm->mm->mm_count);
@@ -435,6 +431,8 @@ out: 
	return kvm;

	return kvm;





out_err:

out_err:

	cleanup_srcu_struct(&kvm->srcu);

out_err_nosrcu:

	hardware_disable_all();

	hardware_disable_all();

out_err_nodisable:

out_err_nodisable:

	for (i = 0; i < KVM_NR_BUSES; i++)

	for (i = 0; i < KVM_NR_BUSES; i++)