mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 00:48:50 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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: 2291ff2f2a ("KVM: arm64: GICv4.1: Plumb SGI implementation selection in the distributor")
Reviewed-by: Zenghui Yu <yuzenghui@huawei.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
This commit is contained in:
Marc Zyngier 2020-04-24 15:30:30 +01:00
parent 6e977984f6
commit 958e8e14fd
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
virt/kvm/arm/vgic/vgic-init.c
View file

@ -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); 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); ret = vgic_v4_init(kvm);
if (ret) if (ret)
goto out; goto out;

3
virt/kvm/arm/vgic/vgic-mmio-v3.c
View file

@ -50,7 +50,8 @@ bool vgic_has_its(struct kvm *kvm)
bool vgic_supports_direct_msis(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)));
} }
/* /*