Commit 9009782a authored by Christoffer Dall's avatar Christoffer Dall Committed by Marc Zyngier
Browse files

KVM: arm/arm64: vgic: Consider priority and active state for pending irq 



When checking if there are any pending IRQs for the VM, consider the
active state and priority of the IRQs as well.

Otherwise we could be continuously scheduling a guest hypervisor without
it seeing an IRQ.

Signed-off-by: default avatarChristoffer Dall <christoffer.dall@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent c23b2e6f

virt/kvm/arm/vgic/vgic.c

+6 −1
Original line number Diff line number Diff line
@@ -908,6 +908,7 @@ int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu) 
	struct vgic_irq *irq;

	bool pending = false;

	unsigned long flags;

	struct vgic_vmcr vmcr;



	if (!vcpu->kvm->arch.vgic.enabled)

		return false;
@@ -915,11 +916,15 @@ int kvm_vgic_vcpu_pending_irq(struct kvm_vcpu *vcpu) 
	if (vcpu->arch.vgic_cpu.vgic_v3.its_vpe.pending_last)

		return true;



	vgic_get_vmcr(vcpu, &vmcr);



	spin_lock_irqsave(&vgic_cpu->ap_list_lock, flags);



	list_for_each_entry(irq, &vgic_cpu->ap_list_head, ap_list) {

		spin_lock(&irq->irq_lock);

		pending = irq_is_pending(irq) && irq->enabled;

		pending = irq_is_pending(irq) && irq->enabled &&

			  !irq->active &&

			  irq->priority < vmcr.pmr;

		spin_unlock(&irq->irq_lock);



		if (pending)