Commit d26b9cb3 authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

KVM: arm64: vgic: Add a non-locking primitive for kvm_vgic_vcpu_destroy() 



As we are going to need to call into kvm_vgic_vcpu_destroy() without
prior holding of the slots_lock, introduce __kvm_vgic_vcpu_destroy()
as a non-locking primitive of kvm_vgic_vcpu_destroy().

Cc: stable@vger.kernel.org
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20231207151201.3028710-3-maz@kernel.org


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 01ad29d2

arch/arm64/kvm/vgic/vgic-init.c

+11 −2
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static void kvm_vgic_dist_destroy(struct kvm *kvm) 
		vgic_v4_teardown(kvm);

}



void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)

static void __kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)

{

	struct vgic_cpu *vgic_cpu = &vcpu->arch.vgic_cpu;
@@ -382,6 +382,15 @@ void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu) 
	vgic_cpu->rd_iodev.base_addr = VGIC_ADDR_UNDEF;

}



void kvm_vgic_vcpu_destroy(struct kvm_vcpu *vcpu)

{

	struct kvm *kvm = vcpu->kvm;



	mutex_lock(&kvm->slots_lock);

	__kvm_vgic_vcpu_destroy(vcpu);

	mutex_unlock(&kvm->slots_lock);

}



void kvm_vgic_destroy(struct kvm *kvm)

{

	struct kvm_vcpu *vcpu;
@@ -392,7 +401,7 @@ void kvm_vgic_destroy(struct kvm *kvm) 
	vgic_debug_destroy(kvm);



	kvm_for_each_vcpu(i, vcpu, kvm)

		kvm_vgic_vcpu_destroy(vcpu);

		__kvm_vgic_vcpu_destroy(vcpu);



	mutex_lock(&kvm->arch.config_lock);