Commit 958e8e14 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

KVM: arm64: vgic-v4: Initialize GICv4.1 even in the absence of a virtual ITS



KVM now expects to be able to use HW-accelerated delivery of vSGIs
as soon as the guest has enabled thm. Unfortunately, we only
initialize the GICv4 context if we have a virtual ITS exposed to
the guest.

Fix it by always initializing the GICv4.1 context if it is
available on the host.

Fixes: 2291ff2f ("KVM: arm64: GICv4.1: Plumb SGI implementation selection in the distributor")
Reviewed-by: default avatarZenghui Yu <yuzenghui@huawei.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 6e977984
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -294,8 +294,15 @@ int vgic_init(struct kvm *kvm)
		}
	}

	if (vgic_has_its(kvm)) {
	if (vgic_has_its(kvm))
		vgic_lpi_translation_cache_init(kvm);

	/*
	 * If we have GICv4.1 enabled, unconditionnaly request enable the
	 * v4 support so that we get HW-accelerated vSGIs. Otherwise, only
	 * enable it if we present a virtual ITS to the guest.
	 */
	if (vgic_supports_direct_msis(kvm)) {
		ret = vgic_v4_init(kvm);
		if (ret)
			goto out;
+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ bool vgic_has_its(struct kvm *kvm)

bool vgic_supports_direct_msis(struct kvm *kvm)
{
	return kvm_vgic_global_state.has_gicv4 && vgic_has_its(kvm);
	return (kvm_vgic_global_state.has_gicv4_1 ||
		(kvm_vgic_global_state.has_gicv4 && vgic_has_its(kvm)));
}

/*