| Message ID | 20191203022937.1474-28-richard.henderson@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | target/arm: Implement ARMv8.1-VHE | expand |
On Tue, 3 Dec 2019 at 02:30, Richard Henderson <richard.henderson@linaro.org> wrote: > > Several of the EL1/0 registers are redirected to the EL2 version when in > EL2 and HCR_EL2.E2H is set. Many of these registers have side effects. > Link together the two ARMCPRegInfo structures after they have been > properly instantiated. Install common dispatch routines to all of the > relevant registers. > > The same set of registers that are redirected also have additional > EL12/EL02 aliases created to access the original register that was > redirected. > > Omit the generic timer registers from redirection here, because we'll > need multiple kinds of redirection from both EL0 and EL2. > > Signed-off-by: Richard Henderson <richard.henderson@linaro.org> > --- > target/arm/cpu.h | 44 ++++++++---- > target/arm/helper.c | 162 ++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 193 insertions(+), 13 deletions(-) > > diff --git a/target/arm/cpu.h b/target/arm/cpu.h > index 4bd1bf915c..bb5a72520e 100644 > --- a/target/arm/cpu.h > +++ b/target/arm/cpu.h > @@ -2488,19 +2488,6 @@ struct ARMCPRegInfo { > */ > ptrdiff_t fieldoffset; /* offsetof(CPUARMState, field) */ > > - /* Offsets of the secure and non-secure fields in CPUARMState for the > - * register if it is banked. These fields are only used during the static > - * registration of a register. During hashing the bank associated > - * with a given security state is copied to fieldoffset which is used from > - * there on out. > - * > - * It is expected that register definitions use either fieldoffset or > - * bank_fieldoffsets in the definition but not both. It is also expected > - * that both bank offsets are set when defining a banked register. This > - * use indicates that a register is banked. > - */ > - ptrdiff_t bank_fieldoffsets[2]; > - > /* Function for making any access checks for this register in addition to > * those specified by the 'access' permissions bits. If NULL, no extra > * checks required. The access check is performed at runtime, not at > @@ -2535,6 +2522,37 @@ struct ARMCPRegInfo { > * fieldoffset is 0 then no reset will be done. > */ > CPResetFn *resetfn; > + > + union { > + /* > + * Offsets of the secure and non-secure fields in CPUARMState for > + * the register if it is banked. These fields are only used during > + * the static registration of a register. During hashing the bank > + * associated with a given security state is copied to fieldoffset > + * which is used from there on out. > + * > + * It is expected that register definitions use either fieldoffset > + * or bank_fieldoffsets in the definition but not both. It is also > + * expected that both bank offsets are set when defining a banked > + * register. This use indicates that a register is banked. > + */ > + ptrdiff_t bank_fieldoffsets[2]; > + > + /* > + * "Original" writefn and readfn. > + * For ARMv8.1-VHE register aliases, we overwrite the read/write > + * accessor functions of various EL1/EL0 to perform the runtime > + * check for which sysreg should actually be modified, and then > + * forwards the operation. Before overwriting the accessors, > + * the original function is copied here, so that accesses that > + * really do go to the EL1/EL0 version proceed normally. > + * (The corresponding EL2 register is linked via opaque.) > + */ > + struct { > + CPReadFn *orig_readfn; > + CPWriteFn *orig_writefn; > + }; Does this really need to be a union ? It's not clear to me why we know the two halves of it are never used at the same time. > + }; > }; > > /* Macros which are lvalues for the field in CPUARMState for the > diff --git a/target/arm/helper.c b/target/arm/helper.c > index 1812588fa1..0baf188078 100644 > --- a/target/arm/helper.c > +++ b/target/arm/helper.c > @@ -5306,6 +5306,158 @@ static const ARMCPRegInfo el3_cp_reginfo[] = { > REGINFO_SENTINEL > }; > > +#ifndef CONFIG_USER_ONLY > +/* Test if system register redirection is to occur in the current state. */ > +static bool redirect_for_e2h(CPUARMState *env) > +{ > + return arm_current_el(env) == 2 && (arm_hcr_el2_eff(env) & HCR_E2H); > +} > + > +static uint64_t el2_e2h_read(CPUARMState *env, const ARMCPRegInfo *ri) > +{ > + CPReadFn *readfn; > + > + if (redirect_for_e2h(env)) { > + /* Switch to the saved EL2 version of the register. */ > + ri = ri->opaque; > + readfn = ri->readfn; > + } else { > + readfn = ri->orig_readfn; > + } > + if (readfn == NULL) { > + readfn = raw_read; > + } > + return readfn(env, ri); > +} > + > +static void el2_e2h_write(CPUARMState *env, const ARMCPRegInfo *ri, > + uint64_t value) > +{ > + CPWriteFn *writefn; > + > + if (redirect_for_e2h(env)) { > + /* Switch to the saved EL2 version of the register. */ > + ri = ri->opaque; > + writefn = ri->writefn; > + } else { > + writefn = ri->orig_writefn; > + } > + if (writefn == NULL) { > + writefn = raw_write; > + } > + writefn(env, ri, value); > +} I see how this works when we have a readfn or writefn, but how does the redirection work where the access goes directly via .fieldoffset ? thanks -- PMM
On 12/6/19 9:24 AM, Peter Maydell wrote: >> + union { >> + /* >> + * Offsets of the secure and non-secure fields in CPUARMState for >> + * the register if it is banked. These fields are only used during >> + * the static registration of a register. During hashing the bank >> + * associated with a given security state is copied to fieldoffset >> + * which is used from there on out. >> + * >> + * It is expected that register definitions use either fieldoffset >> + * or bank_fieldoffsets in the definition but not both. It is also >> + * expected that both bank offsets are set when defining a banked >> + * register. This use indicates that a register is banked. >> + */ >> + ptrdiff_t bank_fieldoffsets[2]; >> + >> + /* >> + * "Original" writefn and readfn. >> + * For ARMv8.1-VHE register aliases, we overwrite the read/write >> + * accessor functions of various EL1/EL0 to perform the runtime >> + * check for which sysreg should actually be modified, and then >> + * forwards the operation. Before overwriting the accessors, >> + * the original function is copied here, so that accesses that >> + * really do go to the EL1/EL0 version proceed normally. >> + * (The corresponding EL2 register is linked via opaque.) >> + */ >> + struct { >> + CPReadFn *orig_readfn; >> + CPWriteFn *orig_writefn; >> + }; > > Does this really need to be a union ? It's not clear to me > why we know the two halves of it are never used at the same time. We don't really need to use a union. I should probably change that. I think AJB had the same question vs one of the previous revisions. We know they're not used at the same time because bank_fieldoffsets is only used *before* the structure is duplicated and added into the hash table (overwriting .fieldoffset depending on the bank as they are duplicated), and orig_{read,write}fn are only used *after* the structure has been added to the hash table. >> +static void el2_e2h_write(CPUARMState *env, const ARMCPRegInfo *ri, >> + uint64_t value) >> +{ >> + CPWriteFn *writefn; >> + >> + if (redirect_for_e2h(env)) { >> + /* Switch to the saved EL2 version of the register. */ >> + ri = ri->opaque; >> + writefn = ri->writefn; >> + } else { >> + writefn = ri->orig_writefn; >> + } >> + if (writefn == NULL) { >> + writefn = raw_write; >> + } >> + writefn(env, ri, value); >> +} > > I see how this works when we have a readfn or writefn, > but how does the redirection work where the access > goes directly via .fieldoffset ? When there is no .writefn, we use raw_write, which uses fieldoffset. r~
On Fri, 6 Dec 2019 at 18:36, Richard Henderson <richard.henderson@linaro.org> wrote: > >> +static void el2_e2h_write(CPUARMState *env, const ARMCPRegInfo *ri, > >> + uint64_t value) > >> +{ > >> + CPWriteFn *writefn; > >> + > >> + if (redirect_for_e2h(env)) { > >> + /* Switch to the saved EL2 version of the register. */ > >> + ri = ri->opaque; > >> + writefn = ri->writefn; > >> + } else { > >> + writefn = ri->orig_writefn; > >> + } > >> + if (writefn == NULL) { > >> + writefn = raw_write; > >> + } > >> + writefn(env, ri, value); > >> +} > > > > I see how this works when we have a readfn or writefn, > > but how does the redirection work where the access > > goes directly via .fieldoffset ? > > When there is no .writefn, we use raw_write, which uses fieldoffset. Yes, that's what I mean. There's no 'if redirect then this fieldoffset else that fieldoffset' codepath, so how does it update the right field? thanks -- PMM
On 12/6/19 10:41 AM, Peter Maydell wrote: > On Fri, 6 Dec 2019 at 18:36, Richard Henderson > <richard.henderson@linaro.org> wrote: > >>>> +static void el2_e2h_write(CPUARMState *env, const ARMCPRegInfo *ri, >>>> + uint64_t value) >>>> +{ >>>> + CPWriteFn *writefn; >>>> + >>>> + if (redirect_for_e2h(env)) { >>>> + /* Switch to the saved EL2 version of the register. */ >>>> + ri = ri->opaque; >>>> + writefn = ri->writefn; >>>> + } else { >>>> + writefn = ri->orig_writefn; >>>> + } >>>> + if (writefn == NULL) { >>>> + writefn = raw_write; >>>> + } >>>> + writefn(env, ri, value); >>>> +} >>> >>> I see how this works when we have a readfn or writefn, >>> but how does the redirection work where the access >>> goes directly via .fieldoffset ? >> >> When there is no .writefn, we use raw_write, which uses fieldoffset. > > Yes, that's what I mean. There's no 'if redirect then this > fieldoffset else that fieldoffset' codepath, so how does > it update the right field? Oh, for the redirected system registers, there will *always* be a .writefn -- el2_e2h_write. What there will not necessarily be is a .orig_writefn -- in which case we'll use raw_write. r~
diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 4bd1bf915c..bb5a72520e 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2488,19 +2488,6 @@ struct ARMCPRegInfo { */ ptrdiff_t fieldoffset; /* offsetof(CPUARMState, field) */ - /* Offsets of the secure and non-secure fields in CPUARMState for the - * register if it is banked. These fields are only used during the static - * registration of a register. During hashing the bank associated - * with a given security state is copied to fieldoffset which is used from - * there on out. - * - * It is expected that register definitions use either fieldoffset or - * bank_fieldoffsets in the definition but not both. It is also expected - * that both bank offsets are set when defining a banked register. This - * use indicates that a register is banked. - */ - ptrdiff_t bank_fieldoffsets[2]; - /* Function for making any access checks for this register in addition to * those specified by the 'access' permissions bits. If NULL, no extra * checks required. The access check is performed at runtime, not at @@ -2535,6 +2522,37 @@ struct ARMCPRegInfo { * fieldoffset is 0 then no reset will be done. */ CPResetFn *resetfn; + + union { + /* + * Offsets of the secure and non-secure fields in CPUARMState for + * the register if it is banked. These fields are only used during + * the static registration of a register. During hashing the bank + * associated with a given security state is copied to fieldoffset + * which is used from there on out. + * + * It is expected that register definitions use either fieldoffset + * or bank_fieldoffsets in the definition but not both. It is also + * expected that both bank offsets are set when defining a banked + * register. This use indicates that a register is banked. + */ + ptrdiff_t bank_fieldoffsets[2]; + + /* + * "Original" writefn and readfn. + * For ARMv8.1-VHE register aliases, we overwrite the read/write + * accessor functions of various EL1/EL0 to perform the runtime + * check for which sysreg should actually be modified, and then + * forwards the operation. Before overwriting the accessors, + * the original function is copied here, so that accesses that + * really do go to the EL1/EL0 version proceed normally. + * (The corresponding EL2 register is linked via opaque.) + */ + struct { + CPReadFn *orig_readfn; + CPWriteFn *orig_writefn; + }; + }; }; /* Macros which are lvalues for the field in CPUARMState for the diff --git a/target/arm/helper.c b/target/arm/helper.c index 1812588fa1..0baf188078 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5306,6 +5306,158 @@ static const ARMCPRegInfo el3_cp_reginfo[] = { REGINFO_SENTINEL }; +#ifndef CONFIG_USER_ONLY +/* Test if system register redirection is to occur in the current state. */ +static bool redirect_for_e2h(CPUARMState *env) +{ + return arm_current_el(env) == 2 && (arm_hcr_el2_eff(env) & HCR_E2H); +} + +static uint64_t el2_e2h_read(CPUARMState *env, const ARMCPRegInfo *ri) +{ + CPReadFn *readfn; + + if (redirect_for_e2h(env)) { + /* Switch to the saved EL2 version of the register. */ + ri = ri->opaque; + readfn = ri->readfn; + } else { + readfn = ri->orig_readfn; + } + if (readfn == NULL) { + readfn = raw_read; + } + return readfn(env, ri); +} + +static void el2_e2h_write(CPUARMState *env, const ARMCPRegInfo *ri, + uint64_t value) +{ + CPWriteFn *writefn; + + if (redirect_for_e2h(env)) { + /* Switch to the saved EL2 version of the register. */ + ri = ri->opaque; + writefn = ri->writefn; + } else { + writefn = ri->orig_writefn; + } + if (writefn == NULL) { + writefn = raw_write; + } + writefn(env, ri, value); +} + +static void define_arm_vh_e2h_redirects_aliases(ARMCPU *cpu) +{ + struct E2HAlias { + uint32_t src_key, dst_key, new_key; + const char *src_name, *dst_name, *new_name; + bool (*feature)(const ARMISARegisters *id); + }; + +#define K(op0, op1, crn, crm, op2) \ + ENCODE_AA64_CP_REG(CP_REG_ARM64_SYSREG_CP, crn, crm, op0, op1, op2) + + static const struct E2HAlias aliases[] = { + { K(3, 0, 1, 0, 0), K(3, 4, 1, 0, 0), K(3, 5, 1, 0, 0), + "SCTLR", "SCTLR_EL2", "SCTLR_EL12" }, + { K(3, 0, 1, 0, 2), K(3, 4, 1, 1, 2), K(3, 5, 1, 0, 2), + "CPACR", "CPTR_EL2", "CPACR_EL12" }, + { K(3, 0, 2, 0, 0), K(3, 4, 2, 0, 0), K(3, 5, 2, 0, 0), + "TTBR0_EL1", "TTBR0_EL2", "TTBR0_EL12" }, + { K(3, 0, 2, 0, 1), K(3, 4, 2, 0, 1), K(3, 5, 2, 0, 1), + "TTBR1_EL1", "TTBR1_EL2", "TTBR1_EL12" }, + { K(3, 0, 2, 0, 2), K(3, 4, 2, 0, 2), K(3, 5, 2, 0, 2), + "TCR_EL1", "TCR_EL2", "TCR_EL12" }, + { K(3, 0, 4, 0, 0), K(3, 4, 4, 0, 0), K(3, 5, 4, 0, 0), + "SPSR_EL1", "SPSR_EL2", "SPSR_EL12" }, + { K(3, 0, 4, 0, 1), K(3, 4, 4, 0, 1), K(3, 5, 4, 0, 1), + "ELR_EL1", "ELR_EL2", "ELR_EL12" }, + { K(3, 0, 5, 1, 0), K(3, 4, 5, 1, 0), K(3, 5, 5, 1, 0), + "AFSR0_EL1", "AFSR0_EL2", "AFSR0_EL12" }, + { K(3, 0, 5, 1, 1), K(3, 4, 5, 1, 1), K(3, 5, 5, 1, 1), + "AFSR1_EL1", "AFSR1_EL2", "AFSR1_EL12" }, + { K(3, 0, 5, 2, 0), K(3, 4, 5, 2, 0), K(3, 5, 5, 2, 0), + "ESR_EL1", "ESR_EL2", "ESR_EL12" }, + { K(3, 0, 6, 0, 0), K(3, 4, 6, 0, 0), K(3, 5, 6, 0, 0), + "FAR_EL1", "FAR_EL2", "FAR_EL12" }, + { K(3, 0, 10, 2, 0), K(3, 4, 10, 2, 0), K(3, 5, 10, 2, 0), + "MAIR_EL1", "MAIR_EL2", "MAIR_EL12" }, + { K(3, 0, 10, 3, 0), K(3, 4, 10, 3, 0), K(3, 5, 10, 3, 0), + "AMAIR0", "AMAIR_EL2", "AMAIR_EL12" }, + { K(3, 0, 12, 0, 0), K(3, 4, 12, 0, 0), K(3, 5, 12, 0, 0), + "VBAR", "VBAR_EL2", "VBAR_EL12" }, + { K(3, 0, 13, 0, 1), K(3, 4, 13, 0, 1), K(3, 5, 13, 0, 1), + "CONTEXTIDR_EL1", "CONTEXTIDR_EL2", "CONTEXTIDR_EL12" }, + { K(3, 0, 14, 1, 0), K(3, 4, 14, 1, 0), K(3, 5, 14, 1, 0), + "CNTKCTL", "CNTHCTL_EL2", "CNTKCTL_EL12" }, + + /* + * Note that redirection of ZCR is mentioned in the description + * of ZCR_EL2, and aliasing in the description of ZCR_EL1, but + * not in the summary table. + */ + { K(3, 0, 1, 2, 0), K(3, 4, 1, 2, 0), K(3, 5, 1, 2, 0), + "ZCR_EL1", "ZCR_EL2", "ZCR_EL12", isar_feature_aa64_sve }, + + /* TODO: ARMv8.2-SPE -- PMSCR_EL2 */ + /* TODO: ARMv8.4-Trace -- TRFCR_EL2 */ + }; +#undef K + + size_t i; + + for (i = 0; i < ARRAY_SIZE(aliases); i++) { + const struct E2HAlias *a = &aliases[i]; + ARMCPRegInfo *src_reg, *dst_reg; + + if (a->feature && !a->feature(&cpu->isar)) { + continue; + } + + src_reg = g_hash_table_lookup(cpu->cp_regs, &a->src_key); + dst_reg = g_hash_table_lookup(cpu->cp_regs, &a->dst_key); + g_assert(src_reg != NULL); + g_assert(dst_reg != NULL); + + /* Cross-compare names to detect typos in the keys. */ + g_assert(strcmp(src_reg->name, a->src_name) == 0); + g_assert(strcmp(dst_reg->name, a->dst_name) == 0); + + /* None of the core system registers use opaque; we will. */ + g_assert(src_reg->opaque == NULL); + + /* Create alias before redirection so we dup the right data. */ + if (a->new_key) { + ARMCPRegInfo *new_reg = g_memdup(src_reg, sizeof(ARMCPRegInfo)); + uint32_t *new_key = g_memdup(&a->new_key, sizeof(uint32_t)); + bool ok; + + new_reg->name = a->new_name; + new_reg->type |= ARM_CP_ALIAS; + /* Remove PL1/PL0 access, leaving PL2/PL3 R/W in place. */ + new_reg->access &= 0xf0; + + ok = g_hash_table_insert(cpu->cp_regs, new_key, new_reg); + g_assert(ok); + } + + src_reg->opaque = dst_reg; + src_reg->orig_readfn = src_reg->readfn ?: raw_read; + src_reg->orig_writefn = src_reg->writefn ?: raw_write; + if (!src_reg->raw_readfn) { + src_reg->raw_readfn = raw_read; + } + if (!src_reg->raw_writefn) { + src_reg->raw_writefn = raw_write; + } + src_reg->readfn = el2_e2h_read; + src_reg->writefn = el2_e2h_write; + } +} +#endif + static CPAccessResult ctr_el0_access(CPUARMState *env, const ARMCPRegInfo *ri, bool isread) { @@ -7142,6 +7294,16 @@ void register_cp_regs_for_features(ARMCPU *cpu) : cpu_isar_feature(aa32_predinv, cpu)) { define_arm_cp_regs(cpu, predinv_reginfo); } + +#ifndef CONFIG_USER_ONLY + /* + * Register redirections and aliases must be done last, + * after the registers from the other extensions have been defined. + */ + if (arm_feature(env, ARM_FEATURE_EL2) && cpu_isar_feature(aa64_vh, cpu)) { + define_arm_vh_e2h_redirects_aliases(cpu); + } +#endif } void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
Several of the EL1/0 registers are redirected to the EL2 version when in EL2 and HCR_EL2.E2H is set. Many of these registers have side effects. Link together the two ARMCPRegInfo structures after they have been properly instantiated. Install common dispatch routines to all of the relevant registers. The same set of registers that are redirected also have additional EL12/EL02 aliases created to access the original register that was redirected. Omit the generic timer registers from redirection here, because we'll need multiple kinds of redirection from both EL0 and EL2. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> --- target/arm/cpu.h | 44 ++++++++---- target/arm/helper.c | 162 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 193 insertions(+), 13 deletions(-) -- 2.17.1