Commit c2f58514 authored Aug 05, 2015 by Pavel Fedin Committed by Marc Zyngier Sep 16, 2015

arm/arm64: KVM: vgic: Check for !irqchip_in_kernel() when mapping resources



Until b26e5fda ("arm/arm64: KVM: introduce per-VM ops"),
kvm_vgic_map_resources() used to include a check on irqchip_in_kernel(),
and vgic_v2_map_resources() still has it.

But now vm_ops are not initialized until we call kvm_vgic_create().
Therefore kvm_vgic_map_resources() can being called without a VGIC,
and we die because vm_ops.map_resources is NULL.

Fixing this restores QEMU's kernel-irqchip=off option to a working state,
allowing to use GIC emulation in userspace.

Fixes: b26e5fda ("arm/arm64: KVM: introduce per-VM ops")
Cc: stable@vger.kernel.org
Signed-off-by: Pavel Fedin <p.fedin@samsung.com>
[maz: reworked commit message]
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

parent ca09f02f

arch/arm/kvm/arm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -446,7 +446,7 @@ static int kvm_vcpu_first_run_init(struct kvm_vcpu *vcpu)
		* Map the VGIC hardware resources before running a vcpu the first
		* time on this VM.
		*/
		if (unlikely(!vgic_ready(kvm))) {
		if (unlikely(irqchip_in_kernel(kvm) && !vgic_ready(kvm))) {
		ret = kvm_vgic_map_resources(kvm);
		if (ret)
		return ret;