On Thu, Sep 23, 2021 at 11:39:14AM -0300, Daniel Henrique Barboza wrote:
>
>
> On 9/6/21 22:38, David Gibson wrote:
> > On Fri, Sep 03, 2021 at 05:31:03PM -0300, Daniel Henrique Barboza wrote:
> > > The PMU needs to enable writing of its uregs to userspace, otherwise
> > > Perf applications will not able to setup the counters correctly. This
> > > patch enables user space writing of all PMU uregs.
> > >
> > > MMCR0 is a special case because its userspace writing access is controlled
> > > by MMCR0_PMCC bits. There are 4 configurations available (0b00, 0b01,
> > > 0b10 and 0b11) but for our purposes here we're handling only
> > > MMCR0_PMCC = 0b00. In this case, if userspace tries to write MMCR0, a
> > > hypervisor emulation assistance interrupt occurs.
> > >
> > > This is being done by adding HFLAGS_PMCCCLEAR to hflags. This flag
> > > indicates if MMCR0_PMCC is cleared (0b00), and a new 'pmcc_clear' flag in
> > > DisasContext allow us to use it in spr_write_MMCR0_ureg().
> > >
> > > Signed-off-by: Daniel Henrique Barboza <danielhb...@gmail.com>
> > > ---
> > > target/ppc/cpu.h | 1 +
> > > target/ppc/cpu_init.c | 18 +++++++-------
> > > target/ppc/helper_regs.c | 3 +++
> > > target/ppc/spr_tcg.h | 3 ++-
> > > target/ppc/translate.c | 53 +++++++++++++++++++++++++++++++++++++++-
> > > 5 files changed, 67 insertions(+), 11 deletions(-)
> > >
> > > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h
> > > index f68bb8d8aa..8dfbb62022 100644
> > > --- a/target/ppc/cpu.h
> > > +++ b/target/ppc/cpu.h
> > > @@ -616,6 +616,7 @@ enum {
> > > HFLAGS_SE = 10, /* MSR_SE -- from elsewhere on embedded ppc */
> > > HFLAGS_FP = 13, /* MSR_FP */
> > > HFLAGS_PR = 14, /* MSR_PR */
> > > + HFLAGS_PMCCCLEAR = 15, /* PMU MMCR0 PMCC equal to 0b00 */
> > > HFLAGS_VSX = 23, /* MSR_VSX if cpu has VSX */
> > > HFLAGS_VR = 25, /* MSR_VR if cpu has VRE */
> > > diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c
> > > index 9efc6c2d87..bb5ea04c61 100644
> > > --- a/target/ppc/cpu_init.c
> > > +++ b/target/ppc/cpu_init.c
> > > @@ -6867,7 +6867,7 @@ static void
> > > register_book3s_pmu_sup_sprs(CPUPPCState *env)
> > > static void register_book3s_pmu_user_sprs(CPUPPCState *env)
> > > {
> > > spr_register(env, SPR_POWER_UMMCR0, "UMMCR0",
> > > - &spr_read_MMCR0_ureg, SPR_NOACCESS,
> > > + &spr_read_MMCR0_ureg, &spr_write_MMCR0_ureg,
> > > &spr_read_ureg, &spr_write_ureg,
> > > 0x00000000);
> > > spr_register(env, SPR_POWER_UMMCR1, "UMMCR1",
> > > @@ -6875,31 +6875,31 @@ static void
> > > register_book3s_pmu_user_sprs(CPUPPCState *env)
> > > &spr_read_ureg, &spr_write_ureg,
> > > 0x00000000);
> > > spr_register(env, SPR_POWER_UMMCRA, "UMMCRA",
> > > - &spr_read_ureg, SPR_NOACCESS,
> > > + &spr_read_ureg, &spr_write_ureg,
> > > &spr_read_ureg, &spr_write_ureg,
> > > 0x00000000);
> > > spr_register(env, SPR_POWER_UPMC1, "UPMC1",
> > > - &spr_read_ureg, SPR_NOACCESS,
> > > + &spr_read_ureg, &spr_write_ureg,
> >
> > Surely this can't be write. AFAICT spr_write_ureg() will
> > unconditionally allow full userspace write access. That can't be
> > right - otherwise the OS could never safely use the PMU for itself.
>
> My assumption here was that the user mode SPRs (UMMCR* and UPMC*) were
> created to
> allow userspace read/write of PMU regs, while the regular regs (MMCR* and
> PMC*)
> are the supermode privileged SPRs that can't be written by userspace. At
> least this
> is my understanding from reading commit fd51ff6328e3d98158 that introduced
> these
> userspace PMC regs.
Sure, but my point is that these registers are only userspace
accessible under certain conditions, IIUC. spr_write_ureg() doesn't
test for those conditions, so it will *always* allow write access.
> The reason why these are marked as SPR_NOACCESS is because we didn't bothered
> writing into them from userspace because we had no PMU logic to work
> with.
[snip]
> > > diff --git a/target/ppc/translate.c b/target/ppc/translate.c
> > > index b2ead144d1..0babde3131 100644
> > > --- a/target/ppc/translate.c
> > > +++ b/target/ppc/translate.c
> > > @@ -175,6 +175,7 @@ struct DisasContext {
> > > bool spe_enabled;
> > > bool tm_enabled;
> > > bool gtse;
> > > + bool pmcc_clear;
> > > ppc_spr_t *spr_cb; /* Needed to check rights for mfspr/mtspr */
> > > int singlestep_enabled;
> > > uint32_t flags;
> > > @@ -561,7 +562,56 @@ void spr_write_ureg(DisasContext *ctx, int sprn, int
> > > gprn)
> > > {
> > > gen_store_spr(sprn + 0x10, cpu_gpr[gprn]);
> > > }
> > > -#endif
> > > +
> > > +void spr_write_MMCR0_ureg(DisasContext *ctx, int sprn, int gprn)
> >
> >
> > Could you put this def in the PMU specific file, rather than the
> > enormous translate.c?
>
> Moving into the existing power8_pmu.c helper is annoying because, being a
> helper file,
> there is no access to the whole DisasContext declaration (that is open coded
> in
> translate.c), and other internal translate.c data like cpu_grp[].
Ah, right. We should probably make that easier someday, but it's not
reasonbly in scope for this series.
> What I was able to do is create a new file in the target/ppc/translate/ dir,
> power8-pmu-regs.c.impl, and moved all these declarations over there. At very
> least we're
> not overloading translate.c.
Ah, nice.
> Eldorado, is that ok with you guys? I'm aware that this dir was holding new
> decode-tree insns implementations but, in this case, it would hold old format
> spr_read/spr_write code.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
signature.asc
Description: PGP signature
