Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0099b770 authored by Christoffer Dall's avatar Christoffer Dall
Browse files

KVM: arm/arm64: vgic: Don't flush/sync without a working vgic 



If the vgic hasn't been created and initialized, we shouldn't attempt to
look at its data structures or flush/sync anything to the GIC hardware.

This fixes an issue reported by Alexander Graf when using a userspace
irqchip.

Fixes: 0919e84c ("KVM: arm/arm64: vgic-new: Add IRQ sync/flush framework")
Cc: stable@vger.kernel.org
Reported-by: default avatarAlexander Graf <agraf@suse.de>
Acked-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarChristoffer Dall <christoffer.dall@linaro.org>
parent 6fe407f2

virt/kvm/arm/vgic/vgic.c

+6 −0
Original line number Diff line number Diff line
@@ -645,6 +645,9 @@ static void vgic_flush_lr_state(struct kvm_vcpu *vcpu) 
/* Sync back the hardware VGIC state into our emulation after a guest's run. */

void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu)

{

	if (unlikely(!vgic_initialized(vcpu->kvm)))

		return;



	vgic_process_maintenance_interrupt(vcpu);

	vgic_fold_lr_state(vcpu);

	vgic_prune_ap_list(vcpu);
@@ -653,6 +656,9 @@ void kvm_vgic_sync_hwstate(struct kvm_vcpu *vcpu) 
/* Flush our emulation state into the GIC hardware before entering the guest. */

void kvm_vgic_flush_hwstate(struct kvm_vcpu *vcpu)

{

	if (unlikely(!vgic_initialized(vcpu->kvm)))

		return;



	spin_lock(&vcpu->arch.vgic_cpu.ap_list_lock);

	vgic_flush_lr_state(vcpu);

	spin_unlock(&vcpu->arch.vgic_cpu.ap_list_lock);