| Message ID | 20210226065025.1254973-2-maddy@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [V2,1/2] powerpc/perf: Infrastructure to support checking of attr.config* | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (626a6c3d2e20da80aaa710104f34ea6037b28b33) |
| snowpatch_ozlabs/build-ppc64le | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64be | success | Build succeeded |
| snowpatch_ozlabs/build-ppc64e | success | Build succeeded |
| snowpatch_ozlabs/build-pmac32 | success | Build succeeded |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 100 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
On 26/02/2021 17:50, Madhavan Srinivasan wrote: > Add platform specific attr.config value checks. Patch > includes checks for both power9 and power10. > > Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> > --- > Changelog v1: > - No changes. > > arch/powerpc/perf/isa207-common.c | 41 +++++++++++++++++++++++++++++++ > arch/powerpc/perf/isa207-common.h | 2 ++ > arch/powerpc/perf/power10-pmu.c | 13 ++++++++++ > arch/powerpc/perf/power9-pmu.c | 13 ++++++++++ > 4 files changed, 69 insertions(+) > > diff --git a/arch/powerpc/perf/isa207-common.c b/arch/powerpc/perf/isa207-common.c > index e4f577da33d8..b255799f5b51 100644 > --- a/arch/powerpc/perf/isa207-common.c > +++ b/arch/powerpc/perf/isa207-common.c > @@ -694,3 +694,44 @@ int isa207_get_alternatives(u64 event, u64 alt[], int size, unsigned int flags, > > return num_alt; > } > + > +int isa3_X_check_attr_config(struct perf_event *ev) "isa300" is used everywhere else to refer to ISA 3.00. > +{ > + u64 val, sample_mode; > + u64 event = ev->attr.config; > + > + val = (event >> EVENT_SAMPLE_SHIFT) & EVENT_SAMPLE_MASK; I am not familiar with the code - "Raw event encoding for Power9" from arch/powerpc/perf/power9-pmu.c - where is this from? Is this how linux defines encoding or it is P9 UM or something? > + sample_mode = val & 0x3; > + > + /* > + * MMCRA[61:62] is Randome Sampling Mode (SM). > + * value of 0b11 is reserved. > + */ > + if (sample_mode == 0x3) > + return -1; > + > + /* > + * Check for all reserved value > + */ > + switch (val) { > + case 0x5: > + case 0x9: > + case 0xD: > + case 0x19: > + case 0x1D: > + case 0x1A: > + case 0x1E: What spec did these numbers come from? > + return -1; > + } > + > + /* > + * MMCRA[48:51]/[52:55]) Threshold Start/Stop > + * Events Selection. > + * 0b11110000/0b00001111 is reserved. The mapping between the event and MMCRA is very unclear :) But there are more reserved values in MMCRA in PowerISA_public.v3.0B.pdf: === 0000 Reserved Problem state access (SPR 770) 1000 - 1111 - ReservedPrivileged access (SPR 770 or 786) 1000 - 1111 - Implementation-dependent === Do not you need to filter these too? > + */ > + val = (event >> EVENT_THR_CTL_SHIFT) & EVENT_THR_CTL_MASK; > + if (((val & 0xF0) == 0xF0) || ((val & 0xF) == 0xF)) > + return -1; Since the filters may differ for problem and privileged, may be make these check_attr_config() hooks return EINVAL or EPERM and pass it on in the caller? Not sure there is much value in it though. > + > + return 0; > +} > diff --git a/arch/powerpc/perf/isa207-common.h b/arch/powerpc/perf/isa207-common.h > index 1af0e8c97ac7..ae8eaf05efd1 100644 > --- a/arch/powerpc/perf/isa207-common.h > +++ b/arch/powerpc/perf/isa207-common.h > @@ -280,4 +280,6 @@ void isa207_get_mem_data_src(union perf_mem_data_src *dsrc, u32 flags, > struct pt_regs *regs); > void isa207_get_mem_weight(u64 *weight); > > +int isa3_X_check_attr_config(struct perf_event *ev); > + > #endif > diff --git a/arch/powerpc/perf/power10-pmu.c b/arch/powerpc/perf/power10-pmu.c > index a901c1348cad..bc64354cab6a 100644 > --- a/arch/powerpc/perf/power10-pmu.c > +++ b/arch/powerpc/perf/power10-pmu.c > @@ -106,6 +106,18 @@ static int power10_get_alternatives(u64 event, unsigned int flags, u64 alt[]) > return num_alt; > } > > +static int power10_check_attr_config(struct perf_event *ev) > +{ > + u64 val; > + u64 event = ev->attr.config; > + > + val = (event >> EVENT_SAMPLE_SHIFT) & EVENT_SAMPLE_MASK; > + if (val == 0x10 || isa3_X_check_attr_config(ev)) > + return -1; > + > + return 0; > +} > + > GENERIC_EVENT_ATTR(cpu-cycles, PM_RUN_CYC); > GENERIC_EVENT_ATTR(instructions, PM_RUN_INST_CMPL); > GENERIC_EVENT_ATTR(branch-instructions, PM_BR_CMPL); > @@ -559,6 +571,7 @@ static struct power_pmu power10_pmu = { > .attr_groups = power10_pmu_attr_groups, > .bhrb_nr = 32, > .capabilities = PERF_PMU_CAP_EXTENDED_REGS, > + .check_attr_config = power10_check_attr_config, > }; > > int init_power10_pmu(void) > diff --git a/arch/powerpc/perf/power9-pmu.c b/arch/powerpc/perf/power9-pmu.c > index 2a57e93a79dc..b3b9b226d053 100644 > --- a/arch/powerpc/perf/power9-pmu.c > +++ b/arch/powerpc/perf/power9-pmu.c > @@ -151,6 +151,18 @@ static int power9_get_alternatives(u64 event, unsigned int flags, u64 alt[]) > return num_alt; > } > > +static int power9_check_attr_config(struct perf_event *ev) > +{ > + u64 val; > + u64 event = ev->attr.config; > + > + val = (event >> EVENT_SAMPLE_SHIFT) & EVENT_SAMPLE_MASK; > + if (val == 0xC || isa3_X_check_attr_config(ev)) > + return -1; > + > + return 0; > +} > + > GENERIC_EVENT_ATTR(cpu-cycles, PM_CYC); > GENERIC_EVENT_ATTR(stalled-cycles-frontend, PM_ICT_NOSLOT_CYC); > GENERIC_EVENT_ATTR(stalled-cycles-backend, PM_CMPLU_STALL); > @@ -437,6 +449,7 @@ static struct power_pmu power9_pmu = { > .attr_groups = power9_pmu_attr_groups, > .bhrb_nr = 32, > .capabilities = PERF_PMU_CAP_EXTENDED_REGS, > + .check_attr_config = power9_check_attr_config, > }; > > int init_power9_pmu(void) >
On Thu, Mar 11, 2021 at 12:16:25AM +1100, Alexey Kardashevskiy wrote: > On 26/02/2021 17:50, Madhavan Srinivasan wrote: > >+int isa3_X_check_attr_config(struct perf_event *ev) > > "isa300" is used everywhere else to refer to ISA 3.00. And that itself is a misspelling, there is nothing called "ISA 3.00" (it is called "ISA 3.0"). Segher
On 3/10/21 6:46 PM, Alexey Kardashevskiy wrote: > > > On 26/02/2021 17:50, Madhavan Srinivasan wrote: >> Add platform specific attr.config value checks. Patch >> includes checks for both power9 and power10. >> >> Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> >> --- >> Changelog v1: >> - No changes. >> >> arch/powerpc/perf/isa207-common.c | 41 +++++++++++++++++++++++++++++++ >> arch/powerpc/perf/isa207-common.h | 2 ++ >> arch/powerpc/perf/power10-pmu.c | 13 ++++++++++ >> arch/powerpc/perf/power9-pmu.c | 13 ++++++++++ >> 4 files changed, 69 insertions(+) >> >> diff --git a/arch/powerpc/perf/isa207-common.c >> b/arch/powerpc/perf/isa207-common.c >> index e4f577da33d8..b255799f5b51 100644 >> --- a/arch/powerpc/perf/isa207-common.c >> +++ b/arch/powerpc/perf/isa207-common.c >> @@ -694,3 +694,44 @@ int isa207_get_alternatives(u64 event, u64 >> alt[], int size, unsigned int flags, >> return num_alt; >> } >> + >> +int isa3_X_check_attr_config(struct perf_event *ev) > > > "isa300" is used everywhere else to refer to ISA 3.00. ok will rename if as isa3XX_check_attr_config then. > > >> +{ >> + u64 val, sample_mode; >> + u64 event = ev->attr.config; >> + >> + val = (event >> EVENT_SAMPLE_SHIFT) & EVENT_SAMPLE_MASK; > > I am not familiar with the code - "Raw event encoding for Power9" from > arch/powerpc/perf/power9-pmu.c - where is this from? Is this how linux > defines encoding or it is P9 UM or something? mpe and pmu folks defined the encoding format for power8, and then it was carried forward slightly modified for P9. > >> + sample_mode = val & 0x3; >> + >> + /* >> + * MMCRA[61:62] is Randome Sampling Mode (SM). >> + * value of 0b11 is reserved. >> + */ >> + if (sample_mode == 0x3) >> + return -1; >> + >> + /* >> + * Check for all reserved value >> + */ >> + switch (val) { >> + case 0x5: >> + case 0x9: >> + case 0xD: >> + case 0x19: >> + case 0x1D: >> + case 0x1A: >> + case 0x1E: > > > What spec did these numbers come from? Thanks for asking. Yes, these are published as part of Performance monitoring unit user guide. https://wiki.raptorcs.com/w/images/6/6b/POWER9_PMU_UG_v12_28NOV2018_pub.pdf Will add a comment about the source of these bits. > >> + return -1; >> + } >> + >> + /* >> + * MMCRA[48:51]/[52:55]) Threshold Start/Stop >> + * Events Selection. >> + * 0b11110000/0b00001111 is reserved. > > The mapping between the event and MMCRA is very unclear :) But there > are more reserved values in MMCRA in PowerISA_public.v3.0B.pdf: > > === > 0000 Reserved > > Problem state access (SPR 770) > 1000 - 1111 - ReservedPrivileged access (SPR 770 or 786) > 1000 - 1111 - Implementation-dependent > === > > Do not you need to filter these too? Most of these bits are not architected but one should refer user guide spec which talks about each bit and supported values. https://wiki.raptorcs.com/w/images/6/6b/POWER9_PMU_UG_v12_28NOV2018_pub.pdf > >> + */ >> + val = (event >> EVENT_THR_CTL_SHIFT) & EVENT_THR_CTL_MASK; >> + if (((val & 0xF0) == 0xF0) || ((val & 0xF) == 0xF)) >> + return -1; > > Since the filters may differ for problem and privileged, may be make > these check_attr_config() hooks return EINVAL or EPERM and pass it on > in the caller? Not sure there is much value in it though. Since these are reserved values, privilege state does not matter. Will change it to return EINVAL. Thanks for the review. Maddy > > > >> + >> + return 0; >> +} >> diff --git a/arch/powerpc/perf/isa207-common.h >> b/arch/powerpc/perf/isa207-common.h >> index 1af0e8c97ac7..ae8eaf05efd1 100644 >> --- a/arch/powerpc/perf/isa207-common.h >> +++ b/arch/powerpc/perf/isa207-common.h >> @@ -280,4 +280,6 @@ void isa207_get_mem_data_src(union >> perf_mem_data_src *dsrc, u32 flags, >> struct pt_regs *regs); >> void isa207_get_mem_weight(u64 *weight); >> +int isa3_X_check_attr_config(struct perf_event *ev); >> + >> #endif >> diff --git a/arch/powerpc/perf/power10-pmu.c >> b/arch/powerpc/perf/power10-pmu.c >> index a901c1348cad..bc64354cab6a 100644 >> --- a/arch/powerpc/perf/power10-pmu.c >> +++ b/arch/powerpc/perf/power10-pmu.c >> @@ -106,6 +106,18 @@ static int power10_get_alternatives(u64 event, >> unsigned int flags, u64 alt[]) >> return num_alt; >> } >> +static int power10_check_attr_config(struct perf_event *ev) >> +{ >> + u64 val; >> + u64 event = ev->attr.config; >> + >> + val = (event >> EVENT_SAMPLE_SHIFT) & EVENT_SAMPLE_MASK; >> + if (val == 0x10 || isa3_X_check_attr_config(ev)) >> + return -1; >> + >> + return 0; >> +} >> + >> GENERIC_EVENT_ATTR(cpu-cycles, PM_RUN_CYC); >> GENERIC_EVENT_ATTR(instructions, PM_RUN_INST_CMPL); >> GENERIC_EVENT_ATTR(branch-instructions, PM_BR_CMPL); >> @@ -559,6 +571,7 @@ static struct power_pmu power10_pmu = { >> .attr_groups = power10_pmu_attr_groups, >> .bhrb_nr = 32, >> .capabilities = PERF_PMU_CAP_EXTENDED_REGS, >> + .check_attr_config = power10_check_attr_config, >> }; >> int init_power10_pmu(void) >> diff --git a/arch/powerpc/perf/power9-pmu.c >> b/arch/powerpc/perf/power9-pmu.c >> index 2a57e93a79dc..b3b9b226d053 100644 >> --- a/arch/powerpc/perf/power9-pmu.c >> +++ b/arch/powerpc/perf/power9-pmu.c >> @@ -151,6 +151,18 @@ static int power9_get_alternatives(u64 event, >> unsigned int flags, u64 alt[]) >> return num_alt; >> } >> +static int power9_check_attr_config(struct perf_event *ev) >> +{ >> + u64 val; >> + u64 event = ev->attr.config; >> + >> + val = (event >> EVENT_SAMPLE_SHIFT) & EVENT_SAMPLE_MASK; >> + if (val == 0xC || isa3_X_check_attr_config(ev)) >> + return -1; >> + >> + return 0; >> +} >> + >> GENERIC_EVENT_ATTR(cpu-cycles, PM_CYC); >> GENERIC_EVENT_ATTR(stalled-cycles-frontend, PM_ICT_NOSLOT_CYC); >> GENERIC_EVENT_ATTR(stalled-cycles-backend, PM_CMPLU_STALL); >> @@ -437,6 +449,7 @@ static struct power_pmu power9_pmu = { >> .attr_groups = power9_pmu_attr_groups, >> .bhrb_nr = 32, >> .capabilities = PERF_PMU_CAP_EXTENDED_REGS, >> + .check_attr_config = power9_check_attr_config, >> }; >> int init_power9_pmu(void) >> >
diff --git a/arch/powerpc/perf/isa207-common.c b/arch/powerpc/perf/isa207-common.c index e4f577da33d8..b255799f5b51 100644 --- a/arch/powerpc/perf/isa207-common.c +++ b/arch/powerpc/perf/isa207-common.c @@ -694,3 +694,44 @@ int isa207_get_alternatives(u64 event, u64 alt[], int size, unsigned int flags, return num_alt; } + +int isa3_X_check_attr_config(struct perf_event *ev) +{ + u64 val, sample_mode; + u64 event = ev->attr.config; + + val = (event >> EVENT_SAMPLE_SHIFT) & EVENT_SAMPLE_MASK; + sample_mode = val & 0x3; + + /* + * MMCRA[61:62] is Randome Sampling Mode (SM). + * value of 0b11 is reserved. + */ + if (sample_mode == 0x3) + return -1; + + /* + * Check for all reserved value + */ + switch (val) { + case 0x5: + case 0x9: + case 0xD: + case 0x19: + case 0x1D: + case 0x1A: + case 0x1E: + return -1; + } + + /* + * MMCRA[48:51]/[52:55]) Threshold Start/Stop + * Events Selection. + * 0b11110000/0b00001111 is reserved. + */ + val = (event >> EVENT_THR_CTL_SHIFT) & EVENT_THR_CTL_MASK; + if (((val & 0xF0) == 0xF0) || ((val & 0xF) == 0xF)) + return -1; + + return 0; +} diff --git a/arch/powerpc/perf/isa207-common.h b/arch/powerpc/perf/isa207-common.h index 1af0e8c97ac7..ae8eaf05efd1 100644 --- a/arch/powerpc/perf/isa207-common.h +++ b/arch/powerpc/perf/isa207-common.h @@ -280,4 +280,6 @@ void isa207_get_mem_data_src(union perf_mem_data_src *dsrc, u32 flags, struct pt_regs *regs); void isa207_get_mem_weight(u64 *weight); +int isa3_X_check_attr_config(struct perf_event *ev); + #endif diff --git a/arch/powerpc/perf/power10-pmu.c b/arch/powerpc/perf/power10-pmu.c index a901c1348cad..bc64354cab6a 100644 --- a/arch/powerpc/perf/power10-pmu.c +++ b/arch/powerpc/perf/power10-pmu.c @@ -106,6 +106,18 @@ static int power10_get_alternatives(u64 event, unsigned int flags, u64 alt[]) return num_alt; } +static int power10_check_attr_config(struct perf_event *ev) +{ + u64 val; + u64 event = ev->attr.config; + + val = (event >> EVENT_SAMPLE_SHIFT) & EVENT_SAMPLE_MASK; + if (val == 0x10 || isa3_X_check_attr_config(ev)) + return -1; + + return 0; +} + GENERIC_EVENT_ATTR(cpu-cycles, PM_RUN_CYC); GENERIC_EVENT_ATTR(instructions, PM_RUN_INST_CMPL); GENERIC_EVENT_ATTR(branch-instructions, PM_BR_CMPL); @@ -559,6 +571,7 @@ static struct power_pmu power10_pmu = { .attr_groups = power10_pmu_attr_groups, .bhrb_nr = 32, .capabilities = PERF_PMU_CAP_EXTENDED_REGS, + .check_attr_config = power10_check_attr_config, }; int init_power10_pmu(void) diff --git a/arch/powerpc/perf/power9-pmu.c b/arch/powerpc/perf/power9-pmu.c index 2a57e93a79dc..b3b9b226d053 100644 --- a/arch/powerpc/perf/power9-pmu.c +++ b/arch/powerpc/perf/power9-pmu.c @@ -151,6 +151,18 @@ static int power9_get_alternatives(u64 event, unsigned int flags, u64 alt[]) return num_alt; } +static int power9_check_attr_config(struct perf_event *ev) +{ + u64 val; + u64 event = ev->attr.config; + + val = (event >> EVENT_SAMPLE_SHIFT) & EVENT_SAMPLE_MASK; + if (val == 0xC || isa3_X_check_attr_config(ev)) + return -1; + + return 0; +} + GENERIC_EVENT_ATTR(cpu-cycles, PM_CYC); GENERIC_EVENT_ATTR(stalled-cycles-frontend, PM_ICT_NOSLOT_CYC); GENERIC_EVENT_ATTR(stalled-cycles-backend, PM_CMPLU_STALL); @@ -437,6 +449,7 @@ static struct power_pmu power9_pmu = { .attr_groups = power9_pmu_attr_groups, .bhrb_nr = 32, .capabilities = PERF_PMU_CAP_EXTENDED_REGS, + .check_attr_config = power9_check_attr_config, }; int init_power9_pmu(void)
Add platform specific attr.config value checks. Patch includes checks for both power9 and power10. Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com> --- Changelog v1: - No changes. arch/powerpc/perf/isa207-common.c | 41 +++++++++++++++++++++++++++++++ arch/powerpc/perf/isa207-common.h | 2 ++ arch/powerpc/perf/power10-pmu.c | 13 ++++++++++ arch/powerpc/perf/power9-pmu.c | 13 ++++++++++ 4 files changed, 69 insertions(+)