Commit b7f345fb authored by Vladimir Murzin's avatar Vladimir Murzin Committed by Marc Zyngier
Browse files

KVM: arm64: Fix FEAT_MTE in pKVM 



Make sure we do not trap access to Allocation Tags.

Fixes: b56680de ("KVM: arm64: Initialize trap register values in hyp in pKVM")
Signed-off-by: default avatarVladimir Murzin <vladimir.murzin@arm.com>
Reviewed-by: default avatarOliver Upton <oliver.upton@linux.dev>
Reviewed-by: default avatarFuad Tabba <tabba@google.com>
Link: https://lore.kernel.org/r/20250106112421.65355-1-vladimir.murzin@arm.com


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

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

+6 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ static void pkvm_vcpu_reset_hcr(struct kvm_vcpu *vcpu) 


	if (vcpu_has_ptrauth(vcpu))

		vcpu->arch.hcr_el2 |= (HCR_API | HCR_APK);



	if (kvm_has_mte(vcpu->kvm))

		vcpu->arch.hcr_el2 |= HCR_ATA;

}



static void pvm_init_traps_hcr(struct kvm_vcpu *vcpu)
@@ -251,6 +254,9 @@ static void pkvm_init_features_from_host(struct pkvm_hyp_vm *hyp_vm, const struc 
	unsigned long host_arch_flags = READ_ONCE(host_kvm->arch.flags);

	DECLARE_BITMAP(allowed_features, KVM_VCPU_MAX_FEATURES);



	if (test_bit(KVM_ARCH_FLAG_MTE_ENABLED, &host_kvm->arch.flags))

		set_bit(KVM_ARCH_FLAG_MTE_ENABLED, &kvm->arch.flags);



	/* No restrictions for non-protected VMs. */

	if (!kvm_vm_is_protected(kvm)) {

		hyp_vm->kvm.arch.flags = host_arch_flags;