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

KVM: arm64: Use lock guard in vgic_v4_set_forwarding() 



The locking dance is about to get more interesting, switch the its_lock
over to a lock guard to make it a bit easier to handle.

Tested-by: default avatarSweet Tea Dorminy <sweettea-kernel@dorminy.me>
Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
Link: https://lore.kernel.org/r/20250523194722.4066715-2-oliver.upton@linux.dev


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 66730474

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

+4 −6
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ int kvm_vgic_v4_set_forwarding(struct kvm *kvm, int virq, 
	if (IS_ERR(its))

		return 0;



	mutex_lock(&its->its_lock);

	guard(mutex)(&its->its_lock);



	/*

	 * Perform the actual DevID/EventID -> LPI translation.
@@ -455,11 +455,11 @@ int kvm_vgic_v4_set_forwarding(struct kvm *kvm, int virq, 
	 */

	if (vgic_its_resolve_lpi(kvm, its, irq_entry->msi.devid,

				 irq_entry->msi.data, &irq))

		goto out;

		return 0;



	/* Silently exit if the vLPI is already mapped */

	if (irq->hw)

		goto out;

		return 0;



	/*

	 * Emit the mapping request. If it fails, the ITS probably
@@ -479,7 +479,7 @@ int kvm_vgic_v4_set_forwarding(struct kvm *kvm, int virq, 


	ret = its_map_vlpi(virq, &map);

	if (ret)

		goto out;

		return ret;



	irq->hw		= true;

	irq->host_irq	= virq;
@@ -503,8 +503,6 @@ int kvm_vgic_v4_set_forwarding(struct kvm *kvm, int virq, 
		raw_spin_unlock_irqrestore(&irq->irq_lock, flags);

	}



out:

	mutex_unlock(&its->its_lock);

	return ret;

}