arm/arm64: KVM: vgic: Force VM halt when changing the active state of GICv3 PPIs/SGIs

Marc Zyngier · Marc Zyngier · commit 107352a24900 · 2018-12-19T17:47:08.000Z
We currently only halt the guest when a vCPU messes with the active
state of an SPI. This is perfectly fine for GICv2, but isn't enough
for GICv3, where all vCPUs can access the state of any other vCPU.

Let's broaden the condition to include any GICv3 interrupt that
has an active state (i.e. all but LPIs).

Cc: stable@vger.kernel.org
Reviewed-by: Christoffer Dall &lt;christoffer.dall@arm.com&gt;
Signed-off-by: Marc Zyngier &lt;marc.zyngier@arm.com&gt;
diff --git a/virt/kvm/arm/vgic/vgic-mmio.c b/virt/kvm/arm/vgic/vgic-mmio.c
@@ -362,14 +362,16 @@ static void vgic_mmio_change_active(struct kvm_vcpu *vcpu, struct vgic_irq *irq,
  */
 static void vgic_change_active_prepare(struct kvm_vcpu *vcpu, u32 intid)
 {
-	if (intid > VGIC_NR_PRIVATE_IRQS)
+	if (vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3 ||
+	    intid > VGIC_NR_PRIVATE_IRQS)
 		kvm_arm_halt_guest(vcpu->kvm);
 }
 
 /* See vgic_change_active_prepare */
 static void vgic_change_active_finish(struct kvm_vcpu *vcpu, u32 intid)
 {
-	if (intid > VGIC_NR_PRIVATE_IRQS)
+	if (vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3 ||
+	    intid > VGIC_NR_PRIVATE_IRQS)
 		kvm_arm_resume_guest(vcpu->kvm);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -362,14 +362,16 @@ static void vgic_mmio_change_active(struct kvm_vcpu vcpu, struct vgic_irq irq,`
`362`	`362`	`*/`
`363`	`363`	`static void vgic_change_active_prepare(struct kvm_vcpu *vcpu, u32 intid)`
`364`	`364`	`{`
`365`		`- if (intid > VGIC_NR_PRIVATE_IRQS)`
	`365`	`+ if (vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3 \|\|`
	`366`	`+ intid > VGIC_NR_PRIVATE_IRQS)`
`366`	`367`	`kvm_arm_halt_guest(vcpu->kvm);`
`367`	`368`	`}`
`368`	`369`
`369`	`370`	`/* See vgic_change_active_prepare */`
`370`	`371`	`static void vgic_change_active_finish(struct kvm_vcpu *vcpu, u32 intid)`
`371`	`372`	`{`
`372`		`- if (intid > VGIC_NR_PRIVATE_IRQS)`
	`373`	`+ if (vcpu->kvm->arch.vgic.vgic_model == KVM_DEV_TYPE_ARM_VGIC_V3 \|\|`
	`374`	`+ intid > VGIC_NR_PRIVATE_IRQS)`
`373`	`375`	`kvm_arm_resume_guest(vcpu->kvm);`
`374`	`376`	`}`
`375`	`377`