Add feature_config_ctrl for MTE, which is indicated in
ID_AA64PFR1_EL1, to program configuration register to trap the
guest's using the feature when it is not exposed to the guest.
Signed-off-by: Reiji Watanabe <reijiw@xxxxxxxxxx>
---
arch/arm64/kvm/sys_regs.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 3f3f2800ff8b..924ffedf4b05 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -345,6 +345,11 @@ static void feature_amu_trap_activate(struct kvm_vcpu *vcpu)
feature_trap_activate(vcpu, VCPU_CPTR_EL2, CPTR_EL2_TAM, 0);
}
+static void feature_mte_trap_activate(struct kvm_vcpu *vcpu)
+{
+ feature_trap_activate(vcpu, VCPU_HCR_EL2, HCR_TID5, HCR_DCT | HCR_ATA);
+}
+
/* For ID_AA64PFR0_EL1 */
static struct feature_config_ctrl ftr_ctrl_ras = {
.ftr_reg = SYS_ID_AA64PFR0_EL1,
@@ -362,6 +367,15 @@ static struct feature_config_ctrl ftr_ctrl_amu = {
.trap_activate = feature_amu_trap_activate,
};
+/* For ID_AA64PFR1_EL1 */
+static struct feature_config_ctrl ftr_ctrl_mte = {
+ .ftr_reg = SYS_ID_AA64PFR1_EL1,
+ .ftr_shift = ID_AA64PFR1_MTE_SHIFT,
+ .ftr_min = ID_AA64PFR1_MTE_EL0,
+ .ftr_signed = FTR_UNSIGNED,
+ .trap_activate = feature_mte_trap_activate,
+};
+
/* id_reg_desc flags field values */
#define ID_DESC_REG_UNALLOC (1UL << 0)
#define ID_DESC_REG_HIDDEN (1UL << 1)
@@ -3682,6 +3696,10 @@ static struct id_reg_desc id_aa64pfr1_el1_desc = {
.init = init_id_aa64pfr1_el1_desc,
.validate = validate_id_aa64pfr1_el1,
.vcpu_mask = vcpu_mask_id_aa64pfr1_el1,
+ .trap_features = &(const struct feature_config_ctrl *[]) {
+ &ftr_ctrl_mte,
+ NULL,
+ },
};
static struct id_reg_desc id_aa64isar0_el1_desc = {
--
2.35.1.723.g4982287a31-goog
