Commit 27592ae8 authored by Marc Zyngier's avatar Marc Zyngier Committed by Paolo Bonzini
Browse files

KVM: Move wiping of the kvm->vcpus array to common code 



All architectures have similar loops iterating over the vcpus,
freeing one vcpu at a time, and eventually wiping the reference
off the vcpus array. They are also inconsistently taking
the kvm->lock mutex when wiping the references from the array.

Make this code common, which will simplify further changes.
The locking is dropped altogether, as this should only be called
when there is no further references on the kvm structure.

Reviewed-by: default avatarClaudio Imbrenda <imbrenda@linux.ibm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Message-Id: <20211116160403.4074052-2-maz@kernel.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent dc1ce455

arch/arm64/kvm/arm.c

+1 −9
Original line number Diff line number Diff line
@@ -175,19 +175,11 @@ vm_fault_t kvm_arch_vcpu_fault(struct kvm_vcpu *vcpu, struct vm_fault *vmf) 
 */

void kvm_arch_destroy_vm(struct kvm *kvm)

{

	int i;



	bitmap_free(kvm->arch.pmu_filter);



	kvm_vgic_destroy(kvm);



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

		if (kvm->vcpus[i]) {

			kvm_vcpu_destroy(kvm->vcpus[i]);

			kvm->vcpus[i] = NULL;

		}

	}

	atomic_set(&kvm->online_vcpus, 0);

	kvm_destroy_vcpus(kvm);

}



int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)

arch/mips/kvm/mips.c

+1 −20
Original line number Diff line number Diff line
@@ -171,25 +171,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 
	return 0;

}



void kvm_mips_free_vcpus(struct kvm *kvm)

{

	unsigned int i;

	struct kvm_vcpu *vcpu;



	kvm_for_each_vcpu(i, vcpu, kvm) {

		kvm_vcpu_destroy(vcpu);

	}



	mutex_lock(&kvm->lock);



	for (i = 0; i < atomic_read(&kvm->online_vcpus); i++)

		kvm->vcpus[i] = NULL;



	atomic_set(&kvm->online_vcpus, 0);



	mutex_unlock(&kvm->lock);

}



static void kvm_mips_free_gpa_pt(struct kvm *kvm)

{

	/* It should always be safe to remove after flushing the whole range */
@@ -199,7 +180,7 @@ static void kvm_mips_free_gpa_pt(struct kvm *kvm) 


void kvm_arch_destroy_vm(struct kvm *kvm)

{

	kvm_mips_free_vcpus(kvm);

	kvm_destroy_vcpus(kvm);

	kvm_mips_free_gpa_pt(kvm);

}

arch/powerpc/kvm/powerpc.c

+1 −9
Original line number Diff line number Diff line
@@ -463,9 +463,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 


void kvm_arch_destroy_vm(struct kvm *kvm)

{

	unsigned int i;

	struct kvm_vcpu *vcpu;



#ifdef CONFIG_KVM_XICS

	/*

	 * We call kick_all_cpus_sync() to ensure that all
@@ -476,14 +473,9 @@ void kvm_arch_destroy_vm(struct kvm *kvm) 
		kick_all_cpus_sync();

#endif



	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_vcpu_destroy(vcpu);

	kvm_destroy_vcpus(kvm);



	mutex_lock(&kvm->lock);

	for (i = 0; i < atomic_read(&kvm->online_vcpus); i++)

		kvm->vcpus[i] = NULL;



	atomic_set(&kvm->online_vcpus, 0);



	kvmppc_core_destroy_vm(kvm);

arch/riscv/kvm/vm.c

+1 −9
Original line number Diff line number Diff line
@@ -46,15 +46,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type) 


void kvm_arch_destroy_vm(struct kvm *kvm)

{

	int i;



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

		if (kvm->vcpus[i]) {

			kvm_vcpu_destroy(kvm->vcpus[i]);

			kvm->vcpus[i] = NULL;

		}

	}

	atomic_set(&kvm->online_vcpus, 0);

	kvm_destroy_vcpus(kvm);

}



int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)

arch/s390/kvm/kvm-s390.c

+1 −17
Original line number Diff line number Diff line
@@ -2821,27 +2821,11 @@ void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu) 
	free_page((unsigned long)(vcpu->arch.sie_block));

}



static void kvm_free_vcpus(struct kvm *kvm)

{

	unsigned int i;

	struct kvm_vcpu *vcpu;



	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_vcpu_destroy(vcpu);



	mutex_lock(&kvm->lock);

	for (i = 0; i < atomic_read(&kvm->online_vcpus); i++)

		kvm->vcpus[i] = NULL;



	atomic_set(&kvm->online_vcpus, 0);

	mutex_unlock(&kvm->lock);

}



void kvm_arch_destroy_vm(struct kvm *kvm)

{

	u16 rc, rrc;



	kvm_free_vcpus(kvm);

	kvm_destroy_vcpus(kvm);

	sca_dispose(kvm);

	kvm_s390_gisa_destroy(kvm);

	/*