Skip to content

Commit 230b080

Browse files
Fuad TabbaMarc Zyngier
authored andcommitted
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: Fuad Tabba <tabba@google.com> Link: https://patch.msgid.link/20260122112218.531948-5-tabba@google.com Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent 5ee8ad6 commit 230b080

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static void pvm_init_traps_hcr(struct kvm_vcpu *vcpu)
8282
if (!kvm_has_feat(kvm, ID_AA64PFR0_EL1, AMU, IMP))
8383
val &= ~(HCR_AMVOFFEN);
8484

85-
if (!kvm_has_feat(kvm, ID_AA64PFR1_EL1, MTE, IMP)) {
85+
if (!kvm_has_mte(kvm)) {
8686
val |= HCR_TID5;
8787
val &= ~(HCR_DCT | HCR_ATA);
8888
}

0 commit comments

Comments
 (0)