]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
KVM: arm64: nv: Sanitise SCTLR_EL1.EPAN according to VM configuration
authorMarc Zyngier <maz@kernel.org>
Mon, 15 Jul 2024 16:22:19 +0000 (17:22 +0100)
committerMarc Zyngier <maz@kernel.org>
Fri, 30 Aug 2024 11:04:20 +0000 (12:04 +0100)
Ensure that SCTLR_EL1.EPAN is RES0 when FEAT_PAN3 isn't supported.

Signed-off-by: Marc Zyngier <maz@kernel.org>
arch/arm64/kvm/nested.c

index 9c8573493d80711d0ac3903937bb0109e0b423f1..133cc2f9530dfd9e65646cb603f780125a332cb4 100644 (file)
@@ -1178,6 +1178,14 @@ int kvm_init_nv_sysregs(struct kvm *kvm)
        if (!kvm_has_feat(kvm, ID_AA64PFR0_EL1, AMU, V1P1))
                res0 |= ~(res0 | res1);
        set_sysreg_masks(kvm, HAFGRTR_EL2, res0, res1);
+
+       /* SCTLR_EL1 */
+       res0 = SCTLR_EL1_RES0;
+       res1 = SCTLR_EL1_RES1;
+       if (!kvm_has_feat(kvm, ID_AA64MMFR1_EL1, PAN, PAN3))
+               res0 |= SCTLR_EL1_EPAN;
+       set_sysreg_masks(kvm, SCTLR_EL1, res0, res1);
+
 out:
        mutex_unlock(&kvm->arch.config_lock);