Hi Andre,
On 17/11/2017 18:58, Andre Przywara wrote:
> Commit f39d16cbabf9 ("KVM: arm/arm64: Guard kvm_vgic_map_is_active against
> !vgic_initialized") introduced a check whether the VGIC has been
> initialized before accessing the spinlock and the VGIC data structure.
> However the vgic_get_irq() call in the variable declaration sneaked
> through the net, so lets make sure that this also gets called only after
> we actually allocated the arrays this function accesses.
>
> Signed-off-by: Andre Przywara <andre.przywara@xxxxxxx>
actually it does not directly apply on kvmarm/next. There is a small
conflict with 47bbd31 KVM: arm/arm64: vgic: restructure
kvm_vgic_(un)map_phys_irq I think.
Cheers
Eric
> ---
> virt/kvm/arm/vgic/vgic.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/virt/kvm/arm/vgic/vgic.c b/virt/kvm/arm/vgic/vgic.c
> index e54ef2fdf73d..967983a33ab2 100644
> --- a/virt/kvm/arm/vgic/vgic.c
> +++ b/virt/kvm/arm/vgic/vgic.c
> @@ -786,13 +786,14 @@ void vgic_kick_vcpus(struct kvm *kvm)
>
> 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);
> + struct vgic_irq *irq;
> bool map_is_active;
> unsigned long flags;
>
> if (!vgic_initialized(vcpu->kvm))
> return false;
>
> + irq = vgic_get_irq(vcpu->kvm, vcpu, virt_irq);
> spin_lock_irqsave(&irq->irq_lock, flags);
> map_is_active = irq->hw && irq->active;
> spin_unlock_irqrestore(&irq->irq_lock, flags);
>
