Commit d9f943f7 authored by Marc Zyngier's avatar Marc Zyngier Committed by Oliver Upton
Browse files

KVM: arm64: Mark HCR.EL2.E2H RES0 when ID_AA64MMFR1_EL1.VH is zero 



Enforce HCR_EL2.E2H being RES0 when VHE is disabled, so that we can
actually rely on that bit never being flipped behind our back.

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Reviewed-by: default avatarJoey Gouly <joey.gouly@arm.com>
Link: https://lore.kernel.org/r/20250220134907.554085-4-maz@kernel.org


Signed-off-by: default avatarOliver Upton <oliver.upton@linux.dev>
parent 9d674557

arch/arm64/kvm/nested.c

+2 −0
Original line number Diff line number Diff line
@@ -1034,6 +1034,8 @@ int kvm_init_nv_sysregs(struct kvm_vcpu *vcpu) 
		res0 |= (HCR_TEA | HCR_TERR);

	if (!kvm_has_feat(kvm, ID_AA64MMFR1_EL1, LO, IMP))

		res0 |= HCR_TLOR;

	if (!kvm_has_feat(kvm, ID_AA64MMFR1_EL1, VH, IMP))

		res0 |= HCR_E2H;

	if (!kvm_has_feat(kvm, ID_AA64MMFR4_EL1, E2H0, IMP))

		res1 |= HCR_E2H;

	set_sysreg_masks(kvm, HCR_EL2, res0, res1);