Add feature_config_ctrl for RAS and AMU, which are indicated in
ID_AA64PFR0_EL1, to program configuration registers to trap
guest's using those features when they are not exposed to the guest.
Introduce trap_ras_regs() to change a behavior of guest's access to
the registers, which is currently raz/wi, depending on the feature's
availability for the guest (and inject undefined instruction
exception when guest's RAS register access are trapped and RAS is
not exposed to the guest). In order to keep the current visibility
of the RAS registers from userspace (always visible), a visibility
function for RAS registers is not added.
Signed-off-by: Reiji Watanabe <reijiw@xxxxxxxxxx>
---
arch/arm64/kvm/sys_regs.c | 92 +++++++++++++++++++++++++++++++++++----
1 file changed, 83 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 7fe44dec11fd..fecd54a58d34 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -320,6 +320,63 @@ struct feature_config_ctrl {
void (*trap_activate)(struct kvm_vcpu *vcpu);
};
+enum vcpu_config_reg {
+ VCPU_HCR_EL2 = 1,
+ VCPU_MDCR_EL2,
+ VCPU_CPTR_EL2,
+};
+
+static void feature_trap_activate(struct kvm_vcpu *vcpu,
+ enum vcpu_config_reg cfg_reg,
+ u64 cfg_set, u64 cfg_clear)
+{
+ u64 *reg_ptr, reg_val;
+
+ switch (cfg_reg) {
+ case VCPU_HCR_EL2:
+ reg_ptr = &vcpu->arch.hcr_el2;
+ break;
+ case VCPU_MDCR_EL2:
+ reg_ptr = &vcpu->arch.mdcr_el2;
+ break;
+ case VCPU_CPTR_EL2:
+ reg_ptr = &vcpu->arch.cptr_el2;
+ break;
+ }
+
+ /* Clear/Set fields that are indicated by cfg_clear/cfg_set. */
+ reg_val = (*reg_ptr & ~cfg_clear);
+ reg_val |= cfg_set;
+ *reg_ptr = reg_val;
+}
+
+static void feature_ras_trap_activate(struct kvm_vcpu *vcpu)
+{
+ feature_trap_activate(vcpu, VCPU_HCR_EL2, HCR_TERR | HCR_TEA, HCR_FIEN);
+}
+
+static void feature_amu_trap_activate(struct kvm_vcpu *vcpu)
+{
+ feature_trap_activate(vcpu, VCPU_CPTR_EL2, CPTR_EL2_TAM, 0);
+}
+
+/* For ID_AA64PFR0_EL1 */
+static struct feature_config_ctrl ftr_ctrl_ras = {
+ .ftr_reg = SYS_ID_AA64PFR0_EL1,
+ .ftr_shift = ID_AA64PFR0_RAS_SHIFT,
+ .ftr_min = ID_AA64PFR0_RAS_V1,
+ .ftr_signed = FTR_UNSIGNED,
+ .trap_activate = feature_ras_trap_activate,
+};
+
+static struct feature_config_ctrl ftr_ctrl_amu = {
+ .ftr_reg = SYS_ID_AA64PFR0_EL1,
+ .ftr_shift = ID_AA64PFR0_AMU_SHIFT,
+ .ftr_min = ID_AA64PFR0_AMU,
+ .ftr_signed = FTR_UNSIGNED,
+ .trap_activate = feature_amu_trap_activate,
+};
+
#define __FTR_BITS(ftr_sign, ftr_type, bit_pos, safe) { \
.sign = ftr_sign, \
.type = ftr_type, \
@@ -954,6 +1011,18 @@ static inline bool vcpu_feature_is_available(struct kvm_vcpu *vcpu,
return feature_avail(ctrl, val);
}
+static bool trap_ras_regs(struct kvm_vcpu *vcpu,
+ struct sys_reg_params *p,
+ const struct sys_reg_desc *r)
+{
+ if (!vcpu_feature_is_available(vcpu, &ftr_ctrl_ras)) {
+ kvm_inject_undefined(vcpu);
+ return false;
+ }
+
+ return trap_raz_wi(vcpu, p, r);
+}
+
/*
* ARMv8.1 mandates at least a trivial LORegion implementation, where all the
* RW registers are RES0 (which we can implement as RAZ/WI). On an ARMv8.0
@@ -2786,14 +2855,14 @@ static const struct sys_reg_desc sys_reg_descs[] = {
{ SYS_DESC(SYS_AFSR1_EL1), access_vm_reg, reset_unknown, AFSR1_EL1 },
{ SYS_DESC(SYS_ESR_EL1), access_vm_reg, reset_unknown, ESR_EL1 },
- { SYS_DESC(SYS_ERRIDR_EL1), trap_raz_wi },
- { SYS_DESC(SYS_ERRSELR_EL1), trap_raz_wi },
- { SYS_DESC(SYS_ERXFR_EL1), trap_raz_wi },
- { SYS_DESC(SYS_ERXCTLR_EL1), trap_raz_wi },
- { SYS_DESC(SYS_ERXSTATUS_EL1), trap_raz_wi },
- { SYS_DESC(SYS_ERXADDR_EL1), trap_raz_wi },
- { SYS_DESC(SYS_ERXMISC0_EL1), trap_raz_wi },
- { SYS_DESC(SYS_ERXMISC1_EL1), trap_raz_wi },
+ { SYS_DESC(SYS_ERRIDR_EL1), trap_ras_regs },
+ { SYS_DESC(SYS_ERRSELR_EL1), trap_ras_regs },
+ { SYS_DESC(SYS_ERXFR_EL1), trap_ras_regs },
+ { SYS_DESC(SYS_ERXCTLR_EL1), trap_ras_regs },
+ { SYS_DESC(SYS_ERXSTATUS_EL1), trap_ras_regs },
+ { SYS_DESC(SYS_ERXADDR_EL1), trap_ras_regs },
+ { SYS_DESC(SYS_ERXMISC0_EL1), trap_ras_regs },
+ { SYS_DESC(SYS_ERXMISC1_EL1), trap_ras_regs },
MTE_REG(TFSR_EL1),
MTE_REG(TFSRE0_EL1),
@@ -4230,7 +4299,12 @@ static struct id_reg_desc id_aa64pfr0_el1_desc = {
.ftr_bits = {
S_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_FP_SHIFT, ID_AA64PFR0_FP_NI),
S_FTR_BITS(FTR_LOWER_SAFE, ID_AA64PFR0_ASIMD_SHIFT, ID_AA64PFR0_ASIMD_NI),
- }
+ },
+ .trap_features = &(const struct feature_config_ctrl *[]) {
+ &ftr_ctrl_ras,
+ &ftr_ctrl_amu,
+ NULL,
+ },
};
static struct id_reg_desc id_aa64pfr1_el1_desc = {
--
2.36.0.rc0.470.gd361397f0d-goog
