[PATCH] KVM: arm/arm64: vgic: Fix kvm_vgic_map_is_active's dist check

Christoffer Dall christoffer.dall at linaro.org
Thu Dec 10 13:46:50 PST 2015

External inputs to the vgic from time to time need to poke into the
state of a virtual interrupt, the prime example is the architected timer

Since the IRQ's active state can be represented in two places; the LR or
the distributor, we first loop over the LRs but if not active in the LRs
we just return if *any* IRQ is active on the VCPU in question.

This is of course bogus, as we should check if the specific IRQ in
quesiton is active on the distributor instead.

Reported-by: Eric Auger <eric.auger at linaro.org>
Signed-off-by: Christoffer Dall <christoffer.dall at linaro.org>
 virt/kvm/arm/vgic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virt/kvm/arm/vgic.c b/virt/kvm/arm/vgic.c
index 65461f8..7a2f449 100644
--- a/virt/kvm/arm/vgic.c
+++ b/virt/kvm/arm/vgic.c
@@ -1114,7 +1114,7 @@ bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, struct irq_phys_map *map)
 			return true;
-	return dist_active_irq(vcpu);
+	return vgic_irq_is_active(vcpu, map->virt_irq);

More information about the linux-arm-kernel mailing list