Commit 05fb05a6 authored Jun 02, 2016 by Marc Zyngier Committed by Christoffer Dall Jun 02, 2016

KVM: arm/arm64: vgic-new: Removel harmful BUG_ON



When changing the active bit from an MMIO trap, we decide to
explode if the intid is that of a private interrupt.

This flawed logic comes from the fact that we were assuming that
kvm_vcpu_kick() as called by kvm_arm_halt_vcpu() would not return before
the called vcpu responded, but this is not the case, so we need to
perform this wait even for private interrupts.

Dropping the BUG_ON seems like the right thing to do.

 [ Commit message tweaked by Christoffer ]

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

parent c5851328

virt/kvm/arm/vgic/vgic-mmio.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -191,10 +191,8 @@ static void vgic_mmio_change_active(struct kvm_vcpu vcpu, struct vgic_irq irq,
		* other thread sync back the IRQ.
		*/
		while (irq->vcpu && /* IRQ may have state in an LR somewhere */
		irq->vcpu->cpu != -1) { /* VCPU thread is running */
		BUG_ON(irq->intid < VGIC_NR_PRIVATE_IRQS);
		irq->vcpu->cpu != -1) /* VCPU thread is running */
		cond_resched_lock(&irq->irq_lock);
		}

		irq->active = new_active_state;
		if (new_active_state)