Use id_reg_desc_table for ID registers instead of sys_reg_descs as
id_reg_desc_table has all ID register entries that sys_reg_descs
has, and remove the ID register entries from sys_reg_descs, which
are no longer used.
Signed-off-by: Reiji Watanabe <reijiw@xxxxxxxxxx>
---
arch/arm64/kvm/sys_regs.c | 201 +++++++++++++++++---------------------
1 file changed, 92 insertions(+), 109 deletions(-)
diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index fe2a4de2b8f3..ba851de6486d 100644
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -337,6 +337,11 @@ struct id_reg_desc {
const struct id_reg_desc *id_reg);
};
+static inline struct id_reg_desc *sys_to_id_desc(const struct sys_reg_desc *r)
+{
+ return container_of(r, struct id_reg_desc, reg_desc);
+}
+
static void id_reg_desc_init(struct id_reg_desc *id_reg)
{
u32 id = reg_to_encoding(&id_reg->reg_desc);
@@ -1696,23 +1701,15 @@ static u64 __read_id_reg(const struct kvm_vcpu *vcpu,
return val;
}
-static u64 read_id_reg_with_encoding(const struct kvm_vcpu *vcpu, u32 id)
+static u64 read_id_reg_with_encoding(const struct kvm_vcpu *vcpu, u32 encoding)
{
- u64 val;
- const struct id_reg_desc *id_reg = get_id_reg_desc(id);
-
- if (id_reg)
- val = __read_id_reg(vcpu, id_reg);
- else
- val = read_kvm_id_reg(vcpu->kvm, id);
-
- return val;
+ return __read_id_reg(vcpu, get_id_reg_desc(encoding));
}
static u64 read_id_reg(const struct kvm_vcpu *vcpu,
struct sys_reg_desc const *r, bool raz)
{
- return raz ? 0 : read_id_reg_with_encoding(vcpu, reg_to_encoding(r));
+ return raz ? 0 : __read_id_reg(vcpu, sys_to_id_desc(r));
}
static unsigned int id_visibility(const struct kvm_vcpu *vcpu,
@@ -1826,13 +1823,7 @@ static int __set_id_reg(struct kvm_vcpu *vcpu,
if (raz)
return -EINVAL;
- /*
- * Don't allow to modify the register's value if the register doesn't
- * have the id_reg_desc.
- */
- id_reg = get_id_reg_desc(encoding);
- if (!id_reg)
- return -EINVAL;
+ id_reg = sys_to_id_desc(rd);
/*
* Skip the validation of AArch32 ID registers if the system doesn't
@@ -2055,83 +2046,6 @@ static const struct sys_reg_desc sys_reg_descs[] = {
{ SYS_DESC(SYS_MPIDR_EL1), NULL, reset_mpidr, MPIDR_EL1 },
- /*
- * ID regs: all ID_SANITISED() entries here must have corresponding
- * entries in arm64_ftr_regs[].
- */
-
- /* AArch64 mappings of the AArch32 ID registers */
- /* CRm=1 */
- ID_SANITISED(ID_PFR0_EL1),
- ID_SANITISED(ID_PFR1_EL1),
- ID_SANITISED(ID_DFR0_EL1),
- ID_HIDDEN(ID_AFR0_EL1),
- ID_SANITISED(ID_MMFR0_EL1),
- ID_SANITISED(ID_MMFR1_EL1),
- ID_SANITISED(ID_MMFR2_EL1),
- ID_SANITISED(ID_MMFR3_EL1),
-
- /* CRm=2 */
- ID_SANITISED(ID_ISAR0_EL1),
- ID_SANITISED(ID_ISAR1_EL1),
- ID_SANITISED(ID_ISAR2_EL1),
- ID_SANITISED(ID_ISAR3_EL1),
- ID_SANITISED(ID_ISAR4_EL1),
- ID_SANITISED(ID_ISAR5_EL1),
- ID_SANITISED(ID_MMFR4_EL1),
- ID_SANITISED(ID_ISAR6_EL1),
-
- /* CRm=3 */
- ID_SANITISED(MVFR0_EL1),
- ID_SANITISED(MVFR1_EL1),
- ID_SANITISED(MVFR2_EL1),
- ID_UNALLOCATED(3,3),
- ID_SANITISED(ID_PFR2_EL1),
- ID_HIDDEN(ID_DFR1_EL1),
- ID_SANITISED(ID_MMFR5_EL1),
- ID_UNALLOCATED(3,7),
-
- /* AArch64 ID registers */
- /* CRm=4 */
- ID_SANITISED(ID_AA64PFR0_EL1),
- ID_SANITISED(ID_AA64PFR1_EL1),
- ID_UNALLOCATED(4,2),
- ID_UNALLOCATED(4,3),
- ID_SANITISED(ID_AA64ZFR0_EL1),
- ID_UNALLOCATED(4,5),
- ID_UNALLOCATED(4,6),
- ID_UNALLOCATED(4,7),
-
- /* CRm=5 */
- ID_SANITISED(ID_AA64DFR0_EL1),
- ID_SANITISED(ID_AA64DFR1_EL1),
- ID_UNALLOCATED(5,2),
- ID_UNALLOCATED(5,3),
- ID_HIDDEN(ID_AA64AFR0_EL1),
- ID_HIDDEN(ID_AA64AFR1_EL1),
- ID_UNALLOCATED(5,6),
- ID_UNALLOCATED(5,7),
-
- /* CRm=6 */
- ID_SANITISED(ID_AA64ISAR0_EL1),
- ID_SANITISED(ID_AA64ISAR1_EL1),
- ID_SANITISED(ID_AA64ISAR2_EL1),
- ID_UNALLOCATED(6,3),
- ID_UNALLOCATED(6,4),
- ID_UNALLOCATED(6,5),
- ID_UNALLOCATED(6,6),
- ID_UNALLOCATED(6,7),
-
- /* CRm=7 */
- ID_SANITISED(ID_AA64MMFR0_EL1),
- ID_SANITISED(ID_AA64MMFR1_EL1),
- ID_SANITISED(ID_AA64MMFR2_EL1),
- ID_UNALLOCATED(7,3),
- ID_UNALLOCATED(7,4),
- ID_UNALLOCATED(7,5),
- ID_UNALLOCATED(7,6),
- ID_UNALLOCATED(7,7),
-
{ SYS_DESC(SYS_SCTLR_EL1), access_vm_reg, reset_val, SCTLR_EL1, 0x00C50078 },
{ SYS_DESC(SYS_ACTLR_EL1), access_actlr, reset_actlr, ACTLR_EL1 },
{ SYS_DESC(SYS_CPACR_EL1), NULL, reset_val, CPACR_EL1, 0 },
@@ -2946,12 +2860,38 @@ static bool is_imp_def_sys_reg(struct sys_reg_params *params)
return params->Op0 == 3 && (params->CRn & 0b1011) == 0b1011;
}
+static inline const struct sys_reg_desc *
+find_id_reg(const struct sys_reg_params *params)
+{
+ u32 id = reg_to_encoding(params);
+ struct id_reg_desc *idr;
+
+ if (!is_id_reg(id))
+ return NULL;
+
+ idr = get_id_reg_desc(id);
+
+ return idr ? &idr->reg_desc : NULL;
+}
+
+static const struct sys_reg_desc *
+find_sys_reg(const struct sys_reg_params *params)
+{
+ const struct sys_reg_desc *r = NULL;
+
+ r = find_id_reg(params);
+ if (!r)
+ r = find_reg(params, sys_reg_descs, ARRAY_SIZE(sys_reg_descs));
+
+ return r;
+}
+
static int emulate_sys_reg(struct kvm_vcpu *vcpu,
struct sys_reg_params *params)
{
const struct sys_reg_desc *r;
- r = find_reg(params, sys_reg_descs, ARRAY_SIZE(sys_reg_descs));
+ r = find_sys_reg(params);
if (likely(r)) {
perform_access(vcpu, params, r);
@@ -2966,6 +2906,8 @@ static int emulate_sys_reg(struct kvm_vcpu *vcpu,
return 1;
}
+static void kvm_reset_id_regs(struct kvm_vcpu *vcpu);
+
/**
* kvm_reset_sys_regs - sets system registers to reset value
* @vcpu: The VCPU pointer
@@ -2980,6 +2922,8 @@ void kvm_reset_sys_regs(struct kvm_vcpu *vcpu)
for (i = 0; i < ARRAY_SIZE(sys_reg_descs); i++)
if (sys_reg_descs[i].reset)
sys_reg_descs[i].reset(vcpu, &sys_reg_descs[i]);
+
+ kvm_reset_id_regs(vcpu);
}
/**
@@ -3063,7 +3007,7 @@ static const struct sys_reg_desc *index_to_sys_reg_desc(struct kvm_vcpu *vcpu,
if (!index_to_params(id, ¶ms))
return NULL;
- r = find_reg(¶ms, sys_reg_descs, ARRAY_SIZE(sys_reg_descs));
+ r = find_sys_reg(¶ms);
/* Not saved in the sys_reg array and not otherwise accessible? */
if (r && !(r->reg || r->get_user))
@@ -3360,6 +3304,8 @@ static int walk_one_sys_reg(const struct kvm_vcpu *vcpu,
return 0;
}
+static int walk_id_regs(struct kvm_vcpu *vcpu, u64 __user *uind);
+
/* Assumed ordered tables, see kvm_sys_reg_table_init. */
static int walk_sys_regs(struct kvm_vcpu *vcpu, u64 __user *uind)
{
@@ -3375,6 +3321,12 @@ static int walk_sys_regs(struct kvm_vcpu *vcpu, u64 __user *uind)
if (err)
return err;
}
+
+ err = walk_id_regs(vcpu, uind);
+ if (err < 0)
+ return err;
+
+ total += err;
return total;
}
@@ -3625,6 +3577,25 @@ static inline struct id_reg_desc *get_id_reg_desc(u32 id)
return id_reg_desc_table[IDREG_IDX(id)];
}
+static int walk_id_regs(struct kvm_vcpu *vcpu, u64 __user *uind)
+{
+ const struct sys_reg_desc *sys_reg;
+ int err, i;
+ unsigned int total = 0;
+
+ for (i = 0; i < ARRAY_SIZE(id_reg_desc_table); i++) {
+ if (!id_reg_desc_table[i])
+ continue;
+
+ sys_reg = &id_reg_desc_table[i]->reg_desc;
+ err = walk_one_sys_reg(vcpu, sys_reg, &uind, &total);
+ if (err)
+ return err;
+ }
+
+ return total;
+}
+
static void id_reg_desc_init_all(void)
{
int i;
@@ -3647,23 +3618,35 @@ void set_default_id_regs(struct kvm *kvm)
{
int i;
u32 id;
- const struct sys_reg_desc *rd;
- u64 val;
struct id_reg_desc *idr;
- for (i = 0; i < ARRAY_SIZE(sys_reg_descs); i++) {
- rd = &sys_reg_descs[i];
- if (rd->access != access_id_reg)
- /* Not ID register, or hidden/reserved ID register */
+ for (i = 0; i < ARRAY_SIZE(id_reg_desc_table); i++) {
+ idr = id_reg_desc_table[i];
+ if (!idr)
+ continue;
+
+ if (idr->flags & (ID_DESC_REG_HIDDEN | ID_DESC_REG_UNALLOC))
+ /* Nothing to do for hidden/unalloc registers */
continue;
- id = reg_to_encoding(rd);
- if (WARN_ON_ONCE(!is_id_reg(id)))
- /* Shouldn't happen */
+ id = reg_to_encoding(&idr->reg_desc);
+ WARN_ON_ONCE(write_kvm_id_reg(kvm, id, idr->vcpu_limit_val));
+ }
+}
+
+static void kvm_reset_id_regs(struct kvm_vcpu *vcpu)
+{
+ int i;
+ const struct sys_reg_desc *r;
+ struct id_reg_desc *id_reg;
+
+ for (i = 0; i < ARRAY_SIZE(id_reg_desc_table); i++) {
+ id_reg = (struct id_reg_desc *)id_reg_desc_table[i];
+ if (!id_reg)
continue;
- idr = get_id_reg_desc(id);
- val = idr ? idr->vcpu_limit_val : read_sanitised_ftr_reg(id);
- WARN_ON_ONCE(write_kvm_id_reg(kvm, id, val));
+ r = &id_reg->reg_desc;
+ if (r->reset)
+ r->reset(vcpu, r);
}
}
--
2.35.1.723.g4982287a31-goog
