From: Marc Zyngier <maz@kernel.org>
Date: Mon, 15 Jul 2024 16:22:19 +0000 (+0100)
Subject: KVM: arm64: nv: Sanitise SCTLR_EL1.EPAN according to VM configuration
X-Git-Tag: v6.12-rc1~11^2~13^2~2^2~3
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2441418f3aadb3f9232431aeb10d89e48a934d94;p=linux-block.git

KVM: arm64: nv: Sanitise SCTLR_EL1.EPAN according to VM configuration

Ensure that SCTLR_EL1.EPAN is RES0 when FEAT_PAN3 isn't supported.

Signed-off-by: Marc Zyngier <maz@kernel.org>
---

diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c
index 9c8573493d80..133cc2f9530d 100644
--- a/arch/arm64/kvm/nested.c
+++ b/arch/arm64/kvm/nested.c
@@ -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);