Commit 230b0806 authored by Fuad Tabba's avatar Fuad Tabba Committed by Marc Zyngier
Browse files

KVM: arm64: Use kvm_has_mte() in pKVM trap initialization 



When initializing HCR traps in protected mode, use kvm_has_mte() to
check for MTE support rather than kvm_has_feat(kvm, ID_AA64PFR1_EL1,
MTE, IMP).

kvm_has_mte() provides a more comprehensive check:
 - kvm_has_feat() only checks if MTE is in the guest's ID register view
   (i.e., what we advertise to the guest)
 - kvm_has_mte() checks both system_supports_mte() AND whether
   KVM_ARCH_FLAG_MTE_ENABLED is set for this VM instance

Signed-off-by: default avatarFuad Tabba <tabba@google.com>
Link: https://patch.msgid.link/20260122112218.531948-5-tabba@google.com


Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parent 5ee8ad69

arch/arm64/kvm/hyp/nvhe/pkvm.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void pvm_init_traps_hcr(struct kvm_vcpu *vcpu) 
	if (!kvm_has_feat(kvm, ID_AA64PFR0_EL1, AMU, IMP))

		val &= ~(HCR_AMVOFFEN);



	if (!kvm_has_feat(kvm, ID_AA64PFR1_EL1, MTE, IMP)) {

	if (!kvm_has_mte(kvm)) {

		val |= HCR_TID5;

		val &= ~(HCR_DCT | HCR_ATA);

	}