[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <7eb443d1-b247-943b-36e6-a478b7a9d78f@redhat.com>
Date: Wed, 8 Nov 2017 09:46:29 +0100
From: Auger Eric <eric.auger@...hat.com>
To: Marc Zyngier <marc.zyngier@....com>,
linux-arm-kernel@...ts.infradead.org, kvmarm@...ts.cs.columbia.edu,
kvm@...r.kernel.org, linux-kernel@...r.kernel.org
Cc: Mark Rutland <mark.rutland@....com>,
Christoffer Dall <cdall@...aro.org>,
Andre Przywara <Andre.Przywara@....com>,
Shameerali Kolothum Thodi
<shameerali.kolothum.thodi@...wei.com>,
Christoffer Dall <christoffer.dall@...aro.org>,
Shanker Donthineni <shankerd@...eaurora.org>
Subject: Re: [PATCH v5 22/26] KVM: arm/arm64: GICv4: Enable virtual cpuif if
VLPIs can be delivered
Hi,
On 27/10/2017 16:28, Marc Zyngier wrote:
> In order for VLPIs to be delivered to the guest, we must make
> sure that the
virtual
cpuif is always enabled, irrespective of the
> presence of virtual interrupt in the LRs.
>
> Acked-by: Christoffer Dall <cdall@...aro.org>
> Signed-off-by: Marc Zyngier <marc.zyngier@....com>
Reviewed-by: Eric Auger <eric.auger@...hat.com>
Thanks
Eric
> ---
> virt/kvm/arm/hyp/vgic-v3-sr.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/virt/kvm/arm/hyp/vgic-v3-sr.c b/virt/kvm/arm/hyp/vgic-v3-sr.c
> index 91728faa13fd..f5c3d6d7019e 100644
> --- a/virt/kvm/arm/hyp/vgic-v3-sr.c
> +++ b/virt/kvm/arm/hyp/vgic-v3-sr.c
> @@ -258,7 +258,8 @@ void __hyp_text __vgic_v3_save_state(struct kvm_vcpu *vcpu)
> cpu_if->vgic_ap1r[0] = __vgic_v3_read_ap1rn(0);
> }
> } else {
> - if (static_branch_unlikely(&vgic_v3_cpuif_trap))
> + if (static_branch_unlikely(&vgic_v3_cpuif_trap) ||
> + cpu_if->its_vpe.its_vm)
> write_gicreg(0, ICH_HCR_EL2);
>
> cpu_if->vgic_elrsr = 0xffff;
> @@ -337,9 +338,11 @@ void __hyp_text __vgic_v3_restore_state(struct kvm_vcpu *vcpu)
> /*
> * If we need to trap system registers, we must write
> * ICH_HCR_EL2 anyway, even if no interrupts are being
> - * injected,
> + * injected. Same thing if GICv4 is used, as VLPI
> + * delivery is gated by ICH_HCR_EL2.En.
> */
> - if (static_branch_unlikely(&vgic_v3_cpuif_trap))
> + if (static_branch_unlikely(&vgic_v3_cpuif_trap) ||
> + cpu_if->its_vpe.its_vm)
> write_gicreg(cpu_if->vgic_hcr, ICH_HCR_EL2);
> }
>
>
Powered by blists - more mailing lists