Add vPMU vPMU support under TCG mode
v2 cover Add vPMU vPMU support under TCG mode
But this feature is not complete. In fact using perf inside a 64-bit Linux guest VM (under TCG) can cause the following kernel panic because some PMU registers are not implemented.
[ 329.445970] [<fffffe000009e600>] armv8pmu_enable_event+0x58/0x8c [ 329.446713] [<fffffe0000621e74>] armpmu_start+0x4c/0x74
This patchset solves the problem by adding support for missing vPMU registers. Basic perf test can work (both ACPI and DT) now under TCG by applying this patchset.
address@hidden ~]# perf stat ls
Performance counter stats for 'ls':
226.740256 task-clock (msec) # 0.312 CPUs utilized
76 context-switches # 0.335 K/sec
0 cpu-migrations # 0.000 K/sec
64 page-faults # 0.282 K/sec
186,031,410 cycles # 0.820 GHz (36.40%)
<not supported> stalled-cycles-frontend
<not supported> stalled-cycles-backend
<not counted> instructions (0.00%)
<not supported> branches
<not counted> branch-misses (0.00%)V1->V2:
* Change most PMU registers to 64bit and the behavior of PMXEVTYPER
* Add support for PMXEVCNTR_EL0
* Misc fixes (DT, ID_AA64DFR0_EL1, ...) under TCG mode
Thanks,
-Wei
Wei Huang (5):
target-arm: Add support for PMU register PMSELR_EL0
target-arm: Add support for AArch64 PMU register PMXEVTYPER_EL0
target-arm: Add support for PMU register PMXEVCNTR_EL0
target-arm: Add support for PMU register PMINTENSET_EL1
target-arm: Enable vPMU support under TCG mode
hw/arm/virt.c | 2 +- target/arm/cpu.c | 2 +- target/arm/cpu.h | 5 +++-- target/arm/helper.c | 65 ++++++++++++++++++++++++++++++++++++++++------------- 4 files changed, 55 insertions(+), 19 deletions(-)
Signature · 1 line
1.8.3.1
PATCH v2 1/5 target-arm: Add support for PMU register PMSELR_EL0
This patch adds support for AArch64 register PMSELR_EL0. The existing PMSELR definition is revised accordingly.
--- target/arm/cpu.h | 1 + target/arm/helper.c | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-)
target/arm/cpu.h +1 -0
@@ -309,6 +309,7 @@ typedef struct CPUARMState {uint32_t c9_pmovsr;/* perf monitor overflow status */ uint32_t c9_pmxevtyper;/* perf monitor event type */ uint32_t c9_pmuserenr;/* perf monitor user enable */ +uint64_t c9_pmselr;/* perf monitor counter selection register */ uint32_t c9_pminten;/* perf monitor interrupt enables */ union { /* Memory attribute redirection */ struct {
target/arm/helper.c +20 -5
@@ -975,6 +975,17 @@ static uint64_t pmccntr_read(CPUARMState *env, const ARMCPRegInfo *ri)return total_ticks - env->cp15.c15_ccnt; } +static void pmselr_write (CPUARMState *env,const ARMCPRegInfo *ri, +uint64_t value) +{ +/* The value of PMSELR.SEL affects the behavior of PMXEVTYPER and +* PMXEVCNTR. We allow [0..31] to be written to PMSELR here; in the +* meanwhile, we check PMSELR.SEL when PMXEVTYPER and PMXEVCNTR are +* accessed. +*/ + env->cp15.c9_pmselr = value &0x1f ; +} +static void pmccntr_write (CPUARMState *env,const ARMCPRegInfo *ri,uint64_t value) {
@@ -1194,12 +1205,16 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {/* Unimplemented so WI. */ { .name = "PMSWINC", .cp = 15, .crn = 9, .crm = 12, .opc1 = 0, .opc2 = 4, .access = PL0_W, .accessfn = pmreg_access, .type = ARM_CP_NOP }, - /* Since we don't implement any events, writing to PMSELR is UNPREDICTABLE. - * We choose to RAZ/WI. - */ { .name = "PMSELR", .cp = 15, .crn = 9, .crm = 12, .opc1 = 0, .opc2 = 5, - .access = PL0_RW, .type = ARM_CP_CONST, .resetvalue = 0, - .accessfn = pmreg_access }, + .access = PL0_RW, .type = ARM_CP_ALIAS, + .fieldoffset = offsetoflow32(CPUARMState, cp15.c9_pmselr), + .accessfn = pmreg_access, .writefn = pmselr_write, + .raw_writefn = raw_write}, + { .name = "PMSELR_EL0", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 3, .crn = 9, .crm = 12, .opc2 = 5, + .access = PL0_RW, .accessfn = pmreg_access, + .fieldoffset = offsetof(CPUARMState, cp15.c9_pmselr), + .writefn = pmselr_write, .raw_writefn = raw_write, }, #ifndef CONFIG_USER_ONLY { .name = "PMCCNTR", .cp = 15, .crn = 9, .crm = 13, .opc1 = 0, .opc2 = 0, .access = PL0_RW, .resetvalue = 0, .type = ARM_CP_IO,
Signature · 1 line
1.8.3.1
Re: [Qemu-arm] [PATCH V2 1/5] target-arm: Add support for PMU register PMSELR_EL0
Quoted 66 lines · Wei Huang
This patch adds support for AArch64 register
PMSELR_EL0. The existing PMSELR definition is revised accordingly.Signed-off-by Wei Huang <[email protected]>--- target/arm/cpu.h | 1 + target/arm/helper.c | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-)target/arm/cpu.h +1
-0@@ -309,6 +309,7 @@ typedef struct CPUARMState {uint32_t c9_pmovsr;/* perf monitor overflow status */ uint32_t c9_pmxevtyper;/* perf monitor event type */ uint32_t c9_pmuserenr;/* perf monitor user enable */ +uint64_t c9_pmselr;/* perf monitor counter selection register */ uint32_t c9_pminten;/* perf monitor interrupt enables */ union { /* Memory attribute redirection */ struct {target/arm/helper.c +20
-6@@ -975,6 +975,17 @@ static uint64_t pmccntr_read(CPUARMState *env, const ARMCPRegInfo *ri)return total_ticks - env->cp15.c15_ccnt; } +static void pmselr_write (CPUARMState *env,const ARMCPRegInfo *ri, +uint64_t value) +{ +/* The value of PMSELR.SEL affects the behavior of PMXEVTYPER and +* PMXEVCNTR. We allow [0..31] to be written to PMSELR here; in the +* meanwhile, we check PMSELR.SEL when PMXEVTYPER and PMXEVCNTR are +* accessed. +*/ + env->cp15.c9_pmselr = value &0x1f ; +} +static void pmccntr_write (CPUARMState *env,const ARMCPRegInfo *ri,uint64_t value) {@@ -1194,12 +1205,16 @@ static const ARMCPRegInfo v7_cp_reginfo[] = {/* Unimplemented so WI. */ { .name = "PMSWINC", .cp = 15, .crn = 9, .crm = 12, .opc1 = 0, .opc2 = 4, .access = PL0_W, .accessfn = pmreg_access, .type = ARM_CP_NOP }, - /* Since we don't implement any events, writing to PMSELR is UNPREDICTABLE. - * We choose to RAZ/WI. - */ { .name = "PMSELR", .cp = 15, .crn = 9, .crm = 12, .opc1 = 0, .opc2 = 5, - .access = PL0_RW, .type = ARM_CP_CONST, .resetvalue = 0, - .accessfn = pmreg_access }, + .access = PL0_RW, .type = ARM_CP_ALIAS, + .fieldoffset = offsetoflow32(CPUARMState, cp15.c9_pmselr), + .accessfn = pmreg_access, .writefn = pmselr_write, + .raw_writefn = raw_write}, + { .name = "PMSELR_EL0", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 3, .crn = 9, .crm = 12, .opc2 = 5, + .access = PL0_RW, .accessfn = pmreg_access, + .fieldoffset = offsetof(CPUARMState, cp15.c9_pmselr), + .writefn = pmselr_write, .raw_writefn = raw_write, }, #ifndef CONFIG_USER_ONLY { .name = "PMCCNTR", .cp = 15, .crn = 9, .crm = 13, .opc1 = 0, .opc2 = 0, .access = PL0_RW, .resetvalue = 0, .type = ARM_CP_IO, --
Quoted 2 lines
1.8.3.1
thanks
-- PMM
PATCH v2 2/5 target-arm: Add support for AArch64 PMU register PMXEVTYPER_EL0
In reply to Wei HuangIn order to support Linux perf, which uses PMXEVTYPER register, this patch adds access support for PMXEVTYPER_EL0.
--- target/arm/cpu.h | 2 +- target/arm/helper.c | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-)
target/arm/cpu.h +1 -1
@@ -307,7 +307,7 @@ typedef struct CPUARMState {uint64_t c9_pmcr;/* performance monitor control register */ uint64_t c9_pmcnten;/* perf monitor counter enables */ uint32_t c9_pmovsr;/* perf monitor overflow status */ -uint32_t c9_pmxevtyper;/* perf monitor event type */ +uint64_t c9_pmxevtyper;/* perf monitor event type */ uint32_t c9_pmuserenr;/* perf monitor user enable */ uint64_t c9_pmselr;/* perf monitor counter selection register */ uint32_t c9_pminten;/* perf monitor interrupt enables */
target/arm/helper.c +16 -3
@@ -1054,7 +1054,13 @@ static void pmovsr_write(CPUARMState *env, const ARMCPRegInfo *ri,static void pmxevtyper_write (CPUARMState *env,const ARMCPRegInfo *ri,uint64_t value) { - env->cp15.c9_pmxevtyper = value &0xff ; +/* Attempts to access PMXEVTYPER are CONSTRAINED UNPREDICTABLE when +* PMSELR value is equal to or greater than the number of implemented +* counters, but not euqal to 0x1f. We opt to behave as a NOP. +*/ +if (env->cp15.c9_pmselr ==0x1f ) { +pmccfiltr_write (env, ri, value); + } } static void pmuserenr_write(CPUARMState *env, const ARMCPRegInfo *ri,
@@ -1234,10 +1240,17 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { .fieldoffset = offsetof(CPUARMState, cp15.pmccfiltr_el0), .resetvalue = 0, }, { .name = "PMXEVTYPER", .cp = 15, .crn = 9, .crm = 13, .opc1 = 0, .opc2 = 1, - .access = PL0_RW, - .fieldoffset = offsetof(CPUARMState, cp15.c9_pmxevtyper), + .access = PL0_RW, .type = ARM_CP_ALIAS, + .fieldoffset = offsetoflow32(CPUARMState, cp15.c9_pmxevtyper), .accessfn = pmreg_access, .writefn = pmxevtyper_write, .raw_writefn = raw_write }, + { .name = "PMXEVTYPER_EL0", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 3, .crn = 9, .crm = 13, .opc2 = 1, + .access = PL0_RW, .accessfn = pmreg_access, + .type = ARM_CP_IO, + .fieldoffset = offsetof(CPUARMState, cp15.c9_pmxevtyper), + .writefn = pmxevtyper_write, .raw_writefn = raw_write, + .resetvalue = 0x0 }, /* Unimplemented, RAZ/WI. */ { .name = "PMXEVCNTR", .cp = 15, .crn = 9, .crm = 13, .opc1 = 0, .opc2 = 2, .access = PL0_RW, .type = ARM_CP_CONST, .resetvalue = 0,
Signature · 1 line
1.8.3.1
Re: [Qemu-arm] [PATCH V2 2/5] target-arm: Add support for AArch64 PMU register PMXEVTYPER_EL0
Quoted 27 lines · Wei Huang
In order to support Linux perf, which uses PMXEVTYPER register, this patch adds access support for
PMXEVTYPER_EL0.Signed-off-by Wei Huang <[email protected]>--- target/arm/cpu.h | 2 +- target/arm/helper.c | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-)target/arm/cpu.h +1
-1@@ -307,7 +307,7 @@ typedef struct CPUARMState {uint64_t c9_pmcr;/* performance monitor control register */ uint64_t c9_pmcnten;/* perf monitor counter enables */ uint32_t c9_pmovsr;/* perf monitor overflow status */ -uint32_t c9_pmxevtyper;/* perf monitor event type */ +uint64_t c9_pmxevtyper;/* perf monitor event type */ uint32_t c9_pmuserenr;/* perf monitor user enable */ uint64_t c9_pmselr;/* perf monitor counter selection register */ uint32_t c9_pminten;/* perf monitor interrupt enables */ target/arm/helper.c +0
-0
target/arm/helper.c static void pmovsr_write(CPUARMState *env, const ARMCPRegInfo *ri, · line 1059
Quoted 7 lines
target/arm/helper.c +3
-1@@ -1054,7 +1054,13 @@ static void pmovsr_write(CPUARMState *env, const ARMCPRegInfo *ri,static void pmxevtyper_write (CPUARMState *env,const ARMCPRegInfo *ri,uint64_t value) { - env->cp15.c9_pmxevtyper = value &0xff ; +/* Attempts to access PMXEVTYPER are CONSTRAINED UNPREDICTABLE when +* PMSELR value is equal to or greater than the number of implemented +* counters, but not euqal to 0x1f. We opt to behave as a NOP.
"equal"
Quoted 14 lines
target/arm/helper.c +5
-2+*/ +if (env->cp15.c9_pmselr ==0x1f ) { +pmccfiltr_write (env, ri, value); + } } static void pmuserenr_write(CPUARMState *env, const ARMCPRegInfo *ri,@@ -1234,10 +1240,17 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { .fieldoffset = offsetof(CPUARMState, cp15.pmccfiltr_el0), .resetvalue = 0, }, { .name = "PMXEVTYPER", .cp = 15, .crn = 9, .crm = 13, .opc1 = 0, .opc2 = 1, - .access = PL0_RW, - .fieldoffset = offsetof(CPUARMState, cp15.c9_pmxevtyper), + .access = PL0_RW, .type = ARM_CP_ALIAS,
target/arm/helper.c static const ARMCPRegInfo v7_cp_reginfo[] = { · line 1253
Quoted 10 lines
target/arm/helper.c +8
-0+ .fieldoffset = offsetoflow32(CPUARMState, cp15.c9_pmxevtyper), .accessfn = pmreg_access, .writefn = pmxevtyper_write, .raw_writefn = raw_write }, + { .name = "PMXEVTYPER_EL0", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 3, .crn = 9, .crm = 13, .opc2 = 1, + .access = PL0_RW, .accessfn = pmreg_access, + .type = ARM_CP_IO, + .fieldoffset = offsetof(CPUARMState, cp15.c9_pmxevtyper), + .writefn = pmxevtyper_write, .raw_writefn = raw_write, + .resetvalue = 0x0 },
Reads also need to give you PMCCFILTR_EL0, if PMSELR is set to 31, so you need a readfn as well. (That also means that the c9_pmxevtyper field in the struct becomes unused, so you can drop it, and the .fieldoffset setting, and mark both the A32 and A64 reg structs as ARM_CP_NO_RAW.)
Quoted 6 lines
target/arm/helper.c +0
-1/* Unimplemented, RAZ/WI. */ { .name = "PMXEVCNTR", .cp = 15, .crn = 9, .crm = 13, .opc1 = 0, .opc2 = 2, .access = PL0_RW, .type = ARM_CP_CONST, .resetvalue = 0, --1.8.3.1
thanks
-- PMM
Re: [Qemu-arm] [PATCH V2 2/5] target-arm: Add support for AArch64 PMU register PMXEVTYPER_EL0
Quoted 60 lines · Peter Maydell
Quoted 27 lines · Wei Huang
In order to support Linux perf, which uses PMXEVTYPER register, this patch adds access support for
PMXEVTYPER_EL0.Signed-off-by Wei Huang <[email protected]>--- target/arm/cpu.h | 2 +- target/arm/helper.c | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-)target/arm/cpu.h +1
-1@@ -307,7 +307,7 @@ typedef struct CPUARMState {uint64_t c9_pmcr;/* performance monitor control register */ uint64_t c9_pmcnten;/* perf monitor counter enables */ uint32_t c9_pmovsr;/* perf monitor overflow status */ -uint32_t c9_pmxevtyper;/* perf monitor event type */ +uint64_t c9_pmxevtyper;/* perf monitor event type */ uint32_t c9_pmuserenr;/* perf monitor user enable */ uint64_t c9_pmselr;/* perf monitor counter selection register */ uint32_t c9_pminten;/* perf monitor interrupt enables */ target/arm/helper.c +0
-0target/arm/helper.c static void pmovsr_write(CPUARMState *env, const ARMCPRegInfo *ri, · line 1059
Quoted 7 lines
target/arm/helper.c +3
-1@@ -1054,7 +1054,13 @@ static void pmovsr_write(CPUARMState *env, const ARMCPRegInfo *ri,static void pmxevtyper_write (CPUARMState *env,const ARMCPRegInfo *ri,uint64_t value) { - env->cp15.c9_pmxevtyper = value &0xff ; +/* Attempts to access PMXEVTYPER are CONSTRAINED UNPREDICTABLE when +* PMSELR value is equal to or greater than the number of implemented +* counters, but not euqal to 0x1f. We opt to behave as a NOP. "equal"
Quoted 22 lines
target/arm/helper.c +11
-2+*/ +if (env->cp15.c9_pmselr ==0x1f ) { +pmccfiltr_write (env, ri, value); + } } static void pmuserenr_write(CPUARMState *env, const ARMCPRegInfo *ri,@@ -1234,10 +1240,17 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { .fieldoffset = offsetof(CPUARMState, cp15.pmccfiltr_el0), .resetvalue = 0, }, { .name = "PMXEVTYPER", .cp = 15, .crn = 9, .crm = 13, .opc1 = 0, .opc2 = 1, - .access = PL0_RW, - .fieldoffset = offsetof(CPUARMState, cp15.c9_pmxevtyper), + .access = PL0_RW, .type = ARM_CP_ALIAS, + .fieldoffset = offsetoflow32(CPUARMState, cp15.c9_pmxevtyper), .accessfn = pmreg_access, .writefn = pmxevtyper_write, .raw_writefn = raw_write }, + { .name = "PMXEVTYPER_EL0", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 3, .crn = 9, .crm = 13, .opc2 = 1, + .access = PL0_RW, .accessfn = pmreg_access, + .type = ARM_CP_IO, + .fieldoffset = offsetof(CPUARMState, cp15.c9_pmxevtyper),
Quoted 8 lines
target/arm/helper.c static const ARMCPRegInfo v7_cp_reginfo[] = { · line 1253
Quoted 2 lines
target/arm/helper.c +2
-0+ .writefn = pmxevtyper_write, .raw_writefn = raw_write, + .resetvalue = 0x0 },Reads also need to give you
PMCCFILTR_EL0, if PMSELR is set to 31, so you need a readfn as well. (That also means that thec9_pmxevtyperfield in the struct becomes unused, so you can drop it, and the .fieldoffset setting, and mark both the A32 and A64 reg structs asARM_CP_NO_RAW.)
OK. I will redo this one. Since we are changing the design, I will revise the CONSTRAINED UNPREDICTABLE behavior of pmxevtyper access to RAZ/WI instead of NOP.
Quoted 11 lines
Quoted 7 lines
target/arm/helper.c +0
-1/* Unimplemented, RAZ/WI. */ { .name = "PMXEVCNTR", .cp = 15, .crn = 9, .crm = 13, .opc1 = 0, .opc2 = 2, .access = PL0_RW, .type = ARM_CP_CONST, .resetvalue = 0, --1.8.3.1
thanks
-- PMM
PATCH v2 3/5 target-arm: Add support for PMU register PMXEVCNTR_EL0
In reply to Wei HuangTo make PMU register support complete, this patch adds support for PMXEVCNTR_EL0.
--- target/arm/helper.c | 4 ++++ 1 file changed, 4 insertions(+)
target/arm/helper.c +4 -0
@@ -1255,6 +1255,10 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { { .name = "PMXEVCNTR", .cp = 15, .crn = 9, .crm = 13, .opc1 = 0, .opc2 = 2, .access = PL0_RW, .type = ARM_CP_CONST, .resetvalue = 0, .accessfn = pmreg_access }, + { .name = "PMXEVCNTR_EL0", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 3, .crn = 9, .crm = 13, .opc2 = 2, + .access = PL0_RW, .type = ARM_CP_CONST, .resetvalue = 0, + .accessfn = pmreg_access }, { .name = "PMUSERENR", .cp = 15, .crn = 9, .crm = 14, .opc1 = 0, .opc2 = 0, .access = PL0_R | PL1_RW, .accessfn = access_tpm, .fieldoffset = offsetof(CPUARMState, cp15.c9_pmuserenr),
Signature · 1 line
1.8.3.1
Re: [Qemu-devel] [PATCH V2 3/5] target-arm: Add support for PMU register PMXEVCNTR_EL0
Quoted 13 lines · Wei Huang
To make PMU register support complete, this patch adds support for
PMXEVCNTR_EL0.Signed-off-by Wei Huang <[email protected]>--- target/arm/helper.c | 4 ++++ 1 file changed, 4 insertions(+)target/arm/helper.c +0
-0
target/arm/helper.c static const ARMCPRegInfo v7_cp_reginfo[] = { · line 1261
Quoted 7 lines
target/arm/helper.c +4
-0@@ -1255,6 +1255,10 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { { .name = "PMXEVCNTR", .cp = 15, .crn = 9, .crm = 13, .opc1 = 0, .opc2 = 2, .access = PL0_RW, .type = ARM_CP_CONST, .resetvalue = 0, .accessfn = pmreg_access }, + { .name = "PMXEVCNTR_EL0", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 3, .crn = 9, .crm = 13, .opc2 = 2, + .access = PL0_RW, .type = ARM_CP_CONST, .resetvalue = 0, + .accessfn = pmreg_access },
We don't need to do this, because we're already spec-compliant. Since we only support the cycle counter, accesses to PMXEVCNTR are always CONSTRAINED UNPREDICTABLE and "accesses UNDEF" is a permitted choice, which is what we do at the moment. ('Accesses are RAZ/WI' are also a permitted choice.)
Is there a reason you've opted for the RAZ/WI here?
thanks
-- PMM
PATCH v2 4/5 target-arm: Add support for PMU register PMINTENSET_EL1
In reply to Wei HuangThis patch adds access support for PMINTENSET_EL1.
--- target/arm/cpu.h | 2 +- target/arm/helper.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-)
target/arm/cpu.h +1 -1
@@ -310,7 +310,7 @@ typedef struct CPUARMState {uint64_t c9_pmxevtyper;/* perf monitor event type */ uint32_t c9_pmuserenr;/* perf monitor user enable */ uint64_t c9_pmselr;/* perf monitor counter selection register */ -uint32_t c9_pminten;/* perf monitor interrupt enables */ +uint64_t c9_pminten;/* perf monitor interrupt enables */ union { /* Memory attribute redirection */ struct { #ifdef HOST_WORDS_BIGENDIAN
target/arm/helper.c +9 -1
@@ -1272,9 +1272,17 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { .writefn = pmuserenr_write, .raw_writefn = raw_write }, { .name = "PMINTENSET", .cp = 15, .crn = 9, .crm = 14, .opc1 = 0, .opc2 = 1, .access = PL1_RW, .accessfn = access_tpm, - .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten), + .type = ARM_CP_ALIAS, + .fieldoffset = offsetoflow32(CPUARMState, cp15.c9_pminten), .resetvalue = 0, .writefn = pmintenset_write, .raw_writefn = raw_write }, + { .name = "PMINTENSET_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 9, .crm = 14, .opc2 = 1, + .access = PL1_RW, .accessfn = access_tpm, + .type = ARM_CP_IO, + .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten), + .writefn = pmintenset_write, .raw_writefn = raw_write, + .resetvalue = 0x0 }, { .name = "PMINTENCLR", .cp = 15, .crn = 9, .crm = 14, .opc1 = 0, .opc2 = 2, .access = PL1_RW, .accessfn = access_tpm, .type = ARM_CP_ALIAS, .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten),
Signature · 1 line
1.8.3.1
Re: [Qemu-arm] [PATCH V2 4/5] target-arm: Add support for PMU register PMINTENSET_EL1
Quoted 34 lines · Wei Huang
This patch adds access support for
PMINTENSET_EL1.Signed-off-by Wei Huang <[email protected]>--- target/arm/cpu.h | 2 +- target/arm/helper.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-)target/arm/cpu.h +1
-1@@ -310,7 +310,7 @@ typedef struct CPUARMState {uint64_t c9_pmxevtyper;/* perf monitor event type */ uint32_t c9_pmuserenr;/* perf monitor user enable */ uint64_t c9_pmselr;/* perf monitor counter selection register */ -uint32_t c9_pminten;/* perf monitor interrupt enables */ +uint64_t c9_pminten;/* perf monitor interrupt enables */ union { /* Memory attribute redirection */ struct { #ifdef HOST_WORDS_BIGENDIANtarget/arm/helper.c +2
-1@@ -1272,9 +1272,17 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { .writefn = pmuserenr_write, .raw_writefn = raw_write }, { .name = "PMINTENSET", .cp = 15, .crn = 9, .crm = 14, .opc1 = 0, .opc2 = 1, .access = PL1_RW, .accessfn = access_tpm, - .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten), + .type = ARM_CP_ALIAS, + .fieldoffset = offsetoflow32(CPUARMState, cp15.c9_pminten), .resetvalue = 0, .writefn = pmintenset_write, .raw_writefn = raw_write },
target/arm/helper.c static const ARMCPRegInfo v7_cp_reginfo[] = { · line 1288
Quoted 10 lines
target/arm/helper.c +7
-0+ { .name = "PMINTENSET_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 9, .crm = 14, .opc2 = 1, + .access = PL1_RW, .accessfn = access_tpm, + .type = ARM_CP_IO, + .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten), + .writefn = pmintenset_write, .raw_writefn = raw_write, + .resetvalue = 0x0 }, { .name = "PMINTENCLR", .cp = 15, .crn = 9, .crm = 14, .opc1 = 0, .opc2 = 2, .access = PL1_RW, .accessfn = access_tpm, .type = ARM_CP_ALIAS, .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten),
Add PMINTENCLR_EL1 as well, please.
thanks
-- PMM
Re: [Qemu-arm] [PATCH V2 4/5] target-arm: Add support for PMU register PMINTENSET_EL1
Quoted 39 lines · Peter Maydell
Quoted 38 lines · Wei Huang
This patch adds access support for
PMINTENSET_EL1.Signed-off-by Wei Huang <[email protected]>--- target/arm/cpu.h | 2 +- target/arm/helper.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-)target/arm/cpu.h +1
-1@@ -310,7 +310,7 @@ typedef struct CPUARMState {uint64_t c9_pmxevtyper;/* perf monitor event type */ uint32_t c9_pmuserenr;/* perf monitor user enable */ uint64_t c9_pmselr;/* perf monitor counter selection register */ -uint32_t c9_pminten;/* perf monitor interrupt enables */ +uint64_t c9_pminten;/* perf monitor interrupt enables */ union { /* Memory attribute redirection */ struct { #ifdef HOST_WORDS_BIGENDIANtarget/arm/helper.c +6
-1@@ -1272,9 +1272,17 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { .writefn = pmuserenr_write, .raw_writefn = raw_write }, { .name = "PMINTENSET", .cp = 15, .crn = 9, .crm = 14, .opc1 = 0, .opc2 = 1, .access = PL1_RW, .accessfn = access_tpm, - .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten), + .type = ARM_CP_ALIAS, + .fieldoffset = offsetoflow32(CPUARMState, cp15.c9_pminten), .resetvalue = 0, .writefn = pmintenset_write, .raw_writefn = raw_write }, + { .name = "PMINTENSET_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 9, .crm = 14, .opc2 = 1, + .access = PL1_RW, .accessfn = access_tpm, + .type = ARM_CP_IO,
Quoted 8 lines
target/arm/helper.c static const ARMCPRegInfo v7_cp_reginfo[] = { · line 1288
Quoted 6 lines
target/arm/helper.c +3
-0+ .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten), + .writefn = pmintenset_write, .raw_writefn = raw_write, + .resetvalue = 0x0 }, { .name = "PMINTENCLR", .cp = 15, .crn = 9, .crm = 14, .opc1 = 0, .opc2 = 2, .access = PL1_RW, .accessfn = access_tpm, .type = ARM_CP_ALIAS, .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten),Add
PMINTENCLR_EL1as well, please.
It was already defined in target-arm/helper.c file. Could you elaborate which part is missing?
{ .name = "PMINTENCLR_EL1", .state = ARM_CP_STATE_AA64,
.opc0 = 3, .opc1 = 0, .crn = 9, .crm = 14, .opc2 = 2, .access = PL1_RW, .accessfn = access_tpm, .type = ARM_CP_ALIAS, .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten), .writefn = pmintenclr_write },
Quoted 4 lines
thanks
-- PMM
Peter Maydell
Reviewed-byRe: [Qemu-arm] [PATCH V2 4/5] target-arm: Add support for PMU register PMINTENSET_EL1
Quoted 51 lines · Wei Huang
Quoted 39 lines · Peter Maydell
Quoted 38 lines · Wei Huang
This patch adds access support for
PMINTENSET_EL1.Signed-off-by Wei Huang <[email protected]>--- target/arm/cpu.h | 2 +- target/arm/helper.c | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-)target/arm/cpu.h +1
-1@@ -310,7 +310,7 @@ typedef struct CPUARMState {uint64_t c9_pmxevtyper;/* perf monitor event type */ uint32_t c9_pmuserenr;/* perf monitor user enable */ uint64_t c9_pmselr;/* perf monitor counter selection register */ -uint32_t c9_pminten;/* perf monitor interrupt enables */ +uint64_t c9_pminten;/* perf monitor interrupt enables */ union { /* Memory attribute redirection */ struct { #ifdef HOST_WORDS_BIGENDIANtarget/arm/helper.c +6
-1@@ -1272,9 +1272,17 @@ static const ARMCPRegInfo v7_cp_reginfo[] = { .writefn = pmuserenr_write, .raw_writefn = raw_write }, { .name = "PMINTENSET", .cp = 15, .crn = 9, .crm = 14, .opc1 = 0, .opc2 = 1, .access = PL1_RW, .accessfn = access_tpm, - .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten), + .type = ARM_CP_ALIAS, + .fieldoffset = offsetoflow32(CPUARMState, cp15.c9_pminten), .resetvalue = 0, .writefn = pmintenset_write, .raw_writefn = raw_write }, + { .name = "PMINTENSET_EL1", .state = ARM_CP_STATE_AA64, + .opc0 = 3, .opc1 = 0, .crn = 9, .crm = 14, .opc2 = 1, + .access = PL1_RW, .accessfn = access_tpm, + .type = ARM_CP_IO,Quoted 8 lines
target/arm/helper.c static const ARMCPRegInfo v7_cp_reginfo[] = { · line 1288
Quoted 6 lines
target/arm/helper.c +3
-0+ .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten), + .writefn = pmintenset_write, .raw_writefn = raw_write, + .resetvalue = 0x0 }, { .name = "PMINTENCLR", .cp = 15, .crn = 9, .crm = 14, .opc1 = 0, .opc2 = 2, .access = PL1_RW, .accessfn = access_tpm, .type = ARM_CP_ALIAS, .fieldoffset = offsetof(CPUARMState, cp15.c9_pminten),Add
PMINTENCLR_EL1as well, please.
Quoted 8 lines
It was already defined in
target-arm/helper.cfile. Could you elaborate which part is missing?{ .name = "
PMINTENCLR_EL1", .state =ARM_CP_STATE_AA64,
.opc0 = 3, .opc1 = 0, .crn = 9, .crm = 14, .opc2 = 2, .access =PL1_RW, .accessfn =access_tpm, .type =ARM_CP_ALIAS, .fieldoffset =offsetof(CPUARMState, cp15.c9_pminten), .writefn =pmintenclr_write},
I'm sorry, you're right. I assumed that because we didn't have a 64-bit version of the SET we didn't have a 64-bit version of the CLR either.
thanks
-- PMM
PATCH v2 5/5 target-arm: Enable vPMU support under TCG mode
In reply to Wei HuangThis patch contains several fixes to enable vPMU under TCG mode. It first removes the checking of kvm_enabled() while unsetting ARM_FEATURE_PMU. With it, the .pmu option can be used to turn on/off vPMU under TCG mode. Secondly the PMU node of DT table is now created under TCG. The last fix is to disable the masking of PMUver field of ID_AA64DFR0_EL1.
--- hw/arm/virt.c | 2 +- target/arm/cpu.c | 2 +- target/arm/helper.c | 7 +------ 3 files changed, 3 insertions(+), 8 deletions(-)
hw/arm/virt.c +1 -1
@@ -471,7 +471,7 @@ static void fdt_add_pmu_nodes(const VirtMachineState *vms)CPU_FOREACH (cpu) { armcpu =ARM_CPU (cpu);if (!arm_feature (&armcpu->env,ARM_FEATURE_PMU ) || - !kvm_arm_pmu_create (cpu,PPI (VIRTUAL_PMU_IRQ ))) { + (kvm_enabled () && !kvm_arm_pmu_create (cpu,PPI (VIRTUAL_PMU_IRQ )))) {return ; } }
target/arm/cpu.c +1 -1
@@ -745,7 +745,7 @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)unset_feature (env,ARM_FEATURE_EL2 ); } -if (!cpu->has_pmu || !kvm_enabled ()) { +if (!cpu->has_pmu) { cpu->has_pmu = false;unset_feature (env,ARM_FEATURE_PMU ); }
target/arm/helper.c +1 -6
@@ -4630,12 +4630,7 @@ void register_cp_regs_for_features(ARMCPU *cpu) { .name = "ID_AA64DFR0_EL1", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 5, .opc2 = 0, .access = PL1_R, .type = ARM_CP_CONST, -/* We mask out the PMUVer field, because we don't currently -* implement the PMU. Not advertising it prevents the guest -* from trying to use it and getting UNDEFs on registers we -* don't implement. -*/ - .resetvalue = cpu->id_aa64dfr0 & ~0xf00 }, + .resetvalue = cpu->id_aa64dfr0 }, { .name = "ID_AA64DFR1_EL1", .state = ARM_CP_STATE_AA64, .opc0 = 3, .opc1 = 0, .crn = 0, .crm = 5, .opc2 = 1, .access = PL1_R, .type = ARM_CP_CONST,
Signature · 1 line
1.8.3.1
Re: [Qemu-arm] [PATCH V2 5/5] target-arm: Enable vPMU support under TCG mode
Quoted 8 lines · Wei Huang
This patch contains several fixes to enable vPMU under TCG mode. It first removes the checking of
kvm_enabled()while unsettingARM_FEATURE_PMU. With it, the .pmu option can be used to turn on/off vPMU under TCG mode. Secondly the PMU node of DT table is now created under TCG. The last fix is to disable the masking of PMUver field ofID_AA64DFR0_EL1.Signed-off-by Wei Huang <[email protected]>---
thanks
-- PMM