Commit ca7d9c82 authored Dec 09, 2014 by Christoffer Dall

arm/arm64: KVM: Initialize the vgic on-demand when injecting IRQs



Userspace assumes that it can wire up IRQ injections after having
created all VCPUs and after having created the VGIC, but potentially
before starting the first VCPU.  This can currently lead to lost IRQs
because the state of that IRQ injection is not stored anywhere and we
don't return an error to userspace.

We haven't seen this problem manifest itself yet, presumably because
guests reset the devices on boot, but this could cause issues with
migration and other non-standard startup configurations.

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

parent 716139df

virt/kvm/arm/vgic.c

+16 −6

Original line number	Diff line number	Diff line
		@@ -1694,16 +1694,26 @@ out:
		int kvm_vgic_inject_irq(struct kvm *kvm, int cpuid, unsigned int irq_num,
		bool level)
		{
		int ret = 0;
		int vcpu_id;

		if (likely(vgic_ready(kvm))) {
		if (unlikely(!vgic_initialized(kvm))) {
		mutex_lock(&kvm->lock);
		ret = vgic_init(kvm);
		mutex_unlock(&kvm->lock);

		if (ret)
		goto out;
		}

		vcpu_id = vgic_update_irq_pending(kvm, cpuid, irq_num, level);
		if (vcpu_id >= 0)
		if (vcpu_id >= 0) {
		/* kick the specified vcpu */
		kvm_vcpu_kick(kvm_get_vcpu(kvm, vcpu_id));
		}

		return 0;
		out:
		return ret;
		}

		static irqreturn_t vgic_maintenance_handler(int irq, void *data)

Admin message