Skip to content

Commit

Permalink
KVM: arm/arm64: vgic: Fix kvm_vgic_map_is_active's dist check
Browse files Browse the repository at this point in the history
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
code.

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 <[email protected]>
Acked-by: Marc Zyngier <[email protected]>
Signed-off-by: Christoffer Dall <[email protected]>
Signed-off-by: Marc Zyngier <[email protected]>
  • Loading branch information
chazy authored and Marc Zyngier committed Dec 11, 2015
1 parent 0de58f8 commit fdec12c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion virt/kvm/arm/vgic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down

0 comments on commit fdec12c

Please sign in to comment.