More fully implement ARM PMUv3
v11 cover More fully implement ARM PMUv3
Most of this patchset to implement the PMU has been merged already, but the interrupt-on-overflow behavior had some additional review comments. In addition to improving the overflow detection and bit-clearing logic, I split the previous patch [1] into two to (hopefully) make it more digestable.
There is also a separate bugfix for one of the the already-merged patches which I already sent out separately as "target/arm: Don't clear supported PMU events when initializing PMCEID1" [2].
[1] - https://lists.gnu.org/archive/html/qemu-devel/2018-12/msg02242.html
[2] - https://lists.gnu.org/archive/html/qemu-devel/2019-01/msg05996.html
Aaron Lindsay (2):
target/arm: Send interrupts on PMU counter overflow target/arm: Add a timer to predict PMU counter overflow
target/arm/cpu.c | 12 ++++ target/arm/cpu.h | 10 ++++ target/arm/helper.c | 133 ++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 143 insertions(+), 12 deletions(-)
Signature · 1 line
2.20.1
PATCH v11 1/2 target/arm: Send interrupts on PMU counter overflow
Whenever we notice that a counter overflow has occurred, send an interrupt. This is made more reliable with the addition of a timer in a follow-on commit.
--- target/arm/helper.c | 61 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 10 deletions(-)
target/arm/helper.c +51 -10
@@ -977,6 +977,7 @@ static const ARMCPRegInfo v6_cp_reginfo[] = {/* Definitions for the PMU registers */ #define PMCRN_MASK 0xf800#define PMCRN_SHIFT 11 +#define PMCRLC 0x40#define PMCRDP 0x10#define PMCRD 0x8#define PMCRC 0x4
@@ -1293,6 +1294,13 @@ static bool pmu_counter_enabled(CPUARMState *env, uint8_t counter)return enabled && !prohibited && !filtered; } +static void pmu_update_irq (CPUARMState *env) +{ +ARMCPU *cpu =arm_env_get_cpu (env); +qemu_set_irq (cpu->pmu_interrupt, (env->cp15.c9_pmcr &PMCRE ) && + (env->cp15.c9_pminten & env->cp15.c9_pmovsr)); +} +/* * Ensure c15_ccnt is the guest-visible count so that operations such as * enabling/disabling the counter or filtering, modifying the count itself,
@@ -1310,7 +1318,16 @@ void pmccntr_op_start(CPUARMState *env) eff_cycles /=64 ; } - env->cp15.c15_ccnt = eff_cycles - env->cp15.c15_ccnt_delta; +uint64_t new_pmccntr = eff_cycles - env->cp15.c15_ccnt_delta; + +uint64_t overflow_mask = env->cp15.c9_pmcr &PMCRLC ? \ +INT64_MIN :INT32_MIN ; +if (env->cp15.c15_ccnt & ~new_pmccntr & overflow_mask) { + env->cp15.c9_pmovsr |= (1 <<31 ); +pmu_update_irq (env); + } + + env->cp15.c15_ccnt = new_pmccntr; } env->cp15.c15_ccnt_delta = cycles; }
@@ -1345,8 +1362,13 @@ static void pmevcntr_op_start(CPUARMState *env, uint8_t counter) }if (pmu_counter_enabled (env, counter)) { - env->cp15.c14_pmevcntr[counter] = - count - env->cp15.c14_pmevcntr_delta[counter]; +uint32_t new_pmevcntr = count - env->cp15.c14_pmevcntr_delta[counter]; + +if (env->cp15.c14_pmevcntr[counter] & ~new_pmevcntr &INT32_MIN ) { + env->cp15.c9_pmovsr |= (1 << counter); +pmu_update_irq (env); + } + env->cp15.c14_pmevcntr[counter] = new_pmevcntr; } env->cp15.c14_pmevcntr_delta[counter] = count; }
@@ -1423,7 +1445,20 @@ static void pmswinc_write(CPUARMState *env, const ARMCPRegInfo *ri,/* counter is SW_INCR */ (env->cp15.c14_pmevtyper[i] & PMXEVTYPER_EVTCOUNT) == 0x0) {pmevcntr_op_start (env, i); - env->cp15.c14_pmevcntr[i]++; + +/* +* Detect if this write causes an overflow since we can't predict +* PMSWINC overflows like we can for other events +*/ +uint32_t new_pmswinc = env->cp15.c14_pmevcntr[i] +1 ; + +if (env->cp15.c14_pmevcntr[i] & ~new_pmswinc &INT32_MIN ) { + env->cp15.c9_pmovsr |= (1 << i); +pmu_update_irq (env); + } + + env->cp15.c14_pmevcntr[i] = new_pmswinc; +pmevcntr_op_finish (env, i); } }
@@ -1508,6 +1543,7 @@ static void pmovsr_write(CPUARMState *env, const ARMCPRegInfo *ri, { value &=pmu_counter_mask (env); env->cp15.c9_pmovsr &= ~value; +pmu_update_irq (env); } static void pmovsset_write(CPUARMState *env, const ARMCPRegInfo *ri,
@@ -1515,6 +1551,7 @@ static void pmovsset_write(CPUARMState *env, const ARMCPRegInfo *ri, { value &=pmu_counter_mask (env); env->cp15.c9_pmovsr |= value; +pmu_update_irq (env); } static void pmevtyper_write(CPUARMState *env, const ARMCPRegInfo *ri,
@@ -1701,6 +1738,7 @@ static void pmintenset_write(CPUARMState *env, const ARMCPRegInfo *ri,/* We have no event counters so only the C bit can be changed */ value &=pmu_counter_mask (env); env->cp15.c9_pminten |= value; +pmu_update_irq (env); } static void pmintenclr_write(CPUARMState *env, const ARMCPRegInfo *ri,
@@ -1708,6 +1746,7 @@ static void pmintenclr_write(CPUARMState *env, const ARMCPRegInfo *ri, { value &=pmu_counter_mask (env); env->cp15.c9_pminten &= ~value; +pmu_update_irq (env); } static void vbar_write(CPUARMState *env, const ARMCPRegInfo *ri,
@@ -1846,7 +1885,7 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { .fieldoffset = offsetof(CPUARMState, cp15.c9_pmcnten), .writefn = pmcntenclr_write }, { .name = "PMOVSR", .cp = 15, .crn = 9, .crm = 12, .opc1 = 0, .opc2 = 3, - .access = PL0_RW, + .access = PL0_RW, .type = ARM_CP_IO, .fieldoffset = offsetoflow32(CPUARMState, cp15.c9_pmovsr), .accessfn = pmreg_access, .writefn = pmovsr_write,
@@ -1854,16 +1893,18 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { { .name = "PMOVSCLR_EL0", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 3, .crn = 9, .crm = 12, .opc2 = 3, .access = PL0_RW, .accessfn = pmreg_access, - .type = ARM_CP_ALIAS, + .type = ARM_CP_ALIAS | ARM_CP_IO, .fieldoffset = offsetof(CPUARMState, cp15.c9_pmovsr), .writefn = pmovsr_write, .raw_writefn = raw_write }, { .name = "PMSWINC", .cp = 15, .crn = 9, .crm = 12, .opc1 = 0, .opc2 = 4, - .access = PL0_W, .accessfn = pmreg_access_swinc, .type = ARM_CP_NO_RAW, + .access = PL0_W, .accessfn = pmreg_access_swinc, + .type = ARM_CP_NO_RAW | ARM_CP_IO, .writefn = pmswinc_write }, { .name = "PMSWINC_EL0", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 3, .crn = 9, .crm = 12, .opc2 = 4, - .access = PL0_W, .accessfn = pmreg_access_swinc, .type = ARM_CP_NO_RAW, + .access = PL0_W, .accessfn = pmreg_access_swinc, + .type = ARM_CP_NO_RAW | ARM_CP_IO, .writefn = pmswinc_write }, { .name = "PMSELR", .cp = 15, .crn = 9, .crm = 12, .opc1 = 0, .opc2 = 5, .access = PL0_RW, .type = ARM_CP_ALIAS,
@@ -2050,14 +2091,14 @@ static const ARMCPRegInfo pmovsset_cp_reginfo[] = {/* PMOVSSET is not implemented in v7 before v7ve */ { .name = "PMOVSSET", .cp = 15, .opc1 = 0, .crn = 9, .crm = 14, .opc2 = 3, .access = PL0_RW, .accessfn = pmreg_access, - .type = ARM_CP_ALIAS, + .type = ARM_CP_ALIAS | ARM_CP_IO, .fieldoffset = offsetoflow32(CPUARMState, cp15.c9_pmovsr), .writefn = pmovsset_write, .raw_writefn = raw_write }, { .name = "PMOVSSET_EL0", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 3, .crn = 9, .crm = 14, .opc2 = 3, .access = PL0_RW, .accessfn = pmreg_access, - .type = ARM_CP_ALIAS, + .type = ARM_CP_ALIAS | ARM_CP_IO, .fieldoffset = offsetof(CPUARMState, cp15.c9_pmovsr), .writefn = pmovsset_write, .raw_writefn = raw_write },
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v11 1/2] target/arm: Send interrupts on PMU counter overflow
target/arm/helper.c void pmccntr_op_start(CPUARMState *env) · line 1324
Quoted 2 lines · Aaron Lindsay OS
target/arm/helper.c +2
-0+uint64_t overflow_mask = env->cp15.c9_pmcr &PMCRLC ? \ +INT64_MIN :INT32_MIN ;
With type promotion, this is the same as writing
? 0x8000000000000000ull : 0xffffffff80000000ull
which is probably not what you were intending.
Perhaps just ? 1ull << 63 : 1ull << 31 is better?
Otherwise,
r~
Re: [Qemu-devel] [PATCH v11 1/2] target/arm: Send interrupts on PMU counter overflow
Quoted 11 lines · Richard Henderson
target/arm/helper.c void pmccntr_op_start(CPUARMState *env) · line 1324
Quoted 2 lines · Aaron Lindsay OS
target/arm/helper.c +2
-0+uint64_t overflow_mask = env->cp15.c9_pmcr &PMCRLC ? \ +INT64_MIN :INT32_MIN ;With type promotion, this is the same as writing
? 0x8000000000000000ull : 0xffffffff80000000ullwhich is probably not what you were intending.
Perhaps just ? 1ull << 63 : 1ull << 31 is better?
You are correct. I think we changed this to INT32_MIN in an earlier respin in an attempt at simplification, but I didn't catch the type promotion issue.
Quoted 1 line
Reviewed-by Richard Henderson <[email protected]>
Thanks, I'll send out a v12 momentarily.
-Aaron
PATCH v11 2/2 target/arm: Add a timer to predict PMU counter overflow
In reply to Aaron Lindsay OSMake PMU overflow interrupts more accurate by using a timer to predict when they will overflow rather than waiting for an event to occur which allows us to otherwise check them.
--- target/arm/cpu.c | 12 ++++++++ target/arm/cpu.h | 10 +++++++ target/arm/helper.c | 72 +++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 92 insertions(+), 2 deletions(-)
target/arm/cpu.c +12 -0
@@ -836,6 +836,13 @@ static void arm_cpu_finalizefn(Object *obj)QLIST_REMOVE (hook, node);g_free (hook); } +#ifndef CONFIG_USER_ONLY +if (cpu->pmu_timer) { +timer_del (cpu->pmu_timer); +timer_deinit (cpu->pmu_timer); +timer_free (cpu->pmu_timer); + } +#endif }static void arm_cpu_realizefn (DeviceState *dev,Error **errp)
@@ -1045,6 +1052,11 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)arm_register_pre_el_change_hook (cpu, &pmu_pre_el_change,0 );arm_register_el_change_hook (cpu, &pmu_post_el_change,0 ); } + +#ifndef CONFIG_USER_ONLY + cpu->pmu_timer =timer_new_ns (QEMU_CLOCK_VIRTUAL , arm_pmu_timer_cb, + cpu); +#endif }else { cpu->id_aa64dfr0 &= ~0xf00 ; cpu->pmceid0 =0 ;
target/arm/cpu.h +10 -0
@@ -746,6 +746,11 @@ struct ARMCPU {/* Timers used by the generic (architected) timer */ QEMUTimer *gt_timer[NUM_GTIMERS ]; +/* +* Timer used by the PMU. Its state is restored after migration by +* pmu_op_finish() - it does not need other handling during migration +*/ +QEMUTimer *pmu_timer;/* GPIO outputs for generic timer */ qemu_irq gt_timer_outputs[NUM_GTIMERS ];/* GPIO output for GICv3 maintenance interrupt signal */
@@ -1005,6 +1010,11 @@ void pmccntr_op_finish(CPUARMState *env);void pmu_op_start (CPUARMState *env);void pmu_op_finish (CPUARMState *env); +/* +* Called when a PMU counter is due to overflow +*/ +void arm_pmu_timer_cb (void *opaque); +/** * Functions to register as EL change hooks for PMU mode filtering */
target/arm/helper.c +70 -2
134 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v11 2/2] target/arm: Add a timer to predict PMU counter overflow
Quoted 10 lines · Aaron Lindsay OS
Make PMU overflow interrupts more accurate by using a timer to predict when they will overflow rather than waiting for an event to occur which allows us to otherwise check them.
Signed-off-by Aaron Lindsay <[email protected]>--- target/arm/cpu.c | 12 ++++++++ target/arm/cpu.h | 10 +++++++ target/arm/helper.c | 72 +++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 92 insertions(+), 2 deletions(-)
r~