Commit 2441418f authored by Marc Zyngier's avatar Marc Zyngier
Browse files

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: default avatarMarc Zyngier <maz@kernel.org>
parent d6a01a2d

arch/arm64/kvm/nested.c

+8 −0
Original line number Diff line number Diff line
@@ -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);