Skip to content

Commit 9065985

Browse files
author
Marc Zyngier
committed
KVM: arm64: nv: Honor absence of FEAT_PAN2
If our guest has been configured without PAN2, make sure that AT S1E1{R,W}P will generate an UNDEF. Reviewed-by: Anshuman Khandual <anshuman.khandual@arm.com> Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent 0a0f25b commit 9065985

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

arch/arm64/kvm/sys_regs.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4600,6 +4600,10 @@ void kvm_calculate_traps(struct kvm_vcpu *vcpu)
46004600
HFGITR_EL2_TLBIRVAAE1OS |
46014601
HFGITR_EL2_TLBIRVAE1OS);
46024602

4603+
if (!kvm_has_feat(kvm, ID_AA64MMFR1_EL1, PAN, PAN2))
4604+
kvm->arch.fgu[HFGITR_GROUP] |= (HFGITR_EL2_ATS1E1RP |
4605+
HFGITR_EL2_ATS1E1WP);
4606+
46034607
if (!kvm_has_feat(kvm, ID_AA64MMFR3_EL1, S1PIE, IMP))
46044608
kvm->arch.fgu[HFGxTR_GROUP] |= (HFGxTR_EL2_nPIRE0_EL1 |
46054609
HFGxTR_EL2_nPIR_EL1);

0 commit comments

Comments
 (0)