Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f39d16cb authored by Christoffer Dall's avatar Christoffer Dall Committed by Christoffer Dall
Browse files

KVM: arm/arm64: Guard kvm_vgic_map_is_active against !vgic_initialized 



If the vgic is not initialized, don't try to grab its spinlocks or
traverse its data structures.

This is important because we soon have to start considering the active
state of a virtual interrupts when doing vcpu_load, which may happen
early on before the vgic is initialized.

Signed-off-by: default avatarChristoffer Dall <cdall@linaro.org>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent e6d68b00

virt/kvm/arm/vgic/vgic.c

+3 −0
Original line number Diff line number Diff line
@@ -777,6 +777,9 @@ bool kvm_vgic_map_is_active(struct kvm_vcpu *vcpu, unsigned int virt_irq) 
	struct vgic_irq *irq = vgic_get_irq(vcpu->kvm, vcpu, virt_irq);

	bool map_is_active;



	if (!vgic_initialized(vcpu->kvm))

		return false;



	spin_lock(&irq->irq_lock);

	map_is_active = irq->hw && irq->active;

	spin_unlock(&irq->irq_lock);