On 6/25/24 19:05, Marc Zyngier wrote:
> If our guest has been configured without PAN2, make sure that
> AT S1E1{R,W}P will generate an UNDEF.
>
> Signed-off-by: Marc Zyngier <maz@xxxxxxxxxx>
> ---
> arch/arm64/kvm/sys_regs.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
> index 832c6733db307..06c39f191b5ec 100644
> --- a/arch/arm64/kvm/sys_regs.c
> +++ b/arch/arm64/kvm/sys_regs.c
> @@ -4585,6 +4585,10 @@ void kvm_calculate_traps(struct kvm_vcpu *vcpu)
> HFGITR_EL2_TLBIRVAAE1OS |
> HFGITR_EL2_TLBIRVAE1OS);
>
> + if (!kvm_has_feat(kvm, ID_AA64MMFR1_EL1, PAN, PAN2))
> + kvm->arch.fgu[HFGITR_GROUP] |= (HFGITR_EL2_ATS1E1RP |
> + HFGITR_EL2_ATS1E1WP);
> +
> if (!kvm_has_feat(kvm, ID_AA64MMFR3_EL1, S1PIE, IMP))
> kvm->arch.fgu[HFGxTR_GROUP] |= (HFGxTR_EL2_nPIRE0_EL1 |
> HFGxTR_EL2_nPIR_EL1);
As you had explained earlier about FGT UNDEF implementation, the above
code change makes sense.
FWIW
Reviewed-by: Anshuman Khandual <anshuman.khandual@xxxxxxx>
