Skip to content

Commit 61eae49

Browse files
LeviYeoReumctmarinas
authored andcommitted
KVM: arm64: Expose FEAT_MTE_TAGGED_FAR feature to guest
expose FEAT_MTE_TAGGED_FAR feature to guest. Signed-off-by: Yeoreum Yun <[email protected]> Acked-by: Marc Zyngier <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 7c7f550 commit 61eae49

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

arch/arm64/kvm/sys_regs.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1617,8 +1617,8 @@ static u64 __kvm_read_sanitised_id_reg(const struct kvm_vcpu *vcpu,
16171617
val &= ~ARM64_FEATURE_MASK(ID_AA64PFR1_EL1_MPAM_frac);
16181618
break;
16191619
case SYS_ID_AA64PFR2_EL1:
1620-
/* We only expose FPMR */
1621-
val &= ID_AA64PFR2_EL1_FPMR;
1620+
val &= ID_AA64PFR2_EL1_FPMR |
1621+
(kvm_has_mte(vcpu->kvm) ? ID_AA64PFR2_EL1_MTEFAR : 0);
16221622
break;
16231623
case SYS_ID_AA64ISAR1_EL1:
16241624
if (!vcpu_has_ptrauth(vcpu))
@@ -2876,7 +2876,9 @@ static const struct sys_reg_desc sys_reg_descs[] = {
28762876
ID_AA64PFR1_EL1_MPAM_frac |
28772877
ID_AA64PFR1_EL1_RAS_frac |
28782878
ID_AA64PFR1_EL1_MTE)),
2879-
ID_WRITABLE(ID_AA64PFR2_EL1, ID_AA64PFR2_EL1_FPMR),
2879+
ID_WRITABLE(ID_AA64PFR2_EL1,
2880+
ID_AA64PFR2_EL1_FPMR |
2881+
ID_AA64PFR2_EL1_MTEFAR),
28802882
ID_UNALLOCATED(4,3),
28812883
ID_WRITABLE(ID_AA64ZFR0_EL1, ~ID_AA64ZFR0_EL1_RES0),
28822884
ID_HIDDEN(ID_AA64SMFR0_EL1),

0 commit comments

Comments
 (0)