KVM: arm/arm64: vgic-v2: Set active_source to 0 when restoring state

When restoring the active state from userspace, we don't know which CPU
was the source for the active state, and this is not architecturally
exposed in any of the register state.

Set the active_source to 0 in this case.  In the future, we can expand
on this and exposse the information as additional information to
userspace for GICv2 if anyone cares.

Cc: stable@vger.kernel.org
Signed-off-by: Christoffer Dall <christoffer.dall@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

diff --git a/virt/kvm/arm/vgic/vgic-mmio.c b/virt/kvm/arm/vgic/vgic-mmio.c
index f56ff1cf52ec25fc73aa15e4b1f909ef755c95d4..2b450d49a0467a93776d814d9e6fc4a8e82c45ec 100644 (file)
--- a/virt/kvm/arm/vgic/vgic-mmio.c
+++ b/virt/kvm/arm/vgic/vgic-mmio.c
@@ -338,11 +338,26 @@ static void vgic_mmio_change_active(struct kvm_vcpu *vcpu, struct vgic_irq *irq,
                vgic_hw_irq_change_active(vcpu, irq, active, !requester_vcpu);
        } else {
                u32 model = vcpu->kvm->arch.vgic.vgic_model;
+               u8 active_source;
 
                irq->active = active;
+
+               /*
+                * The GICv2 architecture indicates that the source CPUID for
+                * an SGI should be provided during an EOI which implies that
+                * the active state is stored somewhere, but at the same time
+                * this state is not architecturally exposed anywhere and we
+                * have no way of knowing the right source.
+                *
+                * This may lead to a VCPU not being able to receive
+                * additional instances of a particular SGI after migration
+                * for a GICv2 VM on some GIC implementations.  Oh well.
+                */
+               active_source = (requester_vcpu) ? requester_vcpu->vcpu_id : 0;
+
                if (model == KVM_DEV_TYPE_ARM_VGIC_V2 &&
                    active && vgic_irq_is_sgi(irq->intid))
-                       irq->active_source = requester_vcpu->vcpu_id;
+                       irq->active_source = active_source;
        }
 
        if (irq->active)