]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
KVM: arm64: Expose MTE_STORE_ONLY feature to guest
authorYeoreum Yun <yeoreum.yun@arm.com>
Wed, 18 Jun 2025 09:29:54 +0000 (10:29 +0100)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 2 Jul 2025 17:50:52 +0000 (18:50 +0100)
expose MTE_STORE_ONLY feature to guest.

Signed-off-by: Yeoreum Yun <yeoreum.yun@arm.com>
Acked-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20250618092957.2069907-6-yeoreum.yun@arm.com
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/kvm/sys_regs.c

index 45457963e8b6e74cd0572d8a569beeb8d1a2d385..adabbb35d33c2b8c2f9e2a89cd242c05b99ccb7b 100644 (file)
@@ -1618,7 +1618,9 @@ static u64 __kvm_read_sanitised_id_reg(const struct kvm_vcpu *vcpu,
                break;
        case SYS_ID_AA64PFR2_EL1:
                val &= ID_AA64PFR2_EL1_FPMR |
-                       (kvm_has_mte(vcpu->kvm) ? ID_AA64PFR2_EL1_MTEFAR : 0);
+                       (kvm_has_mte(vcpu->kvm) ?
+                        ID_AA64PFR2_EL1_MTEFAR | ID_AA64PFR2_EL1_MTESTOREONLY :
+                        0);
                break;
        case SYS_ID_AA64ISAR1_EL1:
                if (!vcpu_has_ptrauth(vcpu))
@@ -2878,7 +2880,8 @@ static const struct sys_reg_desc sys_reg_descs[] = {
                                       ID_AA64PFR1_EL1_MTE)),
        ID_WRITABLE(ID_AA64PFR2_EL1,
                    ID_AA64PFR2_EL1_FPMR |
-                   ID_AA64PFR2_EL1_MTEFAR),
+                   ID_AA64PFR2_EL1_MTEFAR |
+                   ID_AA64PFR2_EL1_MTESTOREONLY),
        ID_UNALLOCATED(4,3),
        ID_WRITABLE(ID_AA64ZFR0_EL1, ~ID_AA64ZFR0_EL1_RES0),
        ID_HIDDEN(ID_AA64SMFR0_EL1),