Rather than scanning all PMUs for a counter name, scan the PMU
associated with the evsel of the sample. This is done to remove a
dependence on pmu-events.h.
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/s390-sample-raw.c | 50 ++++++++++++++++---------------
1 file changed, 26 insertions(+), 24 deletions(-)
diff --git a/tools/perf/util/s390-sample-raw.c b/tools/perf/util/s390-sample-raw.c
index 91330c874170..dc1ed3e95d4d 100644
--- a/tools/perf/util/s390-sample-raw.c
+++ b/tools/perf/util/s390-sample-raw.c
@@ -27,7 +27,7 @@
#include "color.h"
#include "sample-raw.h"
#include "s390-cpumcf-kernel.h"
-#include "pmu-events/pmu-events.h"
+#include "util/pmu.h"
#include "util/sample.h"
static size_t ctrset_size(struct cf_ctrset_entry *set)
@@ -132,56 +132,57 @@ static int get_counterset_start(int setnr)
struct get_counter_name_data {
int wanted;
- const char *result;
+ char *result;
};
-static int get_counter_name_callback(const struct pmu_event *evp,
- const struct pmu_events_table *table __maybe_unused,
- void *vdata)
+static int get_counter_name_callback(void *vdata, struct pmu_event_info *info)
{
struct get_counter_name_data *data = vdata;
int rc, event_nr;
+ const char *event_str;
- if (evp->name == NULL || evp->event == NULL)
+ if (info->str == NULL)
return 0;
- rc = sscanf(evp->event, "event=%x", &event_nr);
+
+ event_str = strstr(info->str, "event=");
+ if (!event_str)
+ return 0;
+
+ rc = sscanf(event_str, "event=%x", &event_nr);
if (rc == 1 && event_nr == data->wanted) {
- data->result = evp->name;
+ data->result = strdup(info->name);
return 1; /* Terminate the search. */
}
return 0;
}
-/* Scan the PMU table and extract the logical name of a counter from the
- * PMU events table. Input is the counter set and counter number with in the
- * set. Construct the event number and use this as key. If they match return
- * the name of this counter.
+/* Scan the PMU and extract the logical name of a counter from the event. Input
+ * is the counter set and counter number with in the set. Construct the event
+ * number and use this as key. If they match return the name of this counter.
* If no match is found a NULL pointer is returned.
*/
-static const char *get_counter_name(int set, int nr, const struct pmu_events_table *table)
+static char *get_counter_name(int set, int nr, struct perf_pmu *pmu)
{
struct get_counter_name_data data = {
.wanted = get_counterset_start(set) + nr,
.result = NULL,
};
- if (!table)
+ if (!pmu)
return NULL;
- pmu_events_table__for_each_event(table, get_counter_name_callback, &data);
+ perf_pmu__for_each_event(pmu, &data, get_counter_name_callback);
return data.result;
}
-static void s390_cpumcfdg_dump(struct perf_sample *sample)
+static void s390_cpumcfdg_dump(struct perf_pmu *pmu, struct perf_sample *sample)
{
size_t i, len = sample->raw_size, offset = 0;
unsigned char *buf = sample->raw_data;
const char *color = PERF_COLOR_BLUE;
struct cf_ctrset_entry *cep, ce;
- const struct pmu_events_table *table;
u64 *p;
- table = pmu_events_table__find();
while (offset < len) {
cep = (struct cf_ctrset_entry *)(buf + offset);
@@ -199,11 +200,12 @@ static void s390_cpumcfdg_dump(struct perf_sample *sample)
color_fprintf(stdout, color, " [%#08zx] Counterset:%d"
" Counters:%d\n", offset, ce.set, ce.ctr);
for (i = 0, p = (u64 *)(cep + 1); i < ce.ctr; ++i, ++p) {
- const char *ev_name = get_counter_name(ce.set, i, table);
+ char *ev_name = get_counter_name(ce.set, i, pmu);
color_fprintf(stdout, color,
"\tCounter:%03d %s Value:%#018lx\n", i,
ev_name ?: "<unknown>", be64_to_cpu(*p));
+ free(ev_name);
}
offset += ctrset_size(&ce);
}
@@ -216,14 +218,14 @@ static void s390_cpumcfdg_dump(struct perf_sample *sample)
*/
void evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event, struct perf_sample *sample)
{
- struct evsel *ev_bc000;
+ struct evsel *evsel;
if (event->header.type != PERF_RECORD_SAMPLE)
return;
- ev_bc000 = evlist__event2evsel(evlist, event);
- if (ev_bc000 == NULL ||
- ev_bc000->core.attr.config != PERF_EVENT_CPUM_CF_DIAG)
+ evsel = evlist__event2evsel(evlist, event);
+ if (evsel == NULL ||
+ evsel->core.attr.config != PERF_EVENT_CPUM_CF_DIAG)
return;
/* Display raw data on screen */
@@ -231,5 +233,5 @@ void evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event, str
pr_err("Invalid counter set data encountered\n");
return;
}
- s390_cpumcfdg_dump(sample);
+ s390_cpumcfdg_dump(evsel->pmu, sample);
}
--
2.42.0.rc1.204.g551eb34607-googEm Wed, Aug 23, 2023 at 09:13:18PM -0700, Ian Rogers escreveu:
> Rather than scanning all PMUs for a counter name, scan the PMU
> associated with the evsel of the sample. This is done to remove a
> dependence on pmu-events.h.
I'm applying this one, and CCing the S/390 developers so that they can
try this and maybe provide an Acked-by/Tested-by,
- Arnaldo
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/util/s390-sample-raw.c | 50 ++++++++++++++++---------------
> 1 file changed, 26 insertions(+), 24 deletions(-)
>
> diff --git a/tools/perf/util/s390-sample-raw.c b/tools/perf/util/s390-sample-raw.c
> index 91330c874170..dc1ed3e95d4d 100644
> --- a/tools/perf/util/s390-sample-raw.c
> +++ b/tools/perf/util/s390-sample-raw.c
> @@ -27,7 +27,7 @@
> #include "color.h"
> #include "sample-raw.h"
> #include "s390-cpumcf-kernel.h"
> -#include "pmu-events/pmu-events.h"
> +#include "util/pmu.h"
> #include "util/sample.h"
>
> static size_t ctrset_size(struct cf_ctrset_entry *set)
> @@ -132,56 +132,57 @@ static int get_counterset_start(int setnr)
>
> struct get_counter_name_data {
> int wanted;
> - const char *result;
> + char *result;
> };
>
> -static int get_counter_name_callback(const struct pmu_event *evp,
> - const struct pmu_events_table *table __maybe_unused,
> - void *vdata)
> +static int get_counter_name_callback(void *vdata, struct pmu_event_info *info)
> {
> struct get_counter_name_data *data = vdata;
> int rc, event_nr;
> + const char *event_str;
>
> - if (evp->name == NULL || evp->event == NULL)
> + if (info->str == NULL)
> return 0;
> - rc = sscanf(evp->event, "event=%x", &event_nr);
> +
> + event_str = strstr(info->str, "event=");
> + if (!event_str)
> + return 0;
> +
> + rc = sscanf(event_str, "event=%x", &event_nr);
> if (rc == 1 && event_nr == data->wanted) {
> - data->result = evp->name;
> + data->result = strdup(info->name);
> return 1; /* Terminate the search. */
> }
> return 0;
> }
>
> -/* Scan the PMU table and extract the logical name of a counter from the
> - * PMU events table. Input is the counter set and counter number with in the
> - * set. Construct the event number and use this as key. If they match return
> - * the name of this counter.
> +/* Scan the PMU and extract the logical name of a counter from the event. Input
> + * is the counter set and counter number with in the set. Construct the event
> + * number and use this as key. If they match return the name of this counter.
> * If no match is found a NULL pointer is returned.
> */
> -static const char *get_counter_name(int set, int nr, const struct pmu_events_table *table)
> +static char *get_counter_name(int set, int nr, struct perf_pmu *pmu)
> {
> struct get_counter_name_data data = {
> .wanted = get_counterset_start(set) + nr,
> .result = NULL,
> };
>
> - if (!table)
> + if (!pmu)
> return NULL;
>
> - pmu_events_table__for_each_event(table, get_counter_name_callback, &data);
> + perf_pmu__for_each_event(pmu, &data, get_counter_name_callback);
> return data.result;
> }
>
> -static void s390_cpumcfdg_dump(struct perf_sample *sample)
> +static void s390_cpumcfdg_dump(struct perf_pmu *pmu, struct perf_sample *sample)
> {
> size_t i, len = sample->raw_size, offset = 0;
> unsigned char *buf = sample->raw_data;
> const char *color = PERF_COLOR_BLUE;
> struct cf_ctrset_entry *cep, ce;
> - const struct pmu_events_table *table;
> u64 *p;
>
> - table = pmu_events_table__find();
> while (offset < len) {
> cep = (struct cf_ctrset_entry *)(buf + offset);
>
> @@ -199,11 +200,12 @@ static void s390_cpumcfdg_dump(struct perf_sample *sample)
> color_fprintf(stdout, color, " [%#08zx] Counterset:%d"
> " Counters:%d\n", offset, ce.set, ce.ctr);
> for (i = 0, p = (u64 *)(cep + 1); i < ce.ctr; ++i, ++p) {
> - const char *ev_name = get_counter_name(ce.set, i, table);
> + char *ev_name = get_counter_name(ce.set, i, pmu);
>
> color_fprintf(stdout, color,
> "\tCounter:%03d %s Value:%#018lx\n", i,
> ev_name ?: "<unknown>", be64_to_cpu(*p));
> + free(ev_name);
> }
> offset += ctrset_size(&ce);
> }
> @@ -216,14 +218,14 @@ static void s390_cpumcfdg_dump(struct perf_sample *sample)
> */
> void evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event, struct perf_sample *sample)
> {
> - struct evsel *ev_bc000;
> + struct evsel *evsel;
>
> if (event->header.type != PERF_RECORD_SAMPLE)
> return;
>
> - ev_bc000 = evlist__event2evsel(evlist, event);
> - if (ev_bc000 == NULL ||
> - ev_bc000->core.attr.config != PERF_EVENT_CPUM_CF_DIAG)
> + evsel = evlist__event2evsel(evlist, event);
> + if (evsel == NULL ||
> + evsel->core.attr.config != PERF_EVENT_CPUM_CF_DIAG)
> return;
>
> /* Display raw data on screen */
> @@ -231,5 +233,5 @@ void evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event, str
> pr_err("Invalid counter set data encountered\n");
> return;
> }
> - s390_cpumcfdg_dump(sample);
> + s390_cpumcfdg_dump(evsel->pmu, sample);
> }
> --
> 2.42.0.rc1.204.g551eb34607-goog
>
--
- Arnaldo
On 8/24/23 15:59, Arnaldo Carvalho de Melo wrote: > Em Wed, Aug 23, 2023 at 09:13:18PM -0700, Ian Rogers escreveu: >> Rather than scanning all PMUs for a counter name, scan the PMU >> associated with the evsel of the sample. This is done to remove a >> dependence on pmu-events.h. > > I'm applying this one, and CCing the S/390 developers so that they can > try this and maybe provide an Acked-by/Tested-by, > > - Arnaldo Arnaldo, I have downloaded this patch set of 18 patches (using b4), but they do not apply on my git tree. Which git branch do I have to use to test this. Thanks a lot. -- Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- Vorsitzender des Aufsichtsrats: Gregor Pillen Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
On Fri, Aug 25, 2023 at 1:20 AM Thomas Richter <tmricht@linux.ibm.com> wrote: > > On 8/24/23 15:59, Arnaldo Carvalho de Melo wrote: > > Em Wed, Aug 23, 2023 at 09:13:18PM -0700, Ian Rogers escreveu: > >> Rather than scanning all PMUs for a counter name, scan the PMU > >> associated with the evsel of the sample. This is done to remove a > >> dependence on pmu-events.h. > > > > I'm applying this one, and CCing the S/390 developers so that they can > > try this and maybe provide an Acked-by/Tested-by, > > > > - Arnaldo > > > Arnaldo, > > I have downloaded this patch set of 18 patches (using b4), but they do not > apply on my git tree. > > Which git branch do I have to use to test this. Thanks a lot. Hi Thomas, the changes are in the perf-tools-next tree: https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/ Thanks, Ian > -- > Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany > -- > Vorsitzender des Aufsichtsrats: Gregor Pillen > Geschäftsführung: David Faller > Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294 >
On 8/25/23 15:14, Ian Rogers wrote: > On Fri, Aug 25, 2023 at 1:20 AM Thomas Richter <tmricht@linux.ibm.com> wrote: >> >> On 8/24/23 15:59, Arnaldo Carvalho de Melo wrote: >>> Em Wed, Aug 23, 2023 at 09:13:18PM -0700, Ian Rogers escreveu: >>>> Rather than scanning all PMUs for a counter name, scan the PMU >>>> associated with the evsel of the sample. This is done to remove a >>>> dependence on pmu-events.h. >>> >>> I'm applying this one, and CCing the S/390 developers so that they can >>> try this and maybe provide an Acked-by/Tested-by, >>> >>> - Arnaldo >> >> >> Arnaldo, >> >> I have downloaded this patch set of 18 patches (using b4), but they do not >> apply on my git tree. >> >> Which git branch do I have to use to test this. Thanks a lot. > > Hi Thomas, > > the changes are in the perf-tools-next tree: > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/ > > Thanks, > Ian > Hi Ian, thanks for the pointer. Unfurtunately this patch set fails again on s390. Here is the test output from the current 6.5.0rc7 kernel: # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' 6: Parse event definition strings : 6.1: Test event parsing : Ok 6.2: Parsing of all PMU events from sysfs : Ok 6.3: Parsing of given PMU events from sysfs : Ok 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) 6.5: Parsing of aliased events : Ok 6.6: Parsing of terms (event modifiers) : Ok 10: PMU events : 10.1: PMU event table sanity : Ok 10.2: PMU event map aliases : Ok 10.3: Parsing of PMU event table metrics : Ok 10.4: Parsing of PMU event table metrics with fake PMUs : Ok 10.5: Parsing of metric thresholds with fake PMUs : Ok 95: perf all metricgroups test : Ok 96: perf all metrics test : Ok # This looks good. However when I use the check-out from perf-tools-next, I get this output: # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' 6: Parse event definition strings : 6.1: Test event parsing : Ok 6.2: Parsing of all PMU events from sysfs : FAILED! 6.3: Parsing of given PMU events from sysfs : Ok 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) 6.5: Parsing of aliased events : FAILED! 6.6: Parsing of terms (event modifiers) : Ok 10: PMU events : 10.1: PMU event table sanity : Ok 10.2: PMU event map aliases : FAILED! 10.3: Parsing of PMU event table metrics : Ok 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! 10.5: Parsing of metric thresholds with fake PMUs : Ok 93: perf all metricgroups test : FAILED! 94: perf all metrics test : FAILED! # So some tests are failing again. I am out for the next two weeks, Sumanth Korikkar (on to list) might be able to help. Thanks a lot. -- Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- Vorsitzender des Aufsichtsrats: Gregor Pillen Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294
Em Fri, Aug 25, 2023 at 04:39:22PM +0200, Thomas Richter escreveu:
> On 8/25/23 15:14, Ian Rogers wrote:
> > On Fri, Aug 25, 2023 at 1:20 AM Thomas Richter <tmricht@linux.ibm.com> wrote:
> >> On 8/24/23 15:59, Arnaldo Carvalho de Melo wrote:
> >>> Em Wed, Aug 23, 2023 at 09:13:18PM -0700, Ian Rogers escreveu:
> >>>> Rather than scanning all PMUs for a counter name, scan the PMU
> >>>> associated with the evsel of the sample. This is done to remove a
> >>>> dependence on pmu-events.h.
> >>> I'm applying this one, and CCing the S/390 developers so that they can
> >>> try this and maybe provide an Acked-by/Tested-by,
> >> I have downloaded this patch set of 18 patches (using b4), but they do not
> >> apply on my git tree.
> >> Which git branch do I have to use to test this. Thanks a lot.
> > the changes are in the perf-tools-next tree:
> > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/
> Unfurtunately this patch set fails again on s390.
> Here is the test output from the current 6.5.0rc7 kernel:
>
> # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test'
> 6: Parse event definition strings :
> 6.1: Test event parsing : Ok
> 6.2: Parsing of all PMU events from sysfs : Ok
> 6.3: Parsing of given PMU events from sysfs : Ok
> 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs)
> 6.5: Parsing of aliased events : Ok
> 6.6: Parsing of terms (event modifiers) : Ok
> 10: PMU events :
> 10.1: PMU event table sanity : Ok
> 10.2: PMU event map aliases : Ok
> 10.3: Parsing of PMU event table metrics : Ok
> 10.4: Parsing of PMU event table metrics with fake PMUs : Ok
> 10.5: Parsing of metric thresholds with fake PMUs : Ok
> 95: perf all metricgroups test : Ok
> 96: perf all metrics test : Ok
> #
>
> This looks good.
Reproduced:
# grep -E vendor_id\|^processor -m2 /proc/cpuinfo
vendor_id : IBM/S390
processor 0: version = 00, identification = 1A33E8, machine = 2964
#
# perf test 6 10 'perf all metricgroups test' 'perf all metrics test'
6: Parse event definition strings :
6.1: Test event parsing : Ok
6.2: Parsing of all PMU events from sysfs : Ok
6.3: Parsing of given PMU events from sysfs : Ok
6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs)
6.5: Parsing of aliased events : Ok
6.6: Parsing of terms (event modifiers) : Ok
10: PMU events :
10.1: PMU event table sanity : Ok
10.2: PMU event map aliases : Ok
10.3: Parsing of PMU event table metrics : Ok
10.4: Parsing of PMU event table metrics with fake PMUs : Ok
10.5: Parsing of metric thresholds with fake PMUs : Ok
95: perf all metricgroups test : Ok
96: perf all metrics test : Ok
# perf -v
perf version 6.5.rc7.g6f0edbb833ec
#
> However when I use the check-out from perf-tools-next, I get this output:
> # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test'
> 6: Parse event definition strings :
> 6.1: Test event parsing : Ok
> 6.2: Parsing of all PMU events from sysfs : FAILED!
> 6.3: Parsing of given PMU events from sysfs : Ok
> 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs)
> 6.5: Parsing of aliased events : FAILED!
> 6.6: Parsing of terms (event modifiers) : Ok
> 10: PMU events :
> 10.1: PMU event table sanity : Ok
> 10.2: PMU event map aliases : FAILED!
> 10.3: Parsing of PMU event table metrics : Ok
> 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED!
> 10.5: Parsing of metric thresholds with fake PMUs : Ok
> 93: perf all metricgroups test : FAILED!
> 94: perf all metrics test : FAILED!
> #
>
> So some tests are failing again.
>
> I am out for the next two weeks, Sumanth Korikkar (on to list) might be able to help.
> Thanks a lot.
[root@kernelqe3 linux]# git checkout perf-tools-next
git Switched to branch 'perf-tools-next'
Your branch is up to date with 'perf-tools-next/perf-tools-next'.
[root@kernelqe3 linux]# git log --oneline -5
eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc
f208b2c6f984 (perf-tools-next/tmp.perf-tools-next) perf scripts python gecko: Launch the profiler UI on the default browser with the appropriate URL
43803cb16f99 perf scripts python: Add support for input args in gecko script
f85d120c46e7 perf jevents: Sort strings in the big C string to reduce faults
8d4b6d37ea78 perf pmu: Lazily load sysfs aliases
[root@kernelqe3 linux]# make BUILD_BPF_SKEL=1 -C tools/perf O=/tmp/build/perf install-bin
[root@kernelqe3 linux]# perf -v
perf version 6.5.rc5.geeb6b12992c4
[root@kernelqe3 linux]# git log --oneline -1
eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc
[root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test'
6: Parse event definition strings :
6.1: Test event parsing : Ok
6.2: Parsing of all PMU events from sysfs : FAILED!
6.3: Parsing of given PMU events from sysfs : Ok
6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs)
6.5: Parsing of aliased events : FAILED!
6.6: Parsing of terms (event modifiers) : Ok
10: PMU events :
10.1: PMU event table sanity : Ok
10.2: PMU event map aliases : FAILED!
10.3: Parsing of PMU event table metrics : Ok
10.4: Parsing of PMU event table metrics with fake PMUs : FAILED!
10.5: Parsing of metric thresholds with fake PMUs : Ok
93: perf all metricgroups test : FAILED!
94: perf all metrics test : FAILED!
[root@kernelqe3 linux]#
Bisecting the first problem:
10.2: PMU event map aliases : FAILED!
make: Leaving directory '/root/git/linux/tools/perf'
6: Parse event definition strings :
6.1: Test event parsing : Ok
6.2: Parsing of all PMU events from sysfs : Ok
6.3: Parsing of given PMU events from sysfs : Ok
6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs)
6.5: Parsing of aliased events : Ok
6.6: Parsing of terms (event modifiers) : Ok
10: PMU events :
10.1: PMU event table sanity : Ok
10.2: PMU event map aliases : FAILED!
10.3: Parsing of PMU event table metrics : Ok
10.4: Parsing of PMU event table metrics with fake PMUs : Ok
10.5: Parsing of metric thresholds with fake PMUs : Ok
93: perf all metricgroups test : Ok
94: perf all metrics test : Ok
[root@kernelqe3 linux]# git bisect bad
2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 is the first bad commit
commit 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28
Author: Ian Rogers <irogers@google.com>
Date: Wed Aug 23 21:13:16 2023 -0700
perf jevents: Group events by PMU
Prior to this change a cpuid would map to a list of events where the PMU
would be encoded alongside the event information. This change breaks
apart each group of events so that there is a group per PMU. A new table
is added with the PMU's name and the list of events, the original table
now holding an array of these per PMU tables.
These changes are to make it easier to get per PMU information about
events, rather than the current approach of scanning all events. The
perf binary size with BPF skeletons on x86 is reduced by about 1%. The
unidentified PMU is now always expanded to "cpu".
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Gaosheng Cui <cuigaosheng1@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20230824041330.266337-5-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/pmu-events/jevents.py | 181 +++++++++++++++++++++++++++++----------
tools/perf/tests/pmu-events.c | 30 ++++---
2 files changed, 154 insertions(+), 57 deletions(-)
[root@kernelqe3 linux]#
On Fri, Aug 25, 2023 at 1:56 PM Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > Em Fri, Aug 25, 2023 at 04:39:22PM +0200, Thomas Richter escreveu: > > On 8/25/23 15:14, Ian Rogers wrote: > > > On Fri, Aug 25, 2023 at 1:20 AM Thomas Richter <tmricht@linux.ibm.com> wrote: > > > >> On 8/24/23 15:59, Arnaldo Carvalho de Melo wrote: > > >>> Em Wed, Aug 23, 2023 at 09:13:18PM -0700, Ian Rogers escreveu: > > >>>> Rather than scanning all PMUs for a counter name, scan the PMU > > >>>> associated with the evsel of the sample. This is done to remove a > > >>>> dependence on pmu-events.h. > > > >>> I'm applying this one, and CCing the S/390 developers so that they can > > >>> try this and maybe provide an Acked-by/Tested-by, > > > >> I have downloaded this patch set of 18 patches (using b4), but they do not > > >> apply on my git tree. > > > >> Which git branch do I have to use to test this. Thanks a lot. > > > > the changes are in the perf-tools-next tree: > > > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/ > > > Unfurtunately this patch set fails again on s390. > > Here is the test output from the current 6.5.0rc7 kernel: > > > > # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > 6: Parse event definition strings : > > 6.1: Test event parsing : Ok > > 6.2: Parsing of all PMU events from sysfs : Ok > > 6.3: Parsing of given PMU events from sysfs : Ok > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > 6.5: Parsing of aliased events : Ok > > 6.6: Parsing of terms (event modifiers) : Ok > > 10: PMU events : > > 10.1: PMU event table sanity : Ok > > 10.2: PMU event map aliases : Ok > > 10.3: Parsing of PMU event table metrics : Ok > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > 95: perf all metricgroups test : Ok > > 96: perf all metrics test : Ok > > # > > > > This looks good. > > Reproduced: > > # grep -E vendor_id\|^processor -m2 /proc/cpuinfo > vendor_id : IBM/S390 > processor 0: version = 00, identification = 1A33E8, machine = 2964 > # > # perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > 6: Parse event definition strings : > 6.1: Test event parsing : Ok > 6.2: Parsing of all PMU events from sysfs : Ok > 6.3: Parsing of given PMU events from sysfs : Ok > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > 6.5: Parsing of aliased events : Ok > 6.6: Parsing of terms (event modifiers) : Ok > 10: PMU events : > 10.1: PMU event table sanity : Ok > 10.2: PMU event map aliases : Ok > 10.3: Parsing of PMU event table metrics : Ok > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > 10.5: Parsing of metric thresholds with fake PMUs : Ok > 95: perf all metricgroups test : Ok > 96: perf all metrics test : Ok > # perf -v > perf version 6.5.rc7.g6f0edbb833ec > # > > > However when I use the check-out from perf-tools-next, I get this output: > > # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > 6: Parse event definition strings : > > 6.1: Test event parsing : Ok > > 6.2: Parsing of all PMU events from sysfs : FAILED! > > 6.3: Parsing of given PMU events from sysfs : Ok > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > 6.5: Parsing of aliased events : FAILED! > > 6.6: Parsing of terms (event modifiers) : Ok > > 10: PMU events : > > 10.1: PMU event table sanity : Ok > > 10.2: PMU event map aliases : FAILED! > > 10.3: Parsing of PMU event table metrics : Ok > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > 93: perf all metricgroups test : FAILED! > > 94: perf all metrics test : FAILED! > > # > > > > So some tests are failing again. > > > > I am out for the next two weeks, Sumanth Korikkar (on to list) might be able to help. > > Thanks a lot. > > [root@kernelqe3 linux]# git checkout perf-tools-next > git Switched to branch 'perf-tools-next' > Your branch is up to date with 'perf-tools-next/perf-tools-next'. > [root@kernelqe3 linux]# git log --oneline -5 > eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc > f208b2c6f984 (perf-tools-next/tmp.perf-tools-next) perf scripts python gecko: Launch the profiler UI on the default browser with the appropriate URL > 43803cb16f99 perf scripts python: Add support for input args in gecko script > f85d120c46e7 perf jevents: Sort strings in the big C string to reduce faults > 8d4b6d37ea78 perf pmu: Lazily load sysfs aliases > [root@kernelqe3 linux]# make BUILD_BPF_SKEL=1 -C tools/perf O=/tmp/build/perf install-bin > > [root@kernelqe3 linux]# perf -v > perf version 6.5.rc5.geeb6b12992c4 > [root@kernelqe3 linux]# git log --oneline -1 > eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc > [root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > 6: Parse event definition strings : > 6.1: Test event parsing : Ok > 6.2: Parsing of all PMU events from sysfs : FAILED! > 6.3: Parsing of given PMU events from sysfs : Ok > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > 6.5: Parsing of aliased events : FAILED! > 6.6: Parsing of terms (event modifiers) : Ok > 10: PMU events : > 10.1: PMU event table sanity : Ok > 10.2: PMU event map aliases : FAILED! > 10.3: Parsing of PMU event table metrics : Ok > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > 10.5: Parsing of metric thresholds with fake PMUs : Ok > 93: perf all metricgroups test : FAILED! > 94: perf all metrics test : FAILED! > [root@kernelqe3 linux]# > > Bisecting the first problem: > > 10.2: PMU event map aliases : FAILED! > > make: Leaving directory '/root/git/linux/tools/perf' > 6: Parse event definition strings : > 6.1: Test event parsing : Ok > 6.2: Parsing of all PMU events from sysfs : Ok > 6.3: Parsing of given PMU events from sysfs : Ok > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > 6.5: Parsing of aliased events : Ok > 6.6: Parsing of terms (event modifiers) : Ok > 10: PMU events : > 10.1: PMU event table sanity : Ok > 10.2: PMU event map aliases : FAILED! > 10.3: Parsing of PMU event table metrics : Ok > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > 10.5: Parsing of metric thresholds with fake PMUs : Ok > 93: perf all metricgroups test : Ok > 94: perf all metrics test : Ok > [root@kernelqe3 linux]# git bisect bad > 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 is the first bad commit > commit 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 > Author: Ian Rogers <irogers@google.com> > Date: Wed Aug 23 21:13:16 2023 -0700 > > perf jevents: Group events by PMU > > Prior to this change a cpuid would map to a list of events where the PMU > would be encoded alongside the event information. This change breaks > apart each group of events so that there is a group per PMU. A new table > is added with the PMU's name and the list of events, the original table > now holding an array of these per PMU tables. > > These changes are to make it easier to get per PMU information about > events, rather than the current approach of scanning all events. The > perf binary size with BPF skeletons on x86 is reduced by about 1%. The > unidentified PMU is now always expanded to "cpu". > > Signed-off-by: Ian Rogers <irogers@google.com> > Cc: Adrian Hunter <adrian.hunter@intel.com> > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> > Cc: Gaosheng Cui <cuigaosheng1@huawei.com> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: James Clark <james.clark@arm.com> > Cc: Jing Zhang <renyu.zj@linux.alibaba.com> > Cc: Jiri Olsa <jolsa@kernel.org> > Cc: John Garry <john.g.garry@oracle.com> > Cc: Kajol Jain <kjain@linux.ibm.com> > Cc: Kan Liang <kan.liang@linux.intel.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Namhyung Kim <namhyung@kernel.org> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Ravi Bangoria <ravi.bangoria@amd.com> > Cc: Rob Herring <robh@kernel.org> > Link: https://lore.kernel.org/r/20230824041330.266337-5-irogers@google.com > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > > tools/perf/pmu-events/jevents.py | 181 +++++++++++++++++++++++++++++---------- > tools/perf/tests/pmu-events.c | 30 ++++--- > 2 files changed, 154 insertions(+), 57 deletions(-) > [root@kernelqe3 linux]# > This change defaulted events without a specified PMU to being for the PMU 'cpu', so that events in pmu-events.c were associated with a PMU and we could find per-PMU information easily. The test events have no PMU and so this has broken s390 where the the PMU should be "cpum_cf". It has probably also broken x86 hybrid and arm where their default PMU isn't cpu. I'll work on a fix, but the problem will be limited to the test. Thanks, Ian
Em Fri, Aug 25, 2023 at 03:56:54PM -0700, Ian Rogers escreveu: > On Fri, Aug 25, 2023 at 1:56 PM Arnaldo Carvalho de Melo > <acme@kernel.org> wrote: > > > > Em Fri, Aug 25, 2023 at 04:39:22PM +0200, Thomas Richter escreveu: > > > On 8/25/23 15:14, Ian Rogers wrote: > > > > On Fri, Aug 25, 2023 at 1:20 AM Thomas Richter <tmricht@linux.ibm.com> wrote: > > > > > >> On 8/24/23 15:59, Arnaldo Carvalho de Melo wrote: > > > >>> Em Wed, Aug 23, 2023 at 09:13:18PM -0700, Ian Rogers escreveu: > > > >>>> Rather than scanning all PMUs for a counter name, scan the PMU > > > >>>> associated with the evsel of the sample. This is done to remove a > > > >>>> dependence on pmu-events.h. > > > > > >>> I'm applying this one, and CCing the S/390 developers so that they can > > > >>> try this and maybe provide an Acked-by/Tested-by, > > > > > >> I have downloaded this patch set of 18 patches (using b4), but they do not > > > >> apply on my git tree. > > > > > >> Which git branch do I have to use to test this. Thanks a lot. > > > > > > the changes are in the perf-tools-next tree: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/ > > > > > Unfurtunately this patch set fails again on s390. > > > Here is the test output from the current 6.5.0rc7 kernel: > > > > > > # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > 6: Parse event definition strings : > > > 6.1: Test event parsing : Ok > > > 6.2: Parsing of all PMU events from sysfs : Ok > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > 6.5: Parsing of aliased events : Ok > > > 6.6: Parsing of terms (event modifiers) : Ok > > > 10: PMU events : > > > 10.1: PMU event table sanity : Ok > > > 10.2: PMU event map aliases : Ok > > > 10.3: Parsing of PMU event table metrics : Ok > > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > 95: perf all metricgroups test : Ok > > > 96: perf all metrics test : Ok > > > # > > > > > > This looks good. > > > > Reproduced: > > > > # grep -E vendor_id\|^processor -m2 /proc/cpuinfo > > vendor_id : IBM/S390 > > processor 0: version = 00, identification = 1A33E8, machine = 2964 > > # > > # perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > 6: Parse event definition strings : > > 6.1: Test event parsing : Ok > > 6.2: Parsing of all PMU events from sysfs : Ok > > 6.3: Parsing of given PMU events from sysfs : Ok > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > 6.5: Parsing of aliased events : Ok > > 6.6: Parsing of terms (event modifiers) : Ok > > 10: PMU events : > > 10.1: PMU event table sanity : Ok > > 10.2: PMU event map aliases : Ok > > 10.3: Parsing of PMU event table metrics : Ok > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > 95: perf all metricgroups test : Ok > > 96: perf all metrics test : Ok > > # perf -v > > perf version 6.5.rc7.g6f0edbb833ec > > # > > > > > However when I use the check-out from perf-tools-next, I get this output: > > > # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > 6: Parse event definition strings : > > > 6.1: Test event parsing : Ok > > > 6.2: Parsing of all PMU events from sysfs : FAILED! > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > 6.5: Parsing of aliased events : FAILED! > > > 6.6: Parsing of terms (event modifiers) : Ok > > > 10: PMU events : > > > 10.1: PMU event table sanity : Ok > > > 10.2: PMU event map aliases : FAILED! > > > 10.3: Parsing of PMU event table metrics : Ok > > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > 93: perf all metricgroups test : FAILED! > > > 94: perf all metrics test : FAILED! > > > # > > > > > > So some tests are failing again. > > > > > > I am out for the next two weeks, Sumanth Korikkar (on to list) might be able to help. > > > Thanks a lot. > > > > [root@kernelqe3 linux]# git checkout perf-tools-next > > git Switched to branch 'perf-tools-next' > > Your branch is up to date with 'perf-tools-next/perf-tools-next'. > > [root@kernelqe3 linux]# git log --oneline -5 > > eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc > > f208b2c6f984 (perf-tools-next/tmp.perf-tools-next) perf scripts python gecko: Launch the profiler UI on the default browser with the appropriate URL > > 43803cb16f99 perf scripts python: Add support for input args in gecko script > > f85d120c46e7 perf jevents: Sort strings in the big C string to reduce faults > > 8d4b6d37ea78 perf pmu: Lazily load sysfs aliases > > [root@kernelqe3 linux]# make BUILD_BPF_SKEL=1 -C tools/perf O=/tmp/build/perf install-bin > > > > [root@kernelqe3 linux]# perf -v > > perf version 6.5.rc5.geeb6b12992c4 > > [root@kernelqe3 linux]# git log --oneline -1 > > eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc > > [root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > 6: Parse event definition strings : > > 6.1: Test event parsing : Ok > > 6.2: Parsing of all PMU events from sysfs : FAILED! > > 6.3: Parsing of given PMU events from sysfs : Ok > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > 6.5: Parsing of aliased events : FAILED! > > 6.6: Parsing of terms (event modifiers) : Ok > > 10: PMU events : > > 10.1: PMU event table sanity : Ok > > 10.2: PMU event map aliases : FAILED! > > 10.3: Parsing of PMU event table metrics : Ok > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > 93: perf all metricgroups test : FAILED! > > 94: perf all metrics test : FAILED! > > [root@kernelqe3 linux]# > > > > Bisecting the first problem: > > > > 10.2: PMU event map aliases : FAILED! > > > > make: Leaving directory '/root/git/linux/tools/perf' > > 6: Parse event definition strings : > > 6.1: Test event parsing : Ok > > 6.2: Parsing of all PMU events from sysfs : Ok > > 6.3: Parsing of given PMU events from sysfs : Ok > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > 6.5: Parsing of aliased events : Ok > > 6.6: Parsing of terms (event modifiers) : Ok > > 10: PMU events : > > 10.1: PMU event table sanity : Ok > > 10.2: PMU event map aliases : FAILED! > > 10.3: Parsing of PMU event table metrics : Ok > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > 93: perf all metricgroups test : Ok > > 94: perf all metrics test : Ok > > [root@kernelqe3 linux]# git bisect bad > > 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 is the first bad commit > > commit 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 > > Author: Ian Rogers <irogers@google.com> > > Date: Wed Aug 23 21:13:16 2023 -0700 > > > > perf jevents: Group events by PMU > > > > Prior to this change a cpuid would map to a list of events where the PMU > > would be encoded alongside the event information. This change breaks > > apart each group of events so that there is a group per PMU. A new table > > is added with the PMU's name and the list of events, the original table > > now holding an array of these per PMU tables. > > > > These changes are to make it easier to get per PMU information about > > events, rather than the current approach of scanning all events. The > > perf binary size with BPF skeletons on x86 is reduced by about 1%. The > > unidentified PMU is now always expanded to "cpu". > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > Cc: Adrian Hunter <adrian.hunter@intel.com> > > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> > > Cc: Gaosheng Cui <cuigaosheng1@huawei.com> > > Cc: Ingo Molnar <mingo@redhat.com> > > Cc: James Clark <james.clark@arm.com> > > Cc: Jing Zhang <renyu.zj@linux.alibaba.com> > > Cc: Jiri Olsa <jolsa@kernel.org> > > Cc: John Garry <john.g.garry@oracle.com> > > Cc: Kajol Jain <kjain@linux.ibm.com> > > Cc: Kan Liang <kan.liang@linux.intel.com> > > Cc: Mark Rutland <mark.rutland@arm.com> > > Cc: Namhyung Kim <namhyung@kernel.org> > > Cc: Peter Zijlstra <peterz@infradead.org> > > Cc: Ravi Bangoria <ravi.bangoria@amd.com> > > Cc: Rob Herring <robh@kernel.org> > > Link: https://lore.kernel.org/r/20230824041330.266337-5-irogers@google.com > > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > > > > tools/perf/pmu-events/jevents.py | 181 +++++++++++++++++++++++++++++---------- > > tools/perf/tests/pmu-events.c | 30 ++++--- > > 2 files changed, 154 insertions(+), 57 deletions(-) > > [root@kernelqe3 linux]# > > > > This change defaulted events without a specified PMU to being for the > PMU 'cpu', so that events in pmu-events.c were associated with a PMU > and we could find per-PMU information easily. The test events have no > PMU and so this has broken s390 where the the PMU should be "cpum_cf". > It has probably also broken x86 hybrid and arm where their default PMU > isn't cpu. I'll work on a fix, but the problem will be limited to the > test. So, with your "default_core" branche we go to: [root@kernelqe3 linux]# perf test 10 10: PMU events : 10.1: PMU event table sanity : Ok 10.2: PMU event map aliases : Ok 10.3: Parsing of PMU event table metrics : Ok 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! 10.5: Parsing of metric thresholds with fake PMUs : Ok [root@kernelqe3 linux]# perf --version perf version 6.5.rc5.g3d63ae82aa12 [root@kernelqe3 linux]# The other tests: [root@kernelqe3 linux]# perf --version perf version 6.5.rc5.g3d63ae82aa12 [root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test' 6: Parse event definition strings : 6.1: Test event parsing : Ok 6.2: Parsing of all PMU events from sysfs : FAILED! 6.3: Parsing of given PMU events from sysfs : Ok 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) 6.5: Parsing of aliased events : FAILED! 6.6: Parsing of terms (event modifiers) : Ok 10: PMU events : 10.1: PMU event table sanity : Ok 10.2: PMU event map aliases : Ok 10.3: Parsing of PMU event table metrics : Ok 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! 10.5: Parsing of metric thresholds with fake PMUs : Ok 93: perf all metricgroups test : FAILED! 94: perf all metrics test : FAILED! [root@kernelqe3 linux]# Trying to bisect it now. - Arnaldo
Em Mon, Aug 28, 2023 at 02:44:53PM -0300, Arnaldo Carvalho de Melo escreveu:
> Em Fri, Aug 25, 2023 at 03:56:54PM -0700, Ian Rogers escreveu:
> > On Fri, Aug 25, 2023 at 1:56 PM Arnaldo Carvalho de Melo
> > <acme@kernel.org> wrote:
> > >
> > > Em Fri, Aug 25, 2023 at 04:39:22PM +0200, Thomas Richter escreveu:
> > > > On 8/25/23 15:14, Ian Rogers wrote:
> > > > > On Fri, Aug 25, 2023 at 1:20 AM Thomas Richter <tmricht@linux.ibm.com> wrote:
> > >
> > > > >> On 8/24/23 15:59, Arnaldo Carvalho de Melo wrote:
> > > > >>> Em Wed, Aug 23, 2023 at 09:13:18PM -0700, Ian Rogers escreveu:
> > > > >>>> Rather than scanning all PMUs for a counter name, scan the PMU
> > > > >>>> associated with the evsel of the sample. This is done to remove a
> > > > >>>> dependence on pmu-events.h.
> > >
> > > > >>> I'm applying this one, and CCing the S/390 developers so that they can
> > > > >>> try this and maybe provide an Acked-by/Tested-by,
> > >
> > > > >> I have downloaded this patch set of 18 patches (using b4), but they do not
> > > > >> apply on my git tree.
> > >
> > > > >> Which git branch do I have to use to test this. Thanks a lot.
> > >
> > > > > the changes are in the perf-tools-next tree:
> > > > > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/
> > >
> > > > Unfurtunately this patch set fails again on s390.
> > > > Here is the test output from the current 6.5.0rc7 kernel:
> > > >
> > > > # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test'
> > > > 6: Parse event definition strings :
> > > > 6.1: Test event parsing : Ok
> > > > 6.2: Parsing of all PMU events from sysfs : Ok
> > > > 6.3: Parsing of given PMU events from sysfs : Ok
> > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs)
> > > > 6.5: Parsing of aliased events : Ok
> > > > 6.6: Parsing of terms (event modifiers) : Ok
> > > > 10: PMU events :
> > > > 10.1: PMU event table sanity : Ok
> > > > 10.2: PMU event map aliases : Ok
> > > > 10.3: Parsing of PMU event table metrics : Ok
> > > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok
> > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok
> > > > 95: perf all metricgroups test : Ok
> > > > 96: perf all metrics test : Ok
> > > > #
> > > >
> > > > This looks good.
> > >
> > > Reproduced:
> > >
> > > # grep -E vendor_id\|^processor -m2 /proc/cpuinfo
> > > vendor_id : IBM/S390
> > > processor 0: version = 00, identification = 1A33E8, machine = 2964
> > > #
> > > # perf test 6 10 'perf all metricgroups test' 'perf all metrics test'
> > > 6: Parse event definition strings :
> > > 6.1: Test event parsing : Ok
> > > 6.2: Parsing of all PMU events from sysfs : Ok
> > > 6.3: Parsing of given PMU events from sysfs : Ok
> > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs)
> > > 6.5: Parsing of aliased events : Ok
> > > 6.6: Parsing of terms (event modifiers) : Ok
> > > 10: PMU events :
> > > 10.1: PMU event table sanity : Ok
> > > 10.2: PMU event map aliases : Ok
> > > 10.3: Parsing of PMU event table metrics : Ok
> > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok
> > > 10.5: Parsing of metric thresholds with fake PMUs : Ok
> > > 95: perf all metricgroups test : Ok
> > > 96: perf all metrics test : Ok
> > > # perf -v
> > > perf version 6.5.rc7.g6f0edbb833ec
> > > #
> > >
> > > > However when I use the check-out from perf-tools-next, I get this output:
> > > > # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test'
> > > > 6: Parse event definition strings :
> > > > 6.1: Test event parsing : Ok
> > > > 6.2: Parsing of all PMU events from sysfs : FAILED!
> > > > 6.3: Parsing of given PMU events from sysfs : Ok
> > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs)
> > > > 6.5: Parsing of aliased events : FAILED!
> > > > 6.6: Parsing of terms (event modifiers) : Ok
> > > > 10: PMU events :
> > > > 10.1: PMU event table sanity : Ok
> > > > 10.2: PMU event map aliases : FAILED!
> > > > 10.3: Parsing of PMU event table metrics : Ok
> > > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED!
> > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok
> > > > 93: perf all metricgroups test : FAILED!
> > > > 94: perf all metrics test : FAILED!
> > > > #
> > > >
> > > > So some tests are failing again.
> > > >
> > > > I am out for the next two weeks, Sumanth Korikkar (on to list) might be able to help.
> > > > Thanks a lot.
> > >
> > > [root@kernelqe3 linux]# git checkout perf-tools-next
> > > git Switched to branch 'perf-tools-next'
> > > Your branch is up to date with 'perf-tools-next/perf-tools-next'.
> > > [root@kernelqe3 linux]# git log --oneline -5
> > > eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc
> > > f208b2c6f984 (perf-tools-next/tmp.perf-tools-next) perf scripts python gecko: Launch the profiler UI on the default browser with the appropriate URL
> > > 43803cb16f99 perf scripts python: Add support for input args in gecko script
> > > f85d120c46e7 perf jevents: Sort strings in the big C string to reduce faults
> > > 8d4b6d37ea78 perf pmu: Lazily load sysfs aliases
> > > [root@kernelqe3 linux]# make BUILD_BPF_SKEL=1 -C tools/perf O=/tmp/build/perf install-bin
> > >
> > > [root@kernelqe3 linux]# perf -v
> > > perf version 6.5.rc5.geeb6b12992c4
> > > [root@kernelqe3 linux]# git log --oneline -1
> > > eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc
> > > [root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test'
> > > 6: Parse event definition strings :
> > > 6.1: Test event parsing : Ok
> > > 6.2: Parsing of all PMU events from sysfs : FAILED!
> > > 6.3: Parsing of given PMU events from sysfs : Ok
> > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs)
> > > 6.5: Parsing of aliased events : FAILED!
> > > 6.6: Parsing of terms (event modifiers) : Ok
> > > 10: PMU events :
> > > 10.1: PMU event table sanity : Ok
> > > 10.2: PMU event map aliases : FAILED!
> > > 10.3: Parsing of PMU event table metrics : Ok
> > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED!
> > > 10.5: Parsing of metric thresholds with fake PMUs : Ok
> > > 93: perf all metricgroups test : FAILED!
> > > 94: perf all metrics test : FAILED!
> > > [root@kernelqe3 linux]#
> > >
> > > Bisecting the first problem:
> > >
> > > 10.2: PMU event map aliases : FAILED!
> > >
> > > make: Leaving directory '/root/git/linux/tools/perf'
> > > 6: Parse event definition strings :
> > > 6.1: Test event parsing : Ok
> > > 6.2: Parsing of all PMU events from sysfs : Ok
> > > 6.3: Parsing of given PMU events from sysfs : Ok
> > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs)
> > > 6.5: Parsing of aliased events : Ok
> > > 6.6: Parsing of terms (event modifiers) : Ok
> > > 10: PMU events :
> > > 10.1: PMU event table sanity : Ok
> > > 10.2: PMU event map aliases : FAILED!
> > > 10.3: Parsing of PMU event table metrics : Ok
> > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok
> > > 10.5: Parsing of metric thresholds with fake PMUs : Ok
> > > 93: perf all metricgroups test : Ok
> > > 94: perf all metrics test : Ok
> > > [root@kernelqe3 linux]# git bisect bad
> > > 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 is the first bad commit
> > > commit 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28
> > > Author: Ian Rogers <irogers@google.com>
> > > Date: Wed Aug 23 21:13:16 2023 -0700
> > >
> > > perf jevents: Group events by PMU
> > >
> > > Prior to this change a cpuid would map to a list of events where the PMU
> > > would be encoded alongside the event information. This change breaks
> > > apart each group of events so that there is a group per PMU. A new table
> > > is added with the PMU's name and the list of events, the original table
> > > now holding an array of these per PMU tables.
> > >
> > > These changes are to make it easier to get per PMU information about
> > > events, rather than the current approach of scanning all events. The
> > > perf binary size with BPF skeletons on x86 is reduced by about 1%. The
> > > unidentified PMU is now always expanded to "cpu".
> > >
> > > Signed-off-by: Ian Rogers <irogers@google.com>
> > > Cc: Adrian Hunter <adrian.hunter@intel.com>
> > > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
> > > Cc: Gaosheng Cui <cuigaosheng1@huawei.com>
> > > Cc: Ingo Molnar <mingo@redhat.com>
> > > Cc: James Clark <james.clark@arm.com>
> > > Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
> > > Cc: Jiri Olsa <jolsa@kernel.org>
> > > Cc: John Garry <john.g.garry@oracle.com>
> > > Cc: Kajol Jain <kjain@linux.ibm.com>
> > > Cc: Kan Liang <kan.liang@linux.intel.com>
> > > Cc: Mark Rutland <mark.rutland@arm.com>
> > > Cc: Namhyung Kim <namhyung@kernel.org>
> > > Cc: Peter Zijlstra <peterz@infradead.org>
> > > Cc: Ravi Bangoria <ravi.bangoria@amd.com>
> > > Cc: Rob Herring <robh@kernel.org>
> > > Link: https://lore.kernel.org/r/20230824041330.266337-5-irogers@google.com
> > > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
> > >
> > > tools/perf/pmu-events/jevents.py | 181 +++++++++++++++++++++++++++++----------
> > > tools/perf/tests/pmu-events.c | 30 ++++---
> > > 2 files changed, 154 insertions(+), 57 deletions(-)
> > > [root@kernelqe3 linux]#
> > >
> >
> > This change defaulted events without a specified PMU to being for the
> > PMU 'cpu', so that events in pmu-events.c were associated with a PMU
> > and we could find per-PMU information easily. The test events have no
> > PMU and so this has broken s390 where the the PMU should be "cpum_cf".
> > It has probably also broken x86 hybrid and arm where their default PMU
> > isn't cpu. I'll work on a fix, but the problem will be limited to the
> > test.
>
> So, with your "default_core" branche we go to:
>
> [root@kernelqe3 linux]# perf test 10
> 10: PMU events :
> 10.1: PMU event table sanity : Ok
> 10.2: PMU event map aliases : Ok
> 10.3: Parsing of PMU event table metrics : Ok
> 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED!
> 10.5: Parsing of metric thresholds with fake PMUs : Ok
> [root@kernelqe3 linux]# perf --version
> perf version 6.5.rc5.g3d63ae82aa12
> [root@kernelqe3 linux]#
>
> The other tests:
>
> [root@kernelqe3 linux]# perf --version
> perf version 6.5.rc5.g3d63ae82aa12
> [root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test'
> 6: Parse event definition strings :
> 6.1: Test event parsing : Ok
> 6.2: Parsing of all PMU events from sysfs : FAILED!
> 6.3: Parsing of given PMU events from sysfs : Ok
> 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs)
> 6.5: Parsing of aliased events : FAILED!
> 6.6: Parsing of terms (event modifiers) : Ok
> 10: PMU events :
> 10.1: PMU event table sanity : Ok
> 10.2: PMU event map aliases : Ok
> 10.3: Parsing of PMU event table metrics : Ok
> 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED!
> 10.5: Parsing of metric thresholds with fake PMUs : Ok
> 93: perf all metricgroups test : FAILED!
> 94: perf all metrics test : FAILED!
> [root@kernelqe3 linux]#
>
> Trying to bisect it now.
make: Leaving directory '/root/git/linux/tools/perf'
[root@kernelqe3 linux]# perf test 6
6: Parse event definition strings :
6.1: Test event parsing : Ok
6.2: Parsing of all PMU events from sysfs : FAILED!
6.3: Parsing of given PMU events from sysfs : Ok
6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs)
6.5: Parsing of aliased events : FAILED!
6.6: Parsing of terms (event modifiers) : Ok
[root@kernelqe3 linux]# git bisect bad
8d4b6d37ea7862d230ad2e1bd4c7d2ff5e9acd53 is the first bad commit
commit 8d4b6d37ea7862d230ad2e1bd4c7d2ff5e9acd53
Author: Ian Rogers <irogers@google.com>
Date: Wed Aug 23 21:13:28 2023 -0700
perf pmu: Lazily load sysfs aliases
Don't load sysfs aliases for a PMU when the PMU is first created, defer
until an alias needs to be found. For the pmu-scan benchmark, average
core PMU scanning is reduced by 30.8%, and average PMU scanning by
12.6%.
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Gaosheng Cui <cuigaosheng1@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20230824041330.266337-17-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/tests/pmu-events.c | 2 ++
tools/perf/util/pmu.c | 81 ++++++++++++++++++++++---------------------
tools/perf/util/pmu.h | 2 ++
3 files changed, 46 insertions(+), 39 deletions(-)
[root@kernelqe3 linux]#
It is segfaulting:
6.2: Parsing of all PMU events from sysfs :
--- start ---
test child forked, pid 1202947
Using CPUID IBM,2964,400,N96,1.4,002f
perf: Segmentation fault
Obtained 16 stack frames.
perf(dump_stack+0x36) [0x1156dbe]
perf(sighandler_dump_stack+0x3a) [0x1156e8a]
[0x3fffd4790b6]
/lib64/libc.so.6(__strcasecmp+0x42) [0x3ffa889c51a]
perf() [0x11792ac]
perf(pmu_events_table__find_event+0x27c) [0x12432fc]
perf() [0x11777cc]
perf() [0x1179842]
perf(perf_pmu__check_alias+0x4f0) [0x1179e98]
perf(parse_events_add_pmu+0x72c) [0x1128e84]
perf(parse_events_parse+0x4d4) [0x11754d4]
perf(__parse_events+0xda) [0x112644a]
perf() [0x10cecb2]
perf() [0x10d3264]
perf() [0x10cb250]
perf(cmd_test+0x109e) [0x10cc756]
test child interrupted
---- end ----
Parse event definition strings subtest 2: FAILED!
Starting program: /root/bin/perf test -F 6
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib64/libthread_db.so.1".
6: Parse event definition strings :
6.1: Test event parsing : Ok
6.2: Parsing of all PMU events from sysfs :
Program received signal SIGSEGV, Segmentation fault.
0x000003fffcf1c51a in strcasecmp () from /lib64/libc.so.6
#0 0x000003fffcf1c51a in strcasecmp () from /lib64/libc.so.6
#1 0x000000000123e518 in assign_str (name=0x1487cc3 "l1i_ondrawer_mem_sourced_writes", field=0x141eeba "value", old_str=0x18c12e0, new_str=0x1487d1f "event=0xb1") at util/pmu.c:449
#2 0x000000000123e82c in update_alias (pe=0x3ffffff8ac0, table=0x1555cb0 <pmu_events_map+160>, vdata=0x3ffffff8c40) at util/pmu.c:490
#3 0x000000000137b9dc in pmu_events_table.find_event ()
#4 0x000000000123ed4e in perf_pmu__new_alias (pmu=0x15ce490, name=0x23c2593 "L1I_ONDRAWER_MEM_SOURCED_WRITES", desc=0x0, val=0x0, val_fd=0x16058a0, pe=0x0) at util/pmu.c:569
#5 0x000000000123f370 in pmu_aliases_parse (pmu=0x15ce490) at util/pmu.c:673
#6 0x000000000123e3a2 in perf_pmu__find_alias (pmu=0x15ce490, name=0x238eb10 "L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV", load=true) at util/pmu.c:432
#7 0x0000000001241bb2 in pmu_find_alias (pmu=0x15ce490, term=0x18409d0) at util/pmu.c:1439
#8 0x0000000001241f82 in perf_pmu__check_alias (pmu=0x15ce490, head_terms=0x21b14d0, info=0x3ffffffa238, err=0x3ffffffc4c8) at util/pmu.c:1519
#9 0x00000000011bbbd4 in parse_events_add_pmu (parse_state=0x3ffffffc2f0, list=0x21afec0, name=0x21c6430 "cpum_cf", head_config=0x21b14d0, auto_merge_stats=false, loc_=0x3ffffffb4d8) at util/parse-events.c:1351
#10 0x000000000123aa4c in parse_events_parse (_parse_state=0x3ffffffc2f0, scanner=0x15b9310) at util/parse-events.y:299
#11 0x00000000011bd190 in parse_events__scanner (str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", input=0x0, parse_state=0x3ffffffc2f0) at util/parse-events.c:1738
#12 0x00000000011bde00 in __parse_events (evlist=0x15b7030, str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", pmu_filter=0x0, err=0x3ffffffc4c8, fake_pmu=0x0, warn_if_reordered=true) at util/parse-events.c:2010
#13 0x0000000001121884 in parse_events (evlist=0x15b7030, str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", err=0x3ffffffc4c8) at /root/git/linux/tools/perf/util/parse-events.h:40
#14 0x0000000001134084 in test_event (e=0x3ffffffc5e0) at tests/parse-events.c:2393
#15 0x00000000011349ec in test__pmu_events (test=0x156b860 <suite.parse_events>, subtest=1) at tests/parse-events.c:2551
#16 0x000000000111f884 in run_test (test=0x156b860 <suite.parse_events>, subtest=1) at tests/builtin-test.c:242
#17 0x000000000111fa1a in test_and_print (t=0x156b860 <suite.parse_events>, subtest=1) at tests/builtin-test.c:271
#18 0x00000000011203fa in __cmd_test (argc=1, argv=0x3ffffffe5d0, skiplist=0x0) at tests/builtin-test.c:442
#19 0x0000000001120cca in cmd_test (argc=1, argv=0x3ffffffe5d0) at tests/builtin-test.c:564
#20 0x00000000011713a4 in run_builtin (p=0x1561190 <commands+600>, argc=3, argv=0x3ffffffe5d0) at perf.c:322
#21 0x0000000001171712 in handle_internal_command (argc=3, argv=0x3ffffffe5d0) at perf.c:375
#22 0x0000000001171920 in run_argv (argcp=0x3ffffffe304, argv=0x3ffffffe2f8) at perf.c:419
#23 0x0000000001171ce8 in main (argc=3, argv=0x3ffffffe5d0) at perf.c:535
(gdb)
(gdb) fr 1
#1 0x000000000123e518 in assign_str (name=0x1487cc3 "l1i_ondrawer_mem_sourced_writes", field=0x141eeba "value", old_str=0x18c12e0, new_str=0x1487d1f "event=0xb1") at util/pmu.c:449
449 if (!new_str || !strcasecmp(*old_str, new_str))
(gdb) p new_str
$1 = 0x1487d1f "event=0xb1"
(gdb) p *old_str
$2 = 0x1 <error: Cannot access memory at address 0x1>
(gdb) p old_str
$3 = (char **) 0x18c12e0
(gdb)
On Mon, Aug 28, 2023 at 10:53 AM Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > Em Mon, Aug 28, 2023 at 02:44:53PM -0300, Arnaldo Carvalho de Melo escreveu: > > Em Fri, Aug 25, 2023 at 03:56:54PM -0700, Ian Rogers escreveu: > > > On Fri, Aug 25, 2023 at 1:56 PM Arnaldo Carvalho de Melo > > > <acme@kernel.org> wrote: > > > > > > > > Em Fri, Aug 25, 2023 at 04:39:22PM +0200, Thomas Richter escreveu: > > > > > On 8/25/23 15:14, Ian Rogers wrote: > > > > > > On Fri, Aug 25, 2023 at 1:20 AM Thomas Richter <tmricht@linux.ibm.com> wrote: > > > > > > > > > >> On 8/24/23 15:59, Arnaldo Carvalho de Melo wrote: > > > > > >>> Em Wed, Aug 23, 2023 at 09:13:18PM -0700, Ian Rogers escreveu: > > > > > >>>> Rather than scanning all PMUs for a counter name, scan the PMU > > > > > >>>> associated with the evsel of the sample. This is done to remove a > > > > > >>>> dependence on pmu-events.h. > > > > > > > > > >>> I'm applying this one, and CCing the S/390 developers so that they can > > > > > >>> try this and maybe provide an Acked-by/Tested-by, > > > > > > > > > >> I have downloaded this patch set of 18 patches (using b4), but they do not > > > > > >> apply on my git tree. > > > > > > > > > >> Which git branch do I have to use to test this. Thanks a lot. > > > > > > > > > > the changes are in the perf-tools-next tree: > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/ > > > > > > > > > Unfurtunately this patch set fails again on s390. > > > > > Here is the test output from the current 6.5.0rc7 kernel: > > > > > > > > > > # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > > > 6: Parse event definition strings : > > > > > 6.1: Test event parsing : Ok > > > > > 6.2: Parsing of all PMU events from sysfs : Ok > > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > > 6.5: Parsing of aliased events : Ok > > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > > 10: PMU events : > > > > > 10.1: PMU event table sanity : Ok > > > > > 10.2: PMU event map aliases : Ok > > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > > 95: perf all metricgroups test : Ok > > > > > 96: perf all metrics test : Ok > > > > > # > > > > > > > > > > This looks good. > > > > > > > > Reproduced: > > > > > > > > # grep -E vendor_id\|^processor -m2 /proc/cpuinfo > > > > vendor_id : IBM/S390 > > > > processor 0: version = 00, identification = 1A33E8, machine = 2964 > > > > # > > > > # perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > > 6: Parse event definition strings : > > > > 6.1: Test event parsing : Ok > > > > 6.2: Parsing of all PMU events from sysfs : Ok > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > 6.5: Parsing of aliased events : Ok > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > 10: PMU events : > > > > 10.1: PMU event table sanity : Ok > > > > 10.2: PMU event map aliases : Ok > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > 95: perf all metricgroups test : Ok > > > > 96: perf all metrics test : Ok > > > > # perf -v > > > > perf version 6.5.rc7.g6f0edbb833ec > > > > # > > > > > > > > > However when I use the check-out from perf-tools-next, I get this output: > > > > > # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > > > 6: Parse event definition strings : > > > > > 6.1: Test event parsing : Ok > > > > > 6.2: Parsing of all PMU events from sysfs : FAILED! > > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > > 6.5: Parsing of aliased events : FAILED! > > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > > 10: PMU events : > > > > > 10.1: PMU event table sanity : Ok > > > > > 10.2: PMU event map aliases : FAILED! > > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > > 93: perf all metricgroups test : FAILED! > > > > > 94: perf all metrics test : FAILED! > > > > > # > > > > > > > > > > So some tests are failing again. > > > > > > > > > > I am out for the next two weeks, Sumanth Korikkar (on to list) might be able to help. > > > > > Thanks a lot. > > > > > > > > [root@kernelqe3 linux]# git checkout perf-tools-next > > > > git Switched to branch 'perf-tools-next' > > > > Your branch is up to date with 'perf-tools-next/perf-tools-next'. > > > > [root@kernelqe3 linux]# git log --oneline -5 > > > > eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc > > > > f208b2c6f984 (perf-tools-next/tmp.perf-tools-next) perf scripts python gecko: Launch the profiler UI on the default browser with the appropriate URL > > > > 43803cb16f99 perf scripts python: Add support for input args in gecko script > > > > f85d120c46e7 perf jevents: Sort strings in the big C string to reduce faults > > > > 8d4b6d37ea78 perf pmu: Lazily load sysfs aliases > > > > [root@kernelqe3 linux]# make BUILD_BPF_SKEL=1 -C tools/perf O=/tmp/build/perf install-bin > > > > > > > > [root@kernelqe3 linux]# perf -v > > > > perf version 6.5.rc5.geeb6b12992c4 > > > > [root@kernelqe3 linux]# git log --oneline -1 > > > > eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc > > > > [root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > > 6: Parse event definition strings : > > > > 6.1: Test event parsing : Ok > > > > 6.2: Parsing of all PMU events from sysfs : FAILED! > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > 6.5: Parsing of aliased events : FAILED! > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > 10: PMU events : > > > > 10.1: PMU event table sanity : Ok > > > > 10.2: PMU event map aliases : FAILED! > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > 93: perf all metricgroups test : FAILED! > > > > 94: perf all metrics test : FAILED! > > > > [root@kernelqe3 linux]# > > > > > > > > Bisecting the first problem: > > > > > > > > 10.2: PMU event map aliases : FAILED! > > > > > > > > make: Leaving directory '/root/git/linux/tools/perf' > > > > 6: Parse event definition strings : > > > > 6.1: Test event parsing : Ok > > > > 6.2: Parsing of all PMU events from sysfs : Ok > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > 6.5: Parsing of aliased events : Ok > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > 10: PMU events : > > > > 10.1: PMU event table sanity : Ok > > > > 10.2: PMU event map aliases : FAILED! > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > 93: perf all metricgroups test : Ok > > > > 94: perf all metrics test : Ok > > > > [root@kernelqe3 linux]# git bisect bad > > > > 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 is the first bad commit > > > > commit 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 > > > > Author: Ian Rogers <irogers@google.com> > > > > Date: Wed Aug 23 21:13:16 2023 -0700 > > > > > > > > perf jevents: Group events by PMU > > > > > > > > Prior to this change a cpuid would map to a list of events where the PMU > > > > would be encoded alongside the event information. This change breaks > > > > apart each group of events so that there is a group per PMU. A new table > > > > is added with the PMU's name and the list of events, the original table > > > > now holding an array of these per PMU tables. > > > > > > > > These changes are to make it easier to get per PMU information about > > > > events, rather than the current approach of scanning all events. The > > > > perf binary size with BPF skeletons on x86 is reduced by about 1%. The > > > > unidentified PMU is now always expanded to "cpu". > > > > > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > > > Cc: Adrian Hunter <adrian.hunter@intel.com> > > > > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> > > > > Cc: Gaosheng Cui <cuigaosheng1@huawei.com> > > > > Cc: Ingo Molnar <mingo@redhat.com> > > > > Cc: James Clark <james.clark@arm.com> > > > > Cc: Jing Zhang <renyu.zj@linux.alibaba.com> > > > > Cc: Jiri Olsa <jolsa@kernel.org> > > > > Cc: John Garry <john.g.garry@oracle.com> > > > > Cc: Kajol Jain <kjain@linux.ibm.com> > > > > Cc: Kan Liang <kan.liang@linux.intel.com> > > > > Cc: Mark Rutland <mark.rutland@arm.com> > > > > Cc: Namhyung Kim <namhyung@kernel.org> > > > > Cc: Peter Zijlstra <peterz@infradead.org> > > > > Cc: Ravi Bangoria <ravi.bangoria@amd.com> > > > > Cc: Rob Herring <robh@kernel.org> > > > > Link: https://lore.kernel.org/r/20230824041330.266337-5-irogers@google.com > > > > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > > > > > > > > tools/perf/pmu-events/jevents.py | 181 +++++++++++++++++++++++++++++---------- > > > > tools/perf/tests/pmu-events.c | 30 ++++--- > > > > 2 files changed, 154 insertions(+), 57 deletions(-) > > > > [root@kernelqe3 linux]# > > > > > > > > > > This change defaulted events without a specified PMU to being for the > > > PMU 'cpu', so that events in pmu-events.c were associated with a PMU > > > and we could find per-PMU information easily. The test events have no > > > PMU and so this has broken s390 where the the PMU should be "cpum_cf". > > > It has probably also broken x86 hybrid and arm where their default PMU > > > isn't cpu. I'll work on a fix, but the problem will be limited to the > > > test. > > > > So, with your "default_core" branche we go to: > > > > [root@kernelqe3 linux]# perf test 10 > > 10: PMU events : > > 10.1: PMU event table sanity : Ok > > 10.2: PMU event map aliases : Ok > > 10.3: Parsing of PMU event table metrics : Ok > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > [root@kernelqe3 linux]# perf --version > > perf version 6.5.rc5.g3d63ae82aa12 > > [root@kernelqe3 linux]# > > > > The other tests: > > > > [root@kernelqe3 linux]# perf --version > > perf version 6.5.rc5.g3d63ae82aa12 > > [root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > 6: Parse event definition strings : > > 6.1: Test event parsing : Ok > > 6.2: Parsing of all PMU events from sysfs : FAILED! > > 6.3: Parsing of given PMU events from sysfs : Ok > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > 6.5: Parsing of aliased events : FAILED! > > 6.6: Parsing of terms (event modifiers) : Ok > > 10: PMU events : > > 10.1: PMU event table sanity : Ok > > 10.2: PMU event map aliases : Ok > > 10.3: Parsing of PMU event table metrics : Ok > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > 93: perf all metricgroups test : FAILED! > > 94: perf all metrics test : FAILED! > > [root@kernelqe3 linux]# > > > > Trying to bisect it now. > > make: Leaving directory '/root/git/linux/tools/perf' > [root@kernelqe3 linux]# perf test 6 > 6: Parse event definition strings : > 6.1: Test event parsing : Ok > 6.2: Parsing of all PMU events from sysfs : FAILED! > 6.3: Parsing of given PMU events from sysfs : Ok > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > 6.5: Parsing of aliased events : FAILED! > 6.6: Parsing of terms (event modifiers) : Ok > [root@kernelqe3 linux]# git bisect bad > 8d4b6d37ea7862d230ad2e1bd4c7d2ff5e9acd53 is the first bad commit > commit 8d4b6d37ea7862d230ad2e1bd4c7d2ff5e9acd53 > Author: Ian Rogers <irogers@google.com> > Date: Wed Aug 23 21:13:28 2023 -0700 > > perf pmu: Lazily load sysfs aliases > > Don't load sysfs aliases for a PMU when the PMU is first created, defer > until an alias needs to be found. For the pmu-scan benchmark, average > core PMU scanning is reduced by 30.8%, and average PMU scanning by > 12.6%. > > Signed-off-by: Ian Rogers <irogers@google.com> > Cc: Adrian Hunter <adrian.hunter@intel.com> > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> > Cc: Gaosheng Cui <cuigaosheng1@huawei.com> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: James Clark <james.clark@arm.com> > Cc: Jing Zhang <renyu.zj@linux.alibaba.com> > Cc: Jiri Olsa <jolsa@kernel.org> > Cc: John Garry <john.g.garry@oracle.com> > Cc: Kajol Jain <kjain@linux.ibm.com> > Cc: Kan Liang <kan.liang@linux.intel.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Namhyung Kim <namhyung@kernel.org> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Ravi Bangoria <ravi.bangoria@amd.com> > Cc: Rob Herring <robh@kernel.org> > Link: https://lore.kernel.org/r/20230824041330.266337-17-irogers@google.com > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > > tools/perf/tests/pmu-events.c | 2 ++ > tools/perf/util/pmu.c | 81 ++++++++++++++++++++++--------------------- > tools/perf/util/pmu.h | 2 ++ > 3 files changed, 46 insertions(+), 39 deletions(-) > [root@kernelqe3 linux]# > > It is segfaulting: > > 6.2: Parsing of all PMU events from sysfs : > --- start --- > test child forked, pid 1202947 > Using CPUID IBM,2964,400,N96,1.4,002f > perf: Segmentation fault > Obtained 16 stack frames. > perf(dump_stack+0x36) [0x1156dbe] > perf(sighandler_dump_stack+0x3a) [0x1156e8a] > [0x3fffd4790b6] > /lib64/libc.so.6(__strcasecmp+0x42) [0x3ffa889c51a] > perf() [0x11792ac] > perf(pmu_events_table__find_event+0x27c) [0x12432fc] > perf() [0x11777cc] > perf() [0x1179842] > perf(perf_pmu__check_alias+0x4f0) [0x1179e98] > perf(parse_events_add_pmu+0x72c) [0x1128e84] > perf(parse_events_parse+0x4d4) [0x11754d4] > perf(__parse_events+0xda) [0x112644a] > perf() [0x10cecb2] > perf() [0x10d3264] > perf() [0x10cb250] > perf(cmd_test+0x109e) [0x10cc756] > test child interrupted > ---- end ---- > Parse event definition strings subtest 2: FAILED! > > > Starting program: /root/bin/perf test -F 6 > [Thread debugging using libthread_db enabled] > Using host libthread_db library "/lib64/libthread_db.so.1". > 6: Parse event definition strings : > 6.1: Test event parsing : Ok > 6.2: Parsing of all PMU events from sysfs : > Program received signal SIGSEGV, Segmentation fault. > 0x000003fffcf1c51a in strcasecmp () from /lib64/libc.so.6 > #0 0x000003fffcf1c51a in strcasecmp () from /lib64/libc.so.6 > #1 0x000000000123e518 in assign_str (name=0x1487cc3 "l1i_ondrawer_mem_sourced_writes", field=0x141eeba "value", old_str=0x18c12e0, new_str=0x1487d1f "event=0xb1") at util/pmu.c:449 > #2 0x000000000123e82c in update_alias (pe=0x3ffffff8ac0, table=0x1555cb0 <pmu_events_map+160>, vdata=0x3ffffff8c40) at util/pmu.c:490 > #3 0x000000000137b9dc in pmu_events_table.find_event () > #4 0x000000000123ed4e in perf_pmu__new_alias (pmu=0x15ce490, name=0x23c2593 "L1I_ONDRAWER_MEM_SOURCED_WRITES", desc=0x0, val=0x0, val_fd=0x16058a0, pe=0x0) at util/pmu.c:569 > #5 0x000000000123f370 in pmu_aliases_parse (pmu=0x15ce490) at util/pmu.c:673 > #6 0x000000000123e3a2 in perf_pmu__find_alias (pmu=0x15ce490, name=0x238eb10 "L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV", load=true) at util/pmu.c:432 > #7 0x0000000001241bb2 in pmu_find_alias (pmu=0x15ce490, term=0x18409d0) at util/pmu.c:1439 > #8 0x0000000001241f82 in perf_pmu__check_alias (pmu=0x15ce490, head_terms=0x21b14d0, info=0x3ffffffa238, err=0x3ffffffc4c8) at util/pmu.c:1519 > #9 0x00000000011bbbd4 in parse_events_add_pmu (parse_state=0x3ffffffc2f0, list=0x21afec0, name=0x21c6430 "cpum_cf", head_config=0x21b14d0, auto_merge_stats=false, loc_=0x3ffffffb4d8) at util/parse-events.c:1351 > #10 0x000000000123aa4c in parse_events_parse (_parse_state=0x3ffffffc2f0, scanner=0x15b9310) at util/parse-events.y:299 > #11 0x00000000011bd190 in parse_events__scanner (str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", input=0x0, parse_state=0x3ffffffc2f0) at util/parse-events.c:1738 > #12 0x00000000011bde00 in __parse_events (evlist=0x15b7030, str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", pmu_filter=0x0, err=0x3ffffffc4c8, fake_pmu=0x0, warn_if_reordered=true) at util/parse-events.c:2010 > #13 0x0000000001121884 in parse_events (evlist=0x15b7030, str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", err=0x3ffffffc4c8) at /root/git/linux/tools/perf/util/parse-events.h:40 > #14 0x0000000001134084 in test_event (e=0x3ffffffc5e0) at tests/parse-events.c:2393 > #15 0x00000000011349ec in test__pmu_events (test=0x156b860 <suite.parse_events>, subtest=1) at tests/parse-events.c:2551 > #16 0x000000000111f884 in run_test (test=0x156b860 <suite.parse_events>, subtest=1) at tests/builtin-test.c:242 > #17 0x000000000111fa1a in test_and_print (t=0x156b860 <suite.parse_events>, subtest=1) at tests/builtin-test.c:271 > #18 0x00000000011203fa in __cmd_test (argc=1, argv=0x3ffffffe5d0, skiplist=0x0) at tests/builtin-test.c:442 > #19 0x0000000001120cca in cmd_test (argc=1, argv=0x3ffffffe5d0) at tests/builtin-test.c:564 > #20 0x00000000011713a4 in run_builtin (p=0x1561190 <commands+600>, argc=3, argv=0x3ffffffe5d0) at perf.c:322 > #21 0x0000000001171712 in handle_internal_command (argc=3, argv=0x3ffffffe5d0) at perf.c:375 > #22 0x0000000001171920 in run_argv (argcp=0x3ffffffe304, argv=0x3ffffffe2f8) at perf.c:419 > #23 0x0000000001171ce8 in main (argc=3, argv=0x3ffffffe5d0) at perf.c:535 > (gdb) > > (gdb) fr 1 > #1 0x000000000123e518 in assign_str (name=0x1487cc3 "l1i_ondrawer_mem_sourced_writes", field=0x141eeba "value", old_str=0x18c12e0, new_str=0x1487d1f "event=0xb1") at util/pmu.c:449 > 449 if (!new_str || !strcasecmp(*old_str, new_str)) > (gdb) p new_str > $1 = 0x1487d1f "event=0xb1" > (gdb) p *old_str > $2 = 0x1 <error: Cannot access memory at address 0x1> > (gdb) p old_str > $3 = (char **) 0x18c12e0 > (gdb) I can't explain this, how come the line numbers don't agree with? https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/pmu.c?h=tmp.perf-tools-next#n449 The values are coming from the json event data. I'd need to see the generated pmu-events.c. Thanks, Ian
Em Mon, Aug 28, 2023 at 05:59:47PM -0700, Ian Rogers escreveu: > On Mon, Aug 28, 2023 at 10:53 AM Arnaldo Carvalho de Melo > <acme@kernel.org> wrote: > > > > Em Mon, Aug 28, 2023 at 02:44:53PM -0300, Arnaldo Carvalho de Melo escreveu: > > > Em Fri, Aug 25, 2023 at 03:56:54PM -0700, Ian Rogers escreveu: > > > > On Fri, Aug 25, 2023 at 1:56 PM Arnaldo Carvalho de Melo > > > > <acme@kernel.org> wrote: > > > > > > > > > > Em Fri, Aug 25, 2023 at 04:39:22PM +0200, Thomas Richter escreveu: > > > > > > On 8/25/23 15:14, Ian Rogers wrote: > > > > > > > On Fri, Aug 25, 2023 at 1:20 AM Thomas Richter <tmricht@linux.ibm.com> wrote: > > > > > > > > > > > >> On 8/24/23 15:59, Arnaldo Carvalho de Melo wrote: > > > > > > >>> Em Wed, Aug 23, 2023 at 09:13:18PM -0700, Ian Rogers escreveu: > > > > > > >>>> Rather than scanning all PMUs for a counter name, scan the PMU > > > > > > >>>> associated with the evsel of the sample. This is done to remove a > > > > > > >>>> dependence on pmu-events.h. > > > > > > > > > > > >>> I'm applying this one, and CCing the S/390 developers so that they can > > > > > > >>> try this and maybe provide an Acked-by/Tested-by, > > > > > > > > > > > >> I have downloaded this patch set of 18 patches (using b4), but they do not > > > > > > >> apply on my git tree. > > > > > > > > > > > >> Which git branch do I have to use to test this. Thanks a lot. > > > > > > > > > > > > the changes are in the perf-tools-next tree: > > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/ > > > > > > > > > > > Unfurtunately this patch set fails again on s390. > > > > > > Here is the test output from the current 6.5.0rc7 kernel: > > > > > > > > > > > > # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > > > > 6: Parse event definition strings : > > > > > > 6.1: Test event parsing : Ok > > > > > > 6.2: Parsing of all PMU events from sysfs : Ok > > > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > > > 6.5: Parsing of aliased events : Ok > > > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > > > 10: PMU events : > > > > > > 10.1: PMU event table sanity : Ok > > > > > > 10.2: PMU event map aliases : Ok > > > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > > > 95: perf all metricgroups test : Ok > > > > > > 96: perf all metrics test : Ok > > > > > > # > > > > > > > > > > > > This looks good. > > > > > > > > > > Reproduced: > > > > > > > > > > # grep -E vendor_id\|^processor -m2 /proc/cpuinfo > > > > > vendor_id : IBM/S390 > > > > > processor 0: version = 00, identification = 1A33E8, machine = 2964 > > > > > # > > > > > # perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > > > 6: Parse event definition strings : > > > > > 6.1: Test event parsing : Ok > > > > > 6.2: Parsing of all PMU events from sysfs : Ok > > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > > 6.5: Parsing of aliased events : Ok > > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > > 10: PMU events : > > > > > 10.1: PMU event table sanity : Ok > > > > > 10.2: PMU event map aliases : Ok > > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > > 95: perf all metricgroups test : Ok > > > > > 96: perf all metrics test : Ok > > > > > # perf -v > > > > > perf version 6.5.rc7.g6f0edbb833ec > > > > > # > > > > > > > > > > > However when I use the check-out from perf-tools-next, I get this output: > > > > > > # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > > > > 6: Parse event definition strings : > > > > > > 6.1: Test event parsing : Ok > > > > > > 6.2: Parsing of all PMU events from sysfs : FAILED! > > > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > > > 6.5: Parsing of aliased events : FAILED! > > > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > > > 10: PMU events : > > > > > > 10.1: PMU event table sanity : Ok > > > > > > 10.2: PMU event map aliases : FAILED! > > > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > > > 93: perf all metricgroups test : FAILED! > > > > > > 94: perf all metrics test : FAILED! > > > > > > # > > > > > > > > > > > > So some tests are failing again. > > > > > > > > > > > > I am out for the next two weeks, Sumanth Korikkar (on to list) might be able to help. > > > > > > Thanks a lot. > > > > > > > > > > [root@kernelqe3 linux]# git checkout perf-tools-next > > > > > git Switched to branch 'perf-tools-next' > > > > > Your branch is up to date with 'perf-tools-next/perf-tools-next'. > > > > > [root@kernelqe3 linux]# git log --oneline -5 > > > > > eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc > > > > > f208b2c6f984 (perf-tools-next/tmp.perf-tools-next) perf scripts python gecko: Launch the profiler UI on the default browser with the appropriate URL > > > > > 43803cb16f99 perf scripts python: Add support for input args in gecko script > > > > > f85d120c46e7 perf jevents: Sort strings in the big C string to reduce faults > > > > > 8d4b6d37ea78 perf pmu: Lazily load sysfs aliases > > > > > [root@kernelqe3 linux]# make BUILD_BPF_SKEL=1 -C tools/perf O=/tmp/build/perf install-bin > > > > > > > > > > [root@kernelqe3 linux]# perf -v > > > > > perf version 6.5.rc5.geeb6b12992c4 > > > > > [root@kernelqe3 linux]# git log --oneline -1 > > > > > eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc > > > > > [root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > > > 6: Parse event definition strings : > > > > > 6.1: Test event parsing : Ok > > > > > 6.2: Parsing of all PMU events from sysfs : FAILED! > > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > > 6.5: Parsing of aliased events : FAILED! > > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > > 10: PMU events : > > > > > 10.1: PMU event table sanity : Ok > > > > > 10.2: PMU event map aliases : FAILED! > > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > > 93: perf all metricgroups test : FAILED! > > > > > 94: perf all metrics test : FAILED! > > > > > [root@kernelqe3 linux]# > > > > > > > > > > Bisecting the first problem: > > > > > > > > > > 10.2: PMU event map aliases : FAILED! > > > > > > > > > > make: Leaving directory '/root/git/linux/tools/perf' > > > > > 6: Parse event definition strings : > > > > > 6.1: Test event parsing : Ok > > > > > 6.2: Parsing of all PMU events from sysfs : Ok > > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > > 6.5: Parsing of aliased events : Ok > > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > > 10: PMU events : > > > > > 10.1: PMU event table sanity : Ok > > > > > 10.2: PMU event map aliases : FAILED! > > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > > 93: perf all metricgroups test : Ok > > > > > 94: perf all metrics test : Ok > > > > > [root@kernelqe3 linux]# git bisect bad > > > > > 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 is the first bad commit > > > > > commit 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 > > > > > Author: Ian Rogers <irogers@google.com> > > > > > Date: Wed Aug 23 21:13:16 2023 -0700 > > > > > > > > > > perf jevents: Group events by PMU > > > > > > > > > > Prior to this change a cpuid would map to a list of events where the PMU > > > > > would be encoded alongside the event information. This change breaks > > > > > apart each group of events so that there is a group per PMU. A new table > > > > > is added with the PMU's name and the list of events, the original table > > > > > now holding an array of these per PMU tables. > > > > > > > > > > These changes are to make it easier to get per PMU information about > > > > > events, rather than the current approach of scanning all events. The > > > > > perf binary size with BPF skeletons on x86 is reduced by about 1%. The > > > > > unidentified PMU is now always expanded to "cpu". > > > > > > > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > > > > Cc: Adrian Hunter <adrian.hunter@intel.com> > > > > > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> > > > > > Cc: Gaosheng Cui <cuigaosheng1@huawei.com> > > > > > Cc: Ingo Molnar <mingo@redhat.com> > > > > > Cc: James Clark <james.clark@arm.com> > > > > > Cc: Jing Zhang <renyu.zj@linux.alibaba.com> > > > > > Cc: Jiri Olsa <jolsa@kernel.org> > > > > > Cc: John Garry <john.g.garry@oracle.com> > > > > > Cc: Kajol Jain <kjain@linux.ibm.com> > > > > > Cc: Kan Liang <kan.liang@linux.intel.com> > > > > > Cc: Mark Rutland <mark.rutland@arm.com> > > > > > Cc: Namhyung Kim <namhyung@kernel.org> > > > > > Cc: Peter Zijlstra <peterz@infradead.org> > > > > > Cc: Ravi Bangoria <ravi.bangoria@amd.com> > > > > > Cc: Rob Herring <robh@kernel.org> > > > > > Link: https://lore.kernel.org/r/20230824041330.266337-5-irogers@google.com > > > > > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > > > > > > > > > > tools/perf/pmu-events/jevents.py | 181 +++++++++++++++++++++++++++++---------- > > > > > tools/perf/tests/pmu-events.c | 30 ++++--- > > > > > 2 files changed, 154 insertions(+), 57 deletions(-) > > > > > [root@kernelqe3 linux]# > > > > > > > > > > > > > This change defaulted events without a specified PMU to being for the > > > > PMU 'cpu', so that events in pmu-events.c were associated with a PMU > > > > and we could find per-PMU information easily. The test events have no > > > > PMU and so this has broken s390 where the the PMU should be "cpum_cf". > > > > It has probably also broken x86 hybrid and arm where their default PMU > > > > isn't cpu. I'll work on a fix, but the problem will be limited to the > > > > test. > > > > > > So, with your "default_core" branche we go to: > > > > > > [root@kernelqe3 linux]# perf test 10 > > > 10: PMU events : > > > 10.1: PMU event table sanity : Ok > > > 10.2: PMU event map aliases : Ok > > > 10.3: Parsing of PMU event table metrics : Ok > > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > [root@kernelqe3 linux]# perf --version > > > perf version 6.5.rc5.g3d63ae82aa12 > > > [root@kernelqe3 linux]# > > > > > > The other tests: > > > > > > [root@kernelqe3 linux]# perf --version > > > perf version 6.5.rc5.g3d63ae82aa12 > > > [root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > 6: Parse event definition strings : > > > 6.1: Test event parsing : Ok > > > 6.2: Parsing of all PMU events from sysfs : FAILED! > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > 6.5: Parsing of aliased events : FAILED! > > > 6.6: Parsing of terms (event modifiers) : Ok > > > 10: PMU events : > > > 10.1: PMU event table sanity : Ok > > > 10.2: PMU event map aliases : Ok > > > 10.3: Parsing of PMU event table metrics : Ok > > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > 93: perf all metricgroups test : FAILED! > > > 94: perf all metrics test : FAILED! > > > [root@kernelqe3 linux]# > > > > > > Trying to bisect it now. > > > > make: Leaving directory '/root/git/linux/tools/perf' > > [root@kernelqe3 linux]# perf test 6 > > 6: Parse event definition strings : > > 6.1: Test event parsing : Ok > > 6.2: Parsing of all PMU events from sysfs : FAILED! > > 6.3: Parsing of given PMU events from sysfs : Ok > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > 6.5: Parsing of aliased events : FAILED! > > 6.6: Parsing of terms (event modifiers) : Ok > > [root@kernelqe3 linux]# git bisect bad > > 8d4b6d37ea7862d230ad2e1bd4c7d2ff5e9acd53 is the first bad commit > > commit 8d4b6d37ea7862d230ad2e1bd4c7d2ff5e9acd53 > > Author: Ian Rogers <irogers@google.com> > > Date: Wed Aug 23 21:13:28 2023 -0700 > > > > perf pmu: Lazily load sysfs aliases > > > > Don't load sysfs aliases for a PMU when the PMU is first created, defer > > until an alias needs to be found. For the pmu-scan benchmark, average > > core PMU scanning is reduced by 30.8%, and average PMU scanning by > > 12.6%. > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > Cc: Adrian Hunter <adrian.hunter@intel.com> > > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> > > Cc: Gaosheng Cui <cuigaosheng1@huawei.com> > > Cc: Ingo Molnar <mingo@redhat.com> > > Cc: James Clark <james.clark@arm.com> > > Cc: Jing Zhang <renyu.zj@linux.alibaba.com> > > Cc: Jiri Olsa <jolsa@kernel.org> > > Cc: John Garry <john.g.garry@oracle.com> > > Cc: Kajol Jain <kjain@linux.ibm.com> > > Cc: Kan Liang <kan.liang@linux.intel.com> > > Cc: Mark Rutland <mark.rutland@arm.com> > > Cc: Namhyung Kim <namhyung@kernel.org> > > Cc: Peter Zijlstra <peterz@infradead.org> > > Cc: Ravi Bangoria <ravi.bangoria@amd.com> > > Cc: Rob Herring <robh@kernel.org> > > Link: https://lore.kernel.org/r/20230824041330.266337-17-irogers@google.com > > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > > > > tools/perf/tests/pmu-events.c | 2 ++ > > tools/perf/util/pmu.c | 81 ++++++++++++++++++++++--------------------- > > tools/perf/util/pmu.h | 2 ++ > > 3 files changed, 46 insertions(+), 39 deletions(-) > > [root@kernelqe3 linux]# > > > > It is segfaulting: > > > > 6.2: Parsing of all PMU events from sysfs : > > --- start --- > > test child forked, pid 1202947 > > Using CPUID IBM,2964,400,N96,1.4,002f > > perf: Segmentation fault > > Obtained 16 stack frames. > > perf(dump_stack+0x36) [0x1156dbe] > > perf(sighandler_dump_stack+0x3a) [0x1156e8a] > > [0x3fffd4790b6] > > /lib64/libc.so.6(__strcasecmp+0x42) [0x3ffa889c51a] > > perf() [0x11792ac] > > perf(pmu_events_table__find_event+0x27c) [0x12432fc] > > perf() [0x11777cc] > > perf() [0x1179842] > > perf(perf_pmu__check_alias+0x4f0) [0x1179e98] > > perf(parse_events_add_pmu+0x72c) [0x1128e84] > > perf(parse_events_parse+0x4d4) [0x11754d4] > > perf(__parse_events+0xda) [0x112644a] > > perf() [0x10cecb2] > > perf() [0x10d3264] > > perf() [0x10cb250] > > perf(cmd_test+0x109e) [0x10cc756] > > test child interrupted > > ---- end ---- > > Parse event definition strings subtest 2: FAILED! > > > > > > Starting program: /root/bin/perf test -F 6 > > [Thread debugging using libthread_db enabled] > > Using host libthread_db library "/lib64/libthread_db.so.1". > > 6: Parse event definition strings : > > 6.1: Test event parsing : Ok > > 6.2: Parsing of all PMU events from sysfs : > > Program received signal SIGSEGV, Segmentation fault. > > 0x000003fffcf1c51a in strcasecmp () from /lib64/libc.so.6 > > #0 0x000003fffcf1c51a in strcasecmp () from /lib64/libc.so.6 > > #1 0x000000000123e518 in assign_str (name=0x1487cc3 "l1i_ondrawer_mem_sourced_writes", field=0x141eeba "value", old_str=0x18c12e0, new_str=0x1487d1f "event=0xb1") at util/pmu.c:449 > > #2 0x000000000123e82c in update_alias (pe=0x3ffffff8ac0, table=0x1555cb0 <pmu_events_map+160>, vdata=0x3ffffff8c40) at util/pmu.c:490 > > #3 0x000000000137b9dc in pmu_events_table.find_event () > > #4 0x000000000123ed4e in perf_pmu__new_alias (pmu=0x15ce490, name=0x23c2593 "L1I_ONDRAWER_MEM_SOURCED_WRITES", desc=0x0, val=0x0, val_fd=0x16058a0, pe=0x0) at util/pmu.c:569 > > #5 0x000000000123f370 in pmu_aliases_parse (pmu=0x15ce490) at util/pmu.c:673 > > #6 0x000000000123e3a2 in perf_pmu__find_alias (pmu=0x15ce490, name=0x238eb10 "L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV", load=true) at util/pmu.c:432 > > #7 0x0000000001241bb2 in pmu_find_alias (pmu=0x15ce490, term=0x18409d0) at util/pmu.c:1439 > > #8 0x0000000001241f82 in perf_pmu__check_alias (pmu=0x15ce490, head_terms=0x21b14d0, info=0x3ffffffa238, err=0x3ffffffc4c8) at util/pmu.c:1519 > > #9 0x00000000011bbbd4 in parse_events_add_pmu (parse_state=0x3ffffffc2f0, list=0x21afec0, name=0x21c6430 "cpum_cf", head_config=0x21b14d0, auto_merge_stats=false, loc_=0x3ffffffb4d8) at util/parse-events.c:1351 > > #10 0x000000000123aa4c in parse_events_parse (_parse_state=0x3ffffffc2f0, scanner=0x15b9310) at util/parse-events.y:299 > > #11 0x00000000011bd190 in parse_events__scanner (str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", input=0x0, parse_state=0x3ffffffc2f0) at util/parse-events.c:1738 > > #12 0x00000000011bde00 in __parse_events (evlist=0x15b7030, str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", pmu_filter=0x0, err=0x3ffffffc4c8, fake_pmu=0x0, warn_if_reordered=true) at util/parse-events.c:2010 > > #13 0x0000000001121884 in parse_events (evlist=0x15b7030, str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", err=0x3ffffffc4c8) at /root/git/linux/tools/perf/util/parse-events.h:40 > > #14 0x0000000001134084 in test_event (e=0x3ffffffc5e0) at tests/parse-events.c:2393 > > #15 0x00000000011349ec in test__pmu_events (test=0x156b860 <suite.parse_events>, subtest=1) at tests/parse-events.c:2551 > > #16 0x000000000111f884 in run_test (test=0x156b860 <suite.parse_events>, subtest=1) at tests/builtin-test.c:242 > > #17 0x000000000111fa1a in test_and_print (t=0x156b860 <suite.parse_events>, subtest=1) at tests/builtin-test.c:271 > > #18 0x00000000011203fa in __cmd_test (argc=1, argv=0x3ffffffe5d0, skiplist=0x0) at tests/builtin-test.c:442 > > #19 0x0000000001120cca in cmd_test (argc=1, argv=0x3ffffffe5d0) at tests/builtin-test.c:564 > > #20 0x00000000011713a4 in run_builtin (p=0x1561190 <commands+600>, argc=3, argv=0x3ffffffe5d0) at perf.c:322 > > #21 0x0000000001171712 in handle_internal_command (argc=3, argv=0x3ffffffe5d0) at perf.c:375 > > #22 0x0000000001171920 in run_argv (argcp=0x3ffffffe304, argv=0x3ffffffe2f8) at perf.c:419 > > #23 0x0000000001171ce8 in main (argc=3, argv=0x3ffffffe5d0) at perf.c:535 > > (gdb) > > > > (gdb) fr 1 > > #1 0x000000000123e518 in assign_str (name=0x1487cc3 "l1i_ondrawer_mem_sourced_writes", field=0x141eeba "value", old_str=0x18c12e0, new_str=0x1487d1f "event=0xb1") at util/pmu.c:449 > > 449 if (!new_str || !strcasecmp(*old_str, new_str)) > > (gdb) p new_str > > $1 = 0x1487d1f "event=0xb1" > > (gdb) p *old_str > > $2 = 0x1 <error: Cannot access memory at address 0x1> > > (gdb) p old_str > > $3 = (char **) 0x18c12e0 > > (gdb) > > I can't explain this, how come the line numbers don't agree with? > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/pmu.c?h=tmp.perf-tools-next#n449 Probably because this was done in a bisect? I'll redo it with what is in tmp-perf.tools-next. > The values are coming from the json event data. I'd need to see the > generated pmu-events.c. And provide this file - Arnaldo
在 2023/8/29 上午8:59, Ian Rogers 写道: > On Mon, Aug 28, 2023 at 10:53 AM Arnaldo Carvalho de Melo > <acme@kernel.org> wrote: >> >> Em Mon, Aug 28, 2023 at 02:44:53PM -0300, Arnaldo Carvalho de Melo escreveu: >>> Em Fri, Aug 25, 2023 at 03:56:54PM -0700, Ian Rogers escreveu: >>>> On Fri, Aug 25, 2023 at 1:56 PM Arnaldo Carvalho de Melo >>>> <acme@kernel.org> wrote: >>>>> >>>>> Em Fri, Aug 25, 2023 at 04:39:22PM +0200, Thomas Richter escreveu: >>>>>> On 8/25/23 15:14, Ian Rogers wrote: >>>>>>> On Fri, Aug 25, 2023 at 1:20 AM Thomas Richter <tmricht@linux.ibm.com> wrote: >>>>> >>>>>>>> On 8/24/23 15:59, Arnaldo Carvalho de Melo wrote: >>>>>>>>> Em Wed, Aug 23, 2023 at 09:13:18PM -0700, Ian Rogers escreveu: >>>>>>>>>> Rather than scanning all PMUs for a counter name, scan the PMU >>>>>>>>>> associated with the evsel of the sample. This is done to remove a >>>>>>>>>> dependence on pmu-events.h. >>>>> >>>>>>>>> I'm applying this one, and CCing the S/390 developers so that they can >>>>>>>>> try this and maybe provide an Acked-by/Tested-by, >>>>> >>>>>>>> I have downloaded this patch set of 18 patches (using b4), but they do not >>>>>>>> apply on my git tree. >>>>> >>>>>>>> Which git branch do I have to use to test this. Thanks a lot. >>>>> >>>>>>> the changes are in the perf-tools-next tree: >>>>>>> https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/ >>>>> >>>>>> Unfurtunately this patch set fails again on s390. >>>>>> Here is the test output from the current 6.5.0rc7 kernel: >>>>>> >>>>>> # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' >>>>>> 6: Parse event definition strings : >>>>>> 6.1: Test event parsing : Ok >>>>>> 6.2: Parsing of all PMU events from sysfs : Ok >>>>>> 6.3: Parsing of given PMU events from sysfs : Ok >>>>>> 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) >>>>>> 6.5: Parsing of aliased events : Ok >>>>>> 6.6: Parsing of terms (event modifiers) : Ok >>>>>> 10: PMU events : >>>>>> 10.1: PMU event table sanity : Ok >>>>>> 10.2: PMU event map aliases : Ok >>>>>> 10.3: Parsing of PMU event table metrics : Ok >>>>>> 10.4: Parsing of PMU event table metrics with fake PMUs : Ok >>>>>> 10.5: Parsing of metric thresholds with fake PMUs : Ok >>>>>> 95: perf all metricgroups test : Ok >>>>>> 96: perf all metrics test : Ok >>>>>> # >>>>>> >>>>>> This looks good. >>>>> >>>>> Reproduced: >>>>> >>>>> # grep -E vendor_id\|^processor -m2 /proc/cpuinfo >>>>> vendor_id : IBM/S390 >>>>> processor 0: version = 00, identification = 1A33E8, machine = 2964 >>>>> # >>>>> # perf test 6 10 'perf all metricgroups test' 'perf all metrics test' >>>>> 6: Parse event definition strings : >>>>> 6.1: Test event parsing : Ok >>>>> 6.2: Parsing of all PMU events from sysfs : Ok >>>>> 6.3: Parsing of given PMU events from sysfs : Ok >>>>> 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) >>>>> 6.5: Parsing of aliased events : Ok >>>>> 6.6: Parsing of terms (event modifiers) : Ok >>>>> 10: PMU events : >>>>> 10.1: PMU event table sanity : Ok >>>>> 10.2: PMU event map aliases : Ok >>>>> 10.3: Parsing of PMU event table metrics : Ok >>>>> 10.4: Parsing of PMU event table metrics with fake PMUs : Ok >>>>> 10.5: Parsing of metric thresholds with fake PMUs : Ok >>>>> 95: perf all metricgroups test : Ok >>>>> 96: perf all metrics test : Ok >>>>> # perf -v >>>>> perf version 6.5.rc7.g6f0edbb833ec >>>>> # >>>>> >>>>>> However when I use the check-out from perf-tools-next, I get this output: >>>>>> # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' >>>>>> 6: Parse event definition strings : >>>>>> 6.1: Test event parsing : Ok >>>>>> 6.2: Parsing of all PMU events from sysfs : FAILED! >>>>>> 6.3: Parsing of given PMU events from sysfs : Ok >>>>>> 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) >>>>>> 6.5: Parsing of aliased events : FAILED! >>>>>> 6.6: Parsing of terms (event modifiers) : Ok >>>>>> 10: PMU events : >>>>>> 10.1: PMU event table sanity : Ok >>>>>> 10.2: PMU event map aliases : FAILED! >>>>>> 10.3: Parsing of PMU event table metrics : Ok >>>>>> 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! >>>>>> 10.5: Parsing of metric thresholds with fake PMUs : Ok >>>>>> 93: perf all metricgroups test : FAILED! >>>>>> 94: perf all metrics test : FAILED! >>>>>> # >>>>>> >>>>>> So some tests are failing again. >>>>>> >>>>>> I am out for the next two weeks, Sumanth Korikkar (on to list) might be able to help. >>>>>> Thanks a lot. >>>>> >>>>> [root@kernelqe3 linux]# git checkout perf-tools-next >>>>> git Switched to branch 'perf-tools-next' >>>>> Your branch is up to date with 'perf-tools-next/perf-tools-next'. >>>>> [root@kernelqe3 linux]# git log --oneline -5 >>>>> eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc >>>>> f208b2c6f984 (perf-tools-next/tmp.perf-tools-next) perf scripts python gecko: Launch the profiler UI on the default browser with the appropriate URL >>>>> 43803cb16f99 perf scripts python: Add support for input args in gecko script >>>>> f85d120c46e7 perf jevents: Sort strings in the big C string to reduce faults >>>>> 8d4b6d37ea78 perf pmu: Lazily load sysfs aliases >>>>> [root@kernelqe3 linux]# make BUILD_BPF_SKEL=1 -C tools/perf O=/tmp/build/perf install-bin >>>>> >>>>> [root@kernelqe3 linux]# perf -v >>>>> perf version 6.5.rc5.geeb6b12992c4 >>>>> [root@kernelqe3 linux]# git log --oneline -1 >>>>> eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc >>>>> [root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test' >>>>> 6: Parse event definition strings : >>>>> 6.1: Test event parsing : Ok >>>>> 6.2: Parsing of all PMU events from sysfs : FAILED! >>>>> 6.3: Parsing of given PMU events from sysfs : Ok >>>>> 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) >>>>> 6.5: Parsing of aliased events : FAILED! >>>>> 6.6: Parsing of terms (event modifiers) : Ok >>>>> 10: PMU events : >>>>> 10.1: PMU event table sanity : Ok >>>>> 10.2: PMU event map aliases : FAILED! >>>>> 10.3: Parsing of PMU event table metrics : Ok >>>>> 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! >>>>> 10.5: Parsing of metric thresholds with fake PMUs : Ok >>>>> 93: perf all metricgroups test : FAILED! >>>>> 94: perf all metrics test : FAILED! >>>>> [root@kernelqe3 linux]# >>>>> >>>>> Bisecting the first problem: >>>>> >>>>> 10.2: PMU event map aliases : FAILED! >>>>> >>>>> make: Leaving directory '/root/git/linux/tools/perf' >>>>> 6: Parse event definition strings : >>>>> 6.1: Test event parsing : Ok >>>>> 6.2: Parsing of all PMU events from sysfs : Ok >>>>> 6.3: Parsing of given PMU events from sysfs : Ok >>>>> 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) >>>>> 6.5: Parsing of aliased events : Ok >>>>> 6.6: Parsing of terms (event modifiers) : Ok >>>>> 10: PMU events : >>>>> 10.1: PMU event table sanity : Ok >>>>> 10.2: PMU event map aliases : FAILED! >>>>> 10.3: Parsing of PMU event table metrics : Ok >>>>> 10.4: Parsing of PMU event table metrics with fake PMUs : Ok >>>>> 10.5: Parsing of metric thresholds with fake PMUs : Ok >>>>> 93: perf all metricgroups test : Ok >>>>> 94: perf all metrics test : Ok >>>>> [root@kernelqe3 linux]# git bisect bad >>>>> 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 is the first bad commit >>>>> commit 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 >>>>> Author: Ian Rogers <irogers@google.com> >>>>> Date: Wed Aug 23 21:13:16 2023 -0700 >>>>> >>>>> perf jevents: Group events by PMU >>>>> >>>>> Prior to this change a cpuid would map to a list of events where the PMU >>>>> would be encoded alongside the event information. This change breaks >>>>> apart each group of events so that there is a group per PMU. A new table >>>>> is added with the PMU's name and the list of events, the original table >>>>> now holding an array of these per PMU tables. >>>>> >>>>> These changes are to make it easier to get per PMU information about >>>>> events, rather than the current approach of scanning all events. The >>>>> perf binary size with BPF skeletons on x86 is reduced by about 1%. The >>>>> unidentified PMU is now always expanded to "cpu". >>>>> >>>>> Signed-off-by: Ian Rogers <irogers@google.com> >>>>> Cc: Adrian Hunter <adrian.hunter@intel.com> >>>>> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> >>>>> Cc: Gaosheng Cui <cuigaosheng1@huawei.com> >>>>> Cc: Ingo Molnar <mingo@redhat.com> >>>>> Cc: James Clark <james.clark@arm.com> >>>>> Cc: Jing Zhang <renyu.zj@linux.alibaba.com> >>>>> Cc: Jiri Olsa <jolsa@kernel.org> >>>>> Cc: John Garry <john.g.garry@oracle.com> >>>>> Cc: Kajol Jain <kjain@linux.ibm.com> >>>>> Cc: Kan Liang <kan.liang@linux.intel.com> >>>>> Cc: Mark Rutland <mark.rutland@arm.com> >>>>> Cc: Namhyung Kim <namhyung@kernel.org> >>>>> Cc: Peter Zijlstra <peterz@infradead.org> >>>>> Cc: Ravi Bangoria <ravi.bangoria@amd.com> >>>>> Cc: Rob Herring <robh@kernel.org> >>>>> Link: https://lore.kernel.org/r/20230824041330.266337-5-irogers@google.com >>>>> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> >>>>> >>>>> tools/perf/pmu-events/jevents.py | 181 +++++++++++++++++++++++++++++---------- >>>>> tools/perf/tests/pmu-events.c | 30 ++++--- >>>>> 2 files changed, 154 insertions(+), 57 deletions(-) >>>>> [root@kernelqe3 linux]# >>>>> >>>> >>>> This change defaulted events without a specified PMU to being for the >>>> PMU 'cpu', so that events in pmu-events.c were associated with a PMU >>>> and we could find per-PMU information easily. The test events have no >>>> PMU and so this has broken s390 where the the PMU should be "cpum_cf". >>>> It has probably also broken x86 hybrid and arm where their default PMU >>>> isn't cpu. I'll work on a fix, but the problem will be limited to the >>>> test. >>> >>> So, with your "default_core" branche we go to: >>> >>> [root@kernelqe3 linux]# perf test 10 >>> 10: PMU events : >>> 10.1: PMU event table sanity : Ok >>> 10.2: PMU event map aliases : Ok >>> 10.3: Parsing of PMU event table metrics : Ok >>> 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! >>> 10.5: Parsing of metric thresholds with fake PMUs : Ok >>> [root@kernelqe3 linux]# perf --version >>> perf version 6.5.rc5.g3d63ae82aa12 >>> [root@kernelqe3 linux]# >>> >>> The other tests: >>> >>> [root@kernelqe3 linux]# perf --version >>> perf version 6.5.rc5.g3d63ae82aa12 >>> [root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test' >>> 6: Parse event definition strings : >>> 6.1: Test event parsing : Ok >>> 6.2: Parsing of all PMU events from sysfs : FAILED! >>> 6.3: Parsing of given PMU events from sysfs : Ok >>> 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) >>> 6.5: Parsing of aliased events : FAILED! >>> 6.6: Parsing of terms (event modifiers) : Ok >>> 10: PMU events : >>> 10.1: PMU event table sanity : Ok >>> 10.2: PMU event map aliases : Ok >>> 10.3: Parsing of PMU event table metrics : Ok >>> 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! >>> 10.5: Parsing of metric thresholds with fake PMUs : Ok >>> 93: perf all metricgroups test : FAILED! >>> 94: perf all metrics test : FAILED! >>> [root@kernelqe3 linux]# >>> >>> Trying to bisect it now. >> >> make: Leaving directory '/root/git/linux/tools/perf' >> [root@kernelqe3 linux]# perf test 6 >> 6: Parse event definition strings : >> 6.1: Test event parsing : Ok >> 6.2: Parsing of all PMU events from sysfs : FAILED! >> 6.3: Parsing of given PMU events from sysfs : Ok >> 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) >> 6.5: Parsing of aliased events : FAILED! >> 6.6: Parsing of terms (event modifiers) : Ok >> [root@kernelqe3 linux]# git bisect bad >> 8d4b6d37ea7862d230ad2e1bd4c7d2ff5e9acd53 is the first bad commit >> commit 8d4b6d37ea7862d230ad2e1bd4c7d2ff5e9acd53 >> Author: Ian Rogers <irogers@google.com> >> Date: Wed Aug 23 21:13:28 2023 -0700 >> >> perf pmu: Lazily load sysfs aliases >> >> Don't load sysfs aliases for a PMU when the PMU is first created, defer >> until an alias needs to be found. For the pmu-scan benchmark, average >> core PMU scanning is reduced by 30.8%, and average PMU scanning by >> 12.6%. >> >> Signed-off-by: Ian Rogers <irogers@google.com> >> Cc: Adrian Hunter <adrian.hunter@intel.com> >> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> >> Cc: Gaosheng Cui <cuigaosheng1@huawei.com> >> Cc: Ingo Molnar <mingo@redhat.com> >> Cc: James Clark <james.clark@arm.com> >> Cc: Jing Zhang <renyu.zj@linux.alibaba.com> >> Cc: Jiri Olsa <jolsa@kernel.org> >> Cc: John Garry <john.g.garry@oracle.com> >> Cc: Kajol Jain <kjain@linux.ibm.com> >> Cc: Kan Liang <kan.liang@linux.intel.com> >> Cc: Mark Rutland <mark.rutland@arm.com> >> Cc: Namhyung Kim <namhyung@kernel.org> >> Cc: Peter Zijlstra <peterz@infradead.org> >> Cc: Ravi Bangoria <ravi.bangoria@amd.com> >> Cc: Rob Herring <robh@kernel.org> >> Link: https://lore.kernel.org/r/20230824041330.266337-17-irogers@google.com >> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> >> >> tools/perf/tests/pmu-events.c | 2 ++ >> tools/perf/util/pmu.c | 81 ++++++++++++++++++++++--------------------- >> tools/perf/util/pmu.h | 2 ++ >> 3 files changed, 46 insertions(+), 39 deletions(-) >> [root@kernelqe3 linux]# >> >> It is segfaulting: >> >> 6.2: Parsing of all PMU events from sysfs : >> --- start --- >> test child forked, pid 1202947 >> Using CPUID IBM,2964,400,N96,1.4,002f >> perf: Segmentation fault >> Obtained 16 stack frames. >> perf(dump_stack+0x36) [0x1156dbe] >> perf(sighandler_dump_stack+0x3a) [0x1156e8a] >> [0x3fffd4790b6] >> /lib64/libc.so.6(__strcasecmp+0x42) [0x3ffa889c51a] >> perf() [0x11792ac] >> perf(pmu_events_table__find_event+0x27c) [0x12432fc] >> perf() [0x11777cc] >> perf() [0x1179842] >> perf(perf_pmu__check_alias+0x4f0) [0x1179e98] >> perf(parse_events_add_pmu+0x72c) [0x1128e84] >> perf(parse_events_parse+0x4d4) [0x11754d4] >> perf(__parse_events+0xda) [0x112644a] >> perf() [0x10cecb2] >> perf() [0x10d3264] >> perf() [0x10cb250] >> perf(cmd_test+0x109e) [0x10cc756] >> test child interrupted >> ---- end ---- >> Parse event definition strings subtest 2: FAILED! >> >> >> Starting program: /root/bin/perf test -F 6 >> [Thread debugging using libthread_db enabled] >> Using host libthread_db library "/lib64/libthread_db.so.1". >> 6: Parse event definition strings : >> 6.1: Test event parsing : Ok >> 6.2: Parsing of all PMU events from sysfs : >> Program received signal SIGSEGV, Segmentation fault. >> 0x000003fffcf1c51a in strcasecmp () from /lib64/libc.so.6 >> #0 0x000003fffcf1c51a in strcasecmp () from /lib64/libc.so.6 >> #1 0x000000000123e518 in assign_str (name=0x1487cc3 "l1i_ondrawer_mem_sourced_writes", field=0x141eeba "value", old_str=0x18c12e0, new_str=0x1487d1f "event=0xb1") at util/pmu.c:449 >> #2 0x000000000123e82c in update_alias (pe=0x3ffffff8ac0, table=0x1555cb0 <pmu_events_map+160>, vdata=0x3ffffff8c40) at util/pmu.c:490 >> #3 0x000000000137b9dc in pmu_events_table.find_event () >> #4 0x000000000123ed4e in perf_pmu__new_alias (pmu=0x15ce490, name=0x23c2593 "L1I_ONDRAWER_MEM_SOURCED_WRITES", desc=0x0, val=0x0, val_fd=0x16058a0, pe=0x0) at util/pmu.c:569 >> #5 0x000000000123f370 in pmu_aliases_parse (pmu=0x15ce490) at util/pmu.c:673 >> #6 0x000000000123e3a2 in perf_pmu__find_alias (pmu=0x15ce490, name=0x238eb10 "L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV", load=true) at util/pmu.c:432 >> #7 0x0000000001241bb2 in pmu_find_alias (pmu=0x15ce490, term=0x18409d0) at util/pmu.c:1439 >> #8 0x0000000001241f82 in perf_pmu__check_alias (pmu=0x15ce490, head_terms=0x21b14d0, info=0x3ffffffa238, err=0x3ffffffc4c8) at util/pmu.c:1519 >> #9 0x00000000011bbbd4 in parse_events_add_pmu (parse_state=0x3ffffffc2f0, list=0x21afec0, name=0x21c6430 "cpum_cf", head_config=0x21b14d0, auto_merge_stats=false, loc_=0x3ffffffb4d8) at util/parse-events.c:1351 >> #10 0x000000000123aa4c in parse_events_parse (_parse_state=0x3ffffffc2f0, scanner=0x15b9310) at util/parse-events.y:299 >> #11 0x00000000011bd190 in parse_events__scanner (str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", input=0x0, parse_state=0x3ffffffc2f0) at util/parse-events.c:1738 >> #12 0x00000000011bde00 in __parse_events (evlist=0x15b7030, str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", pmu_filter=0x0, err=0x3ffffffc4c8, fake_pmu=0x0, warn_if_reordered=true) at util/parse-events.c:2010 >> #13 0x0000000001121884 in parse_events (evlist=0x15b7030, str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", err=0x3ffffffc4c8) at /root/git/linux/tools/perf/util/parse-events.h:40 >> #14 0x0000000001134084 in test_event (e=0x3ffffffc5e0) at tests/parse-events.c:2393 >> #15 0x00000000011349ec in test__pmu_events (test=0x156b860 <suite.parse_events>, subtest=1) at tests/parse-events.c:2551 >> #16 0x000000000111f884 in run_test (test=0x156b860 <suite.parse_events>, subtest=1) at tests/builtin-test.c:242 >> #17 0x000000000111fa1a in test_and_print (t=0x156b860 <suite.parse_events>, subtest=1) at tests/builtin-test.c:271 >> #18 0x00000000011203fa in __cmd_test (argc=1, argv=0x3ffffffe5d0, skiplist=0x0) at tests/builtin-test.c:442 >> #19 0x0000000001120cca in cmd_test (argc=1, argv=0x3ffffffe5d0) at tests/builtin-test.c:564 >> #20 0x00000000011713a4 in run_builtin (p=0x1561190 <commands+600>, argc=3, argv=0x3ffffffe5d0) at perf.c:322 >> #21 0x0000000001171712 in handle_internal_command (argc=3, argv=0x3ffffffe5d0) at perf.c:375 >> #22 0x0000000001171920 in run_argv (argcp=0x3ffffffe304, argv=0x3ffffffe2f8) at perf.c:419 >> #23 0x0000000001171ce8 in main (argc=3, argv=0x3ffffffe5d0) at perf.c:535 >> (gdb) >> >> (gdb) fr 1 >> #1 0x000000000123e518 in assign_str (name=0x1487cc3 "l1i_ondrawer_mem_sourced_writes", field=0x141eeba "value", old_str=0x18c12e0, new_str=0x1487d1f "event=0xb1") at util/pmu.c:449 >> 449 if (!new_str || !strcasecmp(*old_str, new_str)) >> (gdb) p new_str >> $1 = 0x1487d1f "event=0xb1" >> (gdb) p *old_str >> $2 = 0x1 <error: Cannot access memory at address 0x1> >> (gdb) p old_str >> $3 = (char **) 0x18c12e0 >> (gdb) > > I can't explain this, how come the line numbers don't agree with? > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/pmu.c?h=tmp.perf-tools-next#n449 > > The values are coming from the json event data. I'd need to see the > generated pmu-events.c. > > Thanks, > Ian Hi Ian, I pulled the lastest tmp.perf-tools-next, and build with JEVENT_ARCH=all on ARM(KunPeng) system. The test 10 also fails. The bad commit maybe is "edb217f perf pmu: Parse sysfs events directly from a file". Hope it helps. #git log --oneline -1 3d63ae8 perf jevents: Use "default_core" for events with no Unit #./perf test 10 10: PMU events : 10.1: PMU event table sanity : Ok 10.2: PMU event map aliases : Ok 10.3: Parsing of PMU event table metrics : FAILED! 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! 10.5: Parsing of metric thresholds with fake PMUs : FAILED! Found metric 'tsx_aborted_cycles' metric expr (max(cycles\-t - cycles\-ct, 0) / cycles if has_event(cycles\-t) else 0) for tsx_aborted_cycles parsing metric: (max(cycles\-t - cycles\-ct, 0) / cycles if has_event(cycles\-t) else 0) perf: Segmentation fault Obtained 16 stack frames. ./perf() [0x514a23] linux-vdso.so.1(+0x7c3) [0xffff8ac847c3] ./perf() [0x52bb08] ./perf() [0x52ffc3] ./perf() [0x4e8cab] ./perf() [0x4ea27b] ./perf() [0x532137] ./perf() [0x53273b] ./perf() [0x533ed7] ./perf() [0x4ed58b] ./perf() [0x530763] ./perf() [0x4e8c47] ./perf() [0x4ea5e3] ./perf() [0x4eaa8f] ./perf() [0x595393] ./perf() [0x593753] test child interrupted ---- end ---- PMU events subtest 3: FAILED! 10.4: Parsing of PMU event table metrics with fake PMUs : --- start --- test child forked, pid 24107 parsing '': '(unc_p_power_state_occupancy.cores_c0 / unc_p_clockticks) * 100.' parsing metric: (unc_p_power_state_occupancy.cores_c0 / unc_p_clockticks) * 100. Using CPUID 0x00000000481fd010 perf: Segmentation fault Obtained 16 stack frames. ./perf() [0x514a23] linux-vdso.so.1(+0x7c3) [0xffff8ac847c3] ./perf() [0x52bb08] ./perf() [0x52ffc3] ./perf() [0x4e8cab] ./perf() [0x4ea27b] ./perf() [0x532137] ./perf() [0x53273b] ./perf() [0x533ed7] ./perf() [0x4ed58b] ./perf() [0x530763] ./perf() [0x4e8c47] ./perf() [0x4ea5e3] ./perf() [0x4a50b3] ./perf() [0x4a5343] ./perf() [0x48fef7] test child interrupted ---- end ---- PMU events subtest 4: FAILED! 10.5: Parsing of metric thresholds with fake PMUs : --- start --- test child forked, pid 24108 parsing 'tma_alloc_restriction': 'tma_alloc_restriction > 0.1' parsing metric: tma_alloc_restriction > 0.1 Using CPUID 0x00000000481fd010 perf: Segmentation fault Obtained 16 stack frames. ./perf() [0x514a23] linux-vdso.so.1(+0x7c3) [0xffff8ac847c3] ./perf() [0x52bb08] ./perf() [0x52ffc3] ./perf() [0x4e8cab] ./perf() [0x4ea27b] ./perf() [0x532137] ./perf() [0x53273b] ./perf() [0x533ed7] ./perf() [0x4ed58b] ./perf() [0x530763] ./perf() [0x4e8c47] ./perf() [0x4ea5e3] ./perf() [0x4a50b3] ./perf() [0x5dec0b] ./perf() [0x5df117] test child interrupted ---- end ---- PMU events subtest 5: FAILED!
Em Tue, Aug 29, 2023 at 05:20:09PM +0800, Jing Zhang escreveu: > 在 2023/8/29 上午8:59, Ian Rogers 写道: > > On Mon, Aug 28, 2023 at 10:53 AM Arnaldo Carvalho de Melo > > I can't explain this, how come the line numbers don't agree with? > > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/perf/util/pmu.c?h=tmp.perf-tools-next#n449 > > > > The values are coming from the json event data. I'd need to see the > > generated pmu-events.c. Its at: http://vger.kernel.org/~acme/perf/pmu-events.c.txt > I pulled the lastest tmp.perf-tools-next, and build with JEVENT_ARCH=all on ARM(KunPeng) system. The test 10 also fails. acme@roc-rk3399-pc:~/git/perf-tools-next$ git log --oneline -10 3d63ae82aa12 (HEAD -> perf-tools-next, quaco/perf-tools-next, perf-tools-next/tmp.perf-tools-next, five/perf-tools-next) perf jevents: Use "default_core" for events with no Unit 686cca7e97eb perf test stat_bpf_counters_cgrp: Enhance perf stat cgroup BPF counter test a77abc103942 perf test shell stat_bpf_counters: Fix test on Intel db02f820603e perf test shell record_bpf_filter: Skip 6.2 kernel c96b84e89f8a libperf: Get rid of attr.id field ee6906d247f1 perf tools: Convert to perf_record_header_attr_id() fd36ca012e0c libperf: Add perf_record_header_attr_id() bb7eb7458e52 perf tools: Handle old data in PERF_RECORD_ATTR 982d23d6e5e6 perf pmus: Skip duplicate PMUs and don't print list suffix by default a700b0367364 perf pmus: Sort pmus by name then suffix acme@roc-rk3399-pc:~/git/perf-tools-next$ Trying to do everything from scratch, to maybe avoid some leftover file from a previous build: acme@roc-rk3399-pc:~/git/perf-tools-next$ for a in tools/* ; do make -C $a clean; done acme@roc-rk3399-pc:~/git/perf-tools-next$ rm -rf /tmp/build/$(basename $(pwd)) ; mkdir -p /tmp/build/$(basename $(pwd)) ; acme@roc-rk3399-pc:~/git/perf-tools-next$ alias m='make -k DEBUG=1 BUILD_BPF_SKEL=1 CORESIGHT=1 O=/tmp/build/perf-tools-next -C tools/perf install-bin && git status && perf test python' Then run the 'm' alias to build it, then: root@roc-rk3399-pc:~# perf test -v 10 |& tail -40 Matched metric-id cpa_cycles to cpa_cycles Matched metric-id cpa_p1_wr_dat to cpa_p1_wr_dat Matched metric-id cpa_p1_rd_dat_64b to cpa_p1_rd_dat_64b Matched metric-id cpa_p1_rd_dat_32b to cpa_p1_rd_dat_32b Result nan test child finished with 0 ---- end ---- PMU events subtest 3: Ok 10.4: Parsing of PMU event table metrics with fake PMUs : --- start --- test child forked, pid 12897 parsing '': '(unc_p_power_state_occupancy.cores_c0 / unc_p_clockticks) * 100.' Using CPUID 0x00000000410fd082 perf: Segmentation fault Obtained 16 stack frames. perf(dump_stack+0x27) [0xaaaade0f19af] perf(sighandler_dump_stack+0x33) [0xaaaade0f1a7f] linux-vdso.so.1(+0x7a7) [0xffffa16967a7] /lib/aarch64-linux-gnu/libc.so.6(__strcasecmp+0x2c) [0xffffa0841dac] perf(+0x2233db) [0xaaaade1233db] perf(+0x22364f) [0xaaaade12364f] perf(+0x343143) [0xaaaade243143] perf(pmu_events_table__find_event+0xa3) [0xaaaade24335f] perf(+0x223a4b) [0xaaaade123a4b] perf(+0x223f6b) [0xaaaade123f6b] perf(+0x2232bb) [0xaaaade1232bb] perf(perf_pmu__have_event+0x33) [0xaaaade1268f3] perf(parse_events_multi_pmu_add+0x127) [0xaaaade0b7077] perf(parse_events_parse+0xf3f) [0xaaaade120917] perf(+0x1b7e6f) [0xaaaade0b7e6f] perf(__parse_events+0xa3) [0xaaaade0b88c7] test child interrupted ---- end ---- PMU events subtest 4: FAILED! 10.5: Parsing of metric thresholds with fake PMUs : --- start --- test child forked, pid 12899 test child finished with 0 ---- end ---- PMU events subtest 5: Ok root@roc-rk3399-pc:~# Doing it in gdb it doesn't crash, then I try with -F in gdb and it also doesn't crash: (gdb) run test -F 10 Starting program: /root/bin/perf test -F 10 [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/aarch64-linux-gnu/libthread_db.so.1". 10: PMU events : 10.1: PMU event table sanity : Ok 10.2: PMU event map aliases : Ok 10.3: Parsing of PMU event table metrics :failed: recursion detected for M1 failed: recursion detected for M2 failed: recursion detected for M3 Ok 10.4: Parsing of PMU event table metrics with fake PMUs : Ok 10.5: Parsing of metric thresholds with fake PMUs : Ok [Inferior 1 (process 12925) exited normally] (gdb) root@roc-rk3399-pc:~# perf test -F 10 10: PMU events : 10.1: PMU event table sanity : Ok 10.2: PMU event map aliases : Ok 10.3: Parsing of PMU event table metrics :failed: recursion detected for M1 failed: recursion detected for M2 failed: recursion detected for M3 Ok 10.4: Parsing of PMU event table metrics with fake PMUs : Ok 10.5: Parsing of metric thresholds with fake PMUs : Ok root@roc-rk3399-pc:~# root@roc-rk3399-pc:~# perf test -v -F 10 |& grep ": Ok" PMU events subtest 1: Ok PMU events subtest 2: Ok PMU events subtest 3: Ok PMU events subtest 4: Ok PMU events subtest 5: Ok root@roc-rk3399-pc:~# Will continue investigating later... - Arnaldo > The bad commit maybe is "edb217f perf pmu: Parse sysfs events directly from a file". Hope it helps. > > #git log --oneline -1 > 3d63ae8 perf jevents: Use "default_core" for events with no Unit > > #./perf test 10 > 10: PMU events : > 10.1: PMU event table sanity : Ok > 10.2: PMU event map aliases : Ok > 10.3: Parsing of PMU event table metrics : FAILED! > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > 10.5: Parsing of metric thresholds with fake PMUs : FAILED! > Found metric 'tsx_aborted_cycles' > metric expr (max(cycles\-t - cycles\-ct, 0) / cycles if has_event(cycles\-t) else 0) for tsx_aborted_cycles > parsing metric: (max(cycles\-t - cycles\-ct, 0) / cycles if has_event(cycles\-t) else 0) > perf: Segmentation fault > Obtained 16 stack frames. > ./perf() [0x514a23] > linux-vdso.so.1(+0x7c3) [0xffff8ac847c3] > ./perf() [0x52bb08] > ./perf() [0x52ffc3] > ./perf() [0x4e8cab] > ./perf() [0x4ea27b] > ./perf() [0x532137] > ./perf() [0x53273b] > ./perf() [0x533ed7] > ./perf() [0x4ed58b] > ./perf() [0x530763] > ./perf() [0x4e8c47] > ./perf() [0x4ea5e3] > ./perf() [0x4eaa8f] > ./perf() [0x595393] > ./perf() [0x593753] > test child interrupted > ---- end ---- > PMU events subtest 3: FAILED! > 10.4: Parsing of PMU event table metrics with fake PMUs : > --- start --- > test child forked, pid 24107 > parsing '': '(unc_p_power_state_occupancy.cores_c0 / unc_p_clockticks) * 100.' > parsing metric: (unc_p_power_state_occupancy.cores_c0 / unc_p_clockticks) * 100. > Using CPUID 0x00000000481fd010 > perf: Segmentation fault > Obtained 16 stack frames. > ./perf() [0x514a23] > linux-vdso.so.1(+0x7c3) [0xffff8ac847c3] > ./perf() [0x52bb08] > ./perf() [0x52ffc3] > ./perf() [0x4e8cab] > ./perf() [0x4ea27b] > ./perf() [0x532137] > ./perf() [0x53273b] > ./perf() [0x533ed7] > ./perf() [0x4ed58b] > ./perf() [0x530763] > ./perf() [0x4e8c47] > ./perf() [0x4ea5e3] > ./perf() [0x4a50b3] > ./perf() [0x4a5343] > ./perf() [0x48fef7] > test child interrupted > ---- end ---- > PMU events subtest 4: FAILED! > 10.5: Parsing of metric thresholds with fake PMUs : > --- start --- > test child forked, pid 24108 > parsing 'tma_alloc_restriction': 'tma_alloc_restriction > 0.1' > parsing metric: tma_alloc_restriction > 0.1 > Using CPUID 0x00000000481fd010 > perf: Segmentation fault > Obtained 16 stack frames. > ./perf() [0x514a23] > linux-vdso.so.1(+0x7c3) [0xffff8ac847c3] > ./perf() [0x52bb08] > ./perf() [0x52ffc3] > ./perf() [0x4e8cab] > ./perf() [0x4ea27b] > ./perf() [0x532137] > ./perf() [0x53273b] > ./perf() [0x533ed7] > ./perf() [0x4ed58b] > ./perf() [0x530763] > ./perf() [0x4e8c47] > ./perf() [0x4ea5e3] > ./perf() [0x4a50b3] > ./perf() [0x5dec0b] > ./perf() [0x5df117] > test child interrupted > ---- end ---- > PMU events subtest 5: FAILED! -- - Arnaldo
Em Mon, Aug 28, 2023 at 02:53:32PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Mon, Aug 28, 2023 at 02:44:53PM -0300, Arnaldo Carvalho de Melo escreveu: > > Em Fri, Aug 25, 2023 at 03:56:54PM -0700, Ian Rogers escreveu: > > > On Fri, Aug 25, 2023 at 1:56 PM Arnaldo Carvalho de Melo > > > <acme@kernel.org> wrote: > > > > > > > > Em Fri, Aug 25, 2023 at 04:39:22PM +0200, Thomas Richter escreveu: > > > > > On 8/25/23 15:14, Ian Rogers wrote: > > > > > > On Fri, Aug 25, 2023 at 1:20 AM Thomas Richter <tmricht@linux.ibm.com> wrote: > > > > > > > > > >> On 8/24/23 15:59, Arnaldo Carvalho de Melo wrote: > > > > > >>> Em Wed, Aug 23, 2023 at 09:13:18PM -0700, Ian Rogers escreveu: > > > > > >>>> Rather than scanning all PMUs for a counter name, scan the PMU > > > > > >>>> associated with the evsel of the sample. This is done to remove a > > > > > >>>> dependence on pmu-events.h. > > > > > > > > > >>> I'm applying this one, and CCing the S/390 developers so that they can > > > > > >>> try this and maybe provide an Acked-by/Tested-by, > > > > > > > > > >> I have downloaded this patch set of 18 patches (using b4), but they do not > > > > > >> apply on my git tree. > > > > > > > > > >> Which git branch do I have to use to test this. Thanks a lot. > > > > > > > > > > the changes are in the perf-tools-next tree: > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/ > > > > > > > > > Unfurtunately this patch set fails again on s390. > > > > > Here is the test output from the current 6.5.0rc7 kernel: > > > > > > > > > > # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > > > 6: Parse event definition strings : > > > > > 6.1: Test event parsing : Ok > > > > > 6.2: Parsing of all PMU events from sysfs : Ok > > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > > 6.5: Parsing of aliased events : Ok > > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > > 10: PMU events : > > > > > 10.1: PMU event table sanity : Ok > > > > > 10.2: PMU event map aliases : Ok > > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > > 95: perf all metricgroups test : Ok > > > > > 96: perf all metrics test : Ok > > > > > # > > > > > > > > > > This looks good. > > > > > > > > Reproduced: > > > > > > > > # grep -E vendor_id\|^processor -m2 /proc/cpuinfo > > > > vendor_id : IBM/S390 > > > > processor 0: version = 00, identification = 1A33E8, machine = 2964 > > > > # > > > > # perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > > 6: Parse event definition strings : > > > > 6.1: Test event parsing : Ok > > > > 6.2: Parsing of all PMU events from sysfs : Ok > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > 6.5: Parsing of aliased events : Ok > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > 10: PMU events : > > > > 10.1: PMU event table sanity : Ok > > > > 10.2: PMU event map aliases : Ok > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > 95: perf all metricgroups test : Ok > > > > 96: perf all metrics test : Ok > > > > # perf -v > > > > perf version 6.5.rc7.g6f0edbb833ec > > > > # > > > > > > > > > However when I use the check-out from perf-tools-next, I get this output: > > > > > # ./perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > > > 6: Parse event definition strings : > > > > > 6.1: Test event parsing : Ok > > > > > 6.2: Parsing of all PMU events from sysfs : FAILED! > > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > > 6.5: Parsing of aliased events : FAILED! > > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > > 10: PMU events : > > > > > 10.1: PMU event table sanity : Ok > > > > > 10.2: PMU event map aliases : FAILED! > > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > > 93: perf all metricgroups test : FAILED! > > > > > 94: perf all metrics test : FAILED! > > > > > # > > > > > > > > > > So some tests are failing again. > > > > > > > > > > I am out for the next two weeks, Sumanth Korikkar (on to list) might be able to help. > > > > > Thanks a lot. > > > > > > > > [root@kernelqe3 linux]# git checkout perf-tools-next > > > > git Switched to branch 'perf-tools-next' > > > > Your branch is up to date with 'perf-tools-next/perf-tools-next'. > > > > [root@kernelqe3 linux]# git log --oneline -5 > > > > eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc > > > > f208b2c6f984 (perf-tools-next/tmp.perf-tools-next) perf scripts python gecko: Launch the profiler UI on the default browser with the appropriate URL > > > > 43803cb16f99 perf scripts python: Add support for input args in gecko script > > > > f85d120c46e7 perf jevents: Sort strings in the big C string to reduce faults > > > > 8d4b6d37ea78 perf pmu: Lazily load sysfs aliases > > > > [root@kernelqe3 linux]# make BUILD_BPF_SKEL=1 -C tools/perf O=/tmp/build/perf install-bin > > > > > > > > [root@kernelqe3 linux]# perf -v > > > > perf version 6.5.rc5.geeb6b12992c4 > > > > [root@kernelqe3 linux]# git log --oneline -1 > > > > eeb6b12992c4 (HEAD -> perf-tools-next, perf-tools-next/perf-tools-next) perf jevents: Don't append Unit to desc > > > > [root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > > > 6: Parse event definition strings : > > > > 6.1: Test event parsing : Ok > > > > 6.2: Parsing of all PMU events from sysfs : FAILED! > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > 6.5: Parsing of aliased events : FAILED! > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > 10: PMU events : > > > > 10.1: PMU event table sanity : Ok > > > > 10.2: PMU event map aliases : FAILED! > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > 93: perf all metricgroups test : FAILED! > > > > 94: perf all metrics test : FAILED! > > > > [root@kernelqe3 linux]# > > > > > > > > Bisecting the first problem: > > > > > > > > 10.2: PMU event map aliases : FAILED! > > > > > > > > make: Leaving directory '/root/git/linux/tools/perf' > > > > 6: Parse event definition strings : > > > > 6.1: Test event parsing : Ok > > > > 6.2: Parsing of all PMU events from sysfs : Ok > > > > 6.3: Parsing of given PMU events from sysfs : Ok > > > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > > > 6.5: Parsing of aliased events : Ok > > > > 6.6: Parsing of terms (event modifiers) : Ok > > > > 10: PMU events : > > > > 10.1: PMU event table sanity : Ok > > > > 10.2: PMU event map aliases : FAILED! > > > > 10.3: Parsing of PMU event table metrics : Ok > > > > 10.4: Parsing of PMU event table metrics with fake PMUs : Ok > > > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > > > 93: perf all metricgroups test : Ok > > > > 94: perf all metrics test : Ok > > > > [root@kernelqe3 linux]# git bisect bad > > > > 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 is the first bad commit > > > > commit 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 > > > > Author: Ian Rogers <irogers@google.com> > > > > Date: Wed Aug 23 21:13:16 2023 -0700 > > > > > > > > perf jevents: Group events by PMU > > > > > > > > Prior to this change a cpuid would map to a list of events where the PMU > > > > would be encoded alongside the event information. This change breaks > > > > apart each group of events so that there is a group per PMU. A new table > > > > is added with the PMU's name and the list of events, the original table > > > > now holding an array of these per PMU tables. > > > > > > > > These changes are to make it easier to get per PMU information about > > > > events, rather than the current approach of scanning all events. The > > > > perf binary size with BPF skeletons on x86 is reduced by about 1%. The > > > > unidentified PMU is now always expanded to "cpu". > > > > > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > > > Cc: Adrian Hunter <adrian.hunter@intel.com> > > > > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> > > > > Cc: Gaosheng Cui <cuigaosheng1@huawei.com> > > > > Cc: Ingo Molnar <mingo@redhat.com> > > > > Cc: James Clark <james.clark@arm.com> > > > > Cc: Jing Zhang <renyu.zj@linux.alibaba.com> > > > > Cc: Jiri Olsa <jolsa@kernel.org> > > > > Cc: John Garry <john.g.garry@oracle.com> > > > > Cc: Kajol Jain <kjain@linux.ibm.com> > > > > Cc: Kan Liang <kan.liang@linux.intel.com> > > > > Cc: Mark Rutland <mark.rutland@arm.com> > > > > Cc: Namhyung Kim <namhyung@kernel.org> > > > > Cc: Peter Zijlstra <peterz@infradead.org> > > > > Cc: Ravi Bangoria <ravi.bangoria@amd.com> > > > > Cc: Rob Herring <robh@kernel.org> > > > > Link: https://lore.kernel.org/r/20230824041330.266337-5-irogers@google.com > > > > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > > > > > > > > tools/perf/pmu-events/jevents.py | 181 +++++++++++++++++++++++++++++---------- > > > > tools/perf/tests/pmu-events.c | 30 ++++--- > > > > 2 files changed, 154 insertions(+), 57 deletions(-) > > > > [root@kernelqe3 linux]# > > > > > > > > > > This change defaulted events without a specified PMU to being for the > > > PMU 'cpu', so that events in pmu-events.c were associated with a PMU > > > and we could find per-PMU information easily. The test events have no > > > PMU and so this has broken s390 where the the PMU should be "cpum_cf". > > > It has probably also broken x86 hybrid and arm where their default PMU > > > isn't cpu. I'll work on a fix, but the problem will be limited to the > > > test. > > > > So, with your "default_core" branche we go to: > > > > [root@kernelqe3 linux]# perf test 10 > > 10: PMU events : > > 10.1: PMU event table sanity : Ok > > 10.2: PMU event map aliases : Ok > > 10.3: Parsing of PMU event table metrics : Ok > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > [root@kernelqe3 linux]# perf --version > > perf version 6.5.rc5.g3d63ae82aa12 > > [root@kernelqe3 linux]# > > > > The other tests: > > > > [root@kernelqe3 linux]# perf --version > > perf version 6.5.rc5.g3d63ae82aa12 > > [root@kernelqe3 linux]# perf test 6 10 'perf all metricgroups test' 'perf all metrics test' > > 6: Parse event definition strings : > > 6.1: Test event parsing : Ok > > 6.2: Parsing of all PMU events from sysfs : FAILED! > > 6.3: Parsing of given PMU events from sysfs : Ok > > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > > 6.5: Parsing of aliased events : FAILED! > > 6.6: Parsing of terms (event modifiers) : Ok > > 10: PMU events : > > 10.1: PMU event table sanity : Ok > > 10.2: PMU event map aliases : Ok > > 10.3: Parsing of PMU event table metrics : Ok > > 10.4: Parsing of PMU event table metrics with fake PMUs : FAILED! > > 10.5: Parsing of metric thresholds with fake PMUs : Ok > > 93: perf all metricgroups test : FAILED! > > 94: perf all metrics test : FAILED! > > [root@kernelqe3 linux]# > > > > Trying to bisect it now. > > make: Leaving directory '/root/git/linux/tools/perf' > [root@kernelqe3 linux]# perf test 6 > 6: Parse event definition strings : > 6.1: Test event parsing : Ok > 6.2: Parsing of all PMU events from sysfs : FAILED! > 6.3: Parsing of given PMU events from sysfs : Ok > 6.4: Parsing of aliased events from sysfs : Skip (no aliases in sysfs) > 6.5: Parsing of aliased events : FAILED! > 6.6: Parsing of terms (event modifiers) : Ok > [root@kernelqe3 linux]# git bisect bad > 8d4b6d37ea7862d230ad2e1bd4c7d2ff5e9acd53 is the first bad commit > commit 8d4b6d37ea7862d230ad2e1bd4c7d2ff5e9acd53 > Author: Ian Rogers <irogers@google.com> > Date: Wed Aug 23 21:13:28 2023 -0700 > > perf pmu: Lazily load sysfs aliases > > Don't load sysfs aliases for a PMU when the PMU is first created, defer > until an alias needs to be found. For the pmu-scan benchmark, average > core PMU scanning is reduced by 30.8%, and average PMU scanning by > 12.6%. > > Signed-off-by: Ian Rogers <irogers@google.com> > Cc: Adrian Hunter <adrian.hunter@intel.com> > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> > Cc: Gaosheng Cui <cuigaosheng1@huawei.com> > Cc: Ingo Molnar <mingo@redhat.com> > Cc: James Clark <james.clark@arm.com> > Cc: Jing Zhang <renyu.zj@linux.alibaba.com> > Cc: Jiri Olsa <jolsa@kernel.org> > Cc: John Garry <john.g.garry@oracle.com> > Cc: Kajol Jain <kjain@linux.ibm.com> > Cc: Kan Liang <kan.liang@linux.intel.com> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Namhyung Kim <namhyung@kernel.org> > Cc: Peter Zijlstra <peterz@infradead.org> > Cc: Ravi Bangoria <ravi.bangoria@amd.com> > Cc: Rob Herring <robh@kernel.org> > Link: https://lore.kernel.org/r/20230824041330.266337-17-irogers@google.com > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > > tools/perf/tests/pmu-events.c | 2 ++ > tools/perf/util/pmu.c | 81 ++++++++++++++++++++++--------------------- > tools/perf/util/pmu.h | 2 ++ > 3 files changed, 46 insertions(+), 39 deletions(-) > [root@kernelqe3 linux]# > > It is segfaulting: > > 6.2: Parsing of all PMU events from sysfs : > --- start --- > test child forked, pid 1202947 > Using CPUID IBM,2964,400,N96,1.4,002f > perf: Segmentation fault > Obtained 16 stack frames. > perf(dump_stack+0x36) [0x1156dbe] > perf(sighandler_dump_stack+0x3a) [0x1156e8a] > [0x3fffd4790b6] > /lib64/libc.so.6(__strcasecmp+0x42) [0x3ffa889c51a] > perf() [0x11792ac] > perf(pmu_events_table__find_event+0x27c) [0x12432fc] > perf() [0x11777cc] > perf() [0x1179842] > perf(perf_pmu__check_alias+0x4f0) [0x1179e98] > perf(parse_events_add_pmu+0x72c) [0x1128e84] > perf(parse_events_parse+0x4d4) [0x11754d4] > perf(__parse_events+0xda) [0x112644a] > perf() [0x10cecb2] > perf() [0x10d3264] > perf() [0x10cb250] > perf(cmd_test+0x109e) [0x10cc756] > test child interrupted > ---- end ---- > Parse event definition strings subtest 2: FAILED! > > > Starting program: /root/bin/perf test -F 6 > [Thread debugging using libthread_db enabled] > Using host libthread_db library "/lib64/libthread_db.so.1". > 6: Parse event definition strings : > 6.1: Test event parsing : Ok > 6.2: Parsing of all PMU events from sysfs : > Program received signal SIGSEGV, Segmentation fault. > 0x000003fffcf1c51a in strcasecmp () from /lib64/libc.so.6 > #0 0x000003fffcf1c51a in strcasecmp () from /lib64/libc.so.6 > #1 0x000000000123e518 in assign_str (name=0x1487cc3 "l1i_ondrawer_mem_sourced_writes", field=0x141eeba "value", old_str=0x18c12e0, new_str=0x1487d1f "event=0xb1") at util/pmu.c:449 > #2 0x000000000123e82c in update_alias (pe=0x3ffffff8ac0, table=0x1555cb0 <pmu_events_map+160>, vdata=0x3ffffff8c40) at util/pmu.c:490 > #3 0x000000000137b9dc in pmu_events_table.find_event () > #4 0x000000000123ed4e in perf_pmu__new_alias (pmu=0x15ce490, name=0x23c2593 "L1I_ONDRAWER_MEM_SOURCED_WRITES", desc=0x0, val=0x0, val_fd=0x16058a0, pe=0x0) at util/pmu.c:569 > #5 0x000000000123f370 in pmu_aliases_parse (pmu=0x15ce490) at util/pmu.c:673 > #6 0x000000000123e3a2 in perf_pmu__find_alias (pmu=0x15ce490, name=0x238eb10 "L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV", load=true) at util/pmu.c:432 > #7 0x0000000001241bb2 in pmu_find_alias (pmu=0x15ce490, term=0x18409d0) at util/pmu.c:1439 > #8 0x0000000001241f82 in perf_pmu__check_alias (pmu=0x15ce490, head_terms=0x21b14d0, info=0x3ffffffa238, err=0x3ffffffc4c8) at util/pmu.c:1519 > #9 0x00000000011bbbd4 in parse_events_add_pmu (parse_state=0x3ffffffc2f0, list=0x21afec0, name=0x21c6430 "cpum_cf", head_config=0x21b14d0, auto_merge_stats=false, loc_=0x3ffffffb4d8) at util/parse-events.c:1351 > #10 0x000000000123aa4c in parse_events_parse (_parse_state=0x3ffffffc2f0, scanner=0x15b9310) at util/parse-events.y:299 > #11 0x00000000011bd190 in parse_events__scanner (str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", input=0x0, parse_state=0x3ffffffc2f0) at util/parse-events.c:1738 > #12 0x00000000011bde00 in __parse_events (evlist=0x15b7030, str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", pmu_filter=0x0, err=0x3ffffffc4c8, fake_pmu=0x0, warn_if_reordered=true) at util/parse-events.c:2010 > #13 0x0000000001121884 in parse_events (evlist=0x15b7030, str=0x3ffffffc68a "cpum_cf/event=L1D_OFFDRAWER_SCOL_L3_SOURCED_WRITES_IV/u", err=0x3ffffffc4c8) at /root/git/linux/tools/perf/util/parse-events.h:40 > #14 0x0000000001134084 in test_event (e=0x3ffffffc5e0) at tests/parse-events.c:2393 > #15 0x00000000011349ec in test__pmu_events (test=0x156b860 <suite.parse_events>, subtest=1) at tests/parse-events.c:2551 > #16 0x000000000111f884 in run_test (test=0x156b860 <suite.parse_events>, subtest=1) at tests/builtin-test.c:242 > #17 0x000000000111fa1a in test_and_print (t=0x156b860 <suite.parse_events>, subtest=1) at tests/builtin-test.c:271 > #18 0x00000000011203fa in __cmd_test (argc=1, argv=0x3ffffffe5d0, skiplist=0x0) at tests/builtin-test.c:442 > #19 0x0000000001120cca in cmd_test (argc=1, argv=0x3ffffffe5d0) at tests/builtin-test.c:564 > #20 0x00000000011713a4 in run_builtin (p=0x1561190 <commands+600>, argc=3, argv=0x3ffffffe5d0) at perf.c:322 > #21 0x0000000001171712 in handle_internal_command (argc=3, argv=0x3ffffffe5d0) at perf.c:375 > #22 0x0000000001171920 in run_argv (argcp=0x3ffffffe304, argv=0x3ffffffe2f8) at perf.c:419 > #23 0x0000000001171ce8 in main (argc=3, argv=0x3ffffffe5d0) at perf.c:535 > (gdb) > > (gdb) fr 1 > #1 0x000000000123e518 in assign_str (name=0x1487cc3 "l1i_ondrawer_mem_sourced_writes", field=0x141eeba "value", old_str=0x18c12e0, new_str=0x1487d1f "event=0xb1") at util/pmu.c:449 > 449 if (!new_str || !strcasecmp(*old_str, new_str)) > (gdb) p new_str > $1 = 0x1487d1f "event=0xb1" > (gdb) p *old_str > $2 = 0x1 <error: Cannot access memory at address 0x1> > (gdb) p old_str > $3 = (char **) 0x18c12e0 > (gdb) Same thing on a hybrid ARM system: 6.5: Parsing of aliased events : --- start --- test child forked, pid 49658 Using CPUID 0x00000000410fd082 perf: Segmentation fault Obtained 16 stack frames. perf(sighandler_dump_stack+0x43) [0xaaaad58f5047] linux-vdso.so.1(+0x7a7) [0xffff978fb7a7] /lib/aarch64-linux-gnu/libc.so.6(__strcasecmp+0x2c) [0xffff96aa1dac] perf(+0x19378b) [0xaaaad591378b] perf(pmu_events_table__find_event+0x8b) [0xaaaad59d74cb] perf(+0x193f87) [0xaaaad5913f87] perf(+0x19433b) [0xaaaad591433b] perf(perf_pmu__have_event+0xd3) [0xaaaad5915c17] perf(parse_events_multi_pmu_add+0x137) [0xaaaad58cb787] perf(parse_events_parse+0x1247) [0xaaaad5912627] perf(+0x146c27) [0xaaaad58c6c27] perf(__parse_events+0x7b) [0xaaaad58c86bb] perf(+0xeed23) [0xaaaad586ed23] perf(+0xeb97b) [0xaaaad586b97b] perf(cmd_test+0x747) [0xaaaad586c477] perf(+0x11e64b) [0xaaaad589e64b] test child interrupted ---- end ---- Parse event definition strings subtest 5: FAILED! 6.6: Parsing of terms (event modifiers) : --- start --- test child forked, pid 49660 running test 0 'config=10,config1,config2=3,config3=4,umask=1,read,r0xead' test child finished with 0 ---- end ---- Parse event definition strings subtest 6: Ok root@roc-rk3399-pc:~# grep -i "model name" /proc/cpuinfo root@roc-rk3399-pc:~# grep -i "model" /proc/cpuinfo root@roc-rk3399-pc:~# cat /proc/cpuinfo processor : 0 BogoMIPS : 48.00 Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid CPU implementer : 0x41 CPU architecture: 8 CPU variant : 0x0 CPU part : 0xd03 CPU revision : 4 processor : 1 BogoMIPS : 48.00 Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid CPU implementer : 0x41 CPU architecture: 8 CPU variant : 0x0 CPU part : 0xd03 CPU revision : 4 processor : 2 BogoMIPS : 48.00 Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid CPU implementer : 0x41 CPU architecture: 8 CPU variant : 0x0 CPU part : 0xd03 CPU revision : 4 processor : 3 BogoMIPS : 48.00 Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid CPU implementer : 0x41 CPU architecture: 8 CPU variant : 0x0 CPU part : 0xd03 CPU revision : 4 processor : 4 BogoMIPS : 48.00 Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid CPU implementer : 0x41 CPU architecture: 8 CPU variant : 0x0 CPU part : 0xd08 CPU revision : 2 processor : 5 BogoMIPS : 48.00 Features : fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid CPU implementer : 0x41 CPU architecture: 8 CPU variant : 0x0 CPU part : 0xd08 CPU revision : 2 root@roc-rk3399-pc:~#
Em Fri, Aug 25, 2023 at 03:56:54PM -0700, Ian Rogers escreveu: > On Fri, Aug 25, 2023 at 1:56 PM Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > [root@kernelqe3 linux]# git bisect bad > > 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 is the first bad commit > > commit 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 > > Author: Ian Rogers <irogers@google.com> > > Date: Wed Aug 23 21:13:16 2023 -0700 > > > > perf jevents: Group events by PMU > > > > Prior to this change a cpuid would map to a list of events where the PMU > > would be encoded alongside the event information. This change breaks > > apart each group of events so that there is a group per PMU. A new table > > is added with the PMU's name and the list of events, the original table > > now holding an array of these per PMU tables. > > > > These changes are to make it easier to get per PMU information about > > events, rather than the current approach of scanning all events. The > > perf binary size with BPF skeletons on x86 is reduced by about 1%. The > > unidentified PMU is now always expanded to "cpu". > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > Cc: Adrian Hunter <adrian.hunter@intel.com> > > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> > > Cc: Gaosheng Cui <cuigaosheng1@huawei.com> > > Cc: Ingo Molnar <mingo@redhat.com> > > Cc: James Clark <james.clark@arm.com> > > Cc: Jing Zhang <renyu.zj@linux.alibaba.com> > > Cc: Jiri Olsa <jolsa@kernel.org> > > Cc: John Garry <john.g.garry@oracle.com> > > Cc: Kajol Jain <kjain@linux.ibm.com> > > Cc: Kan Liang <kan.liang@linux.intel.com> > > Cc: Mark Rutland <mark.rutland@arm.com> > > Cc: Namhyung Kim <namhyung@kernel.org> > > Cc: Peter Zijlstra <peterz@infradead.org> > > Cc: Ravi Bangoria <ravi.bangoria@amd.com> > > Cc: Rob Herring <robh@kernel.org> > > Link: https://lore.kernel.org/r/20230824041330.266337-5-irogers@google.com > > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > > > > tools/perf/pmu-events/jevents.py | 181 +++++++++++++++++++++++++++++---------- > > tools/perf/tests/pmu-events.c | 30 ++++--- > > 2 files changed, 154 insertions(+), 57 deletions(-) > > [root@kernelqe3 linux]# > > This change defaulted events without a specified PMU to being for the > PMU 'cpu', so that events in pmu-events.c were associated with a PMU > and we could find per-PMU information easily. The test events have no > PMU and so this has broken s390 where the the PMU should be "cpum_cf". > It has probably also broken x86 hybrid and arm where their default PMU > isn't cpu. I'll work on a fix, but the problem will be limited to the > test. Ok, please use tmp.perf-tools-next as the basis for your work, that is what I have right now. - Arnaldo
On Fri, Aug 25, 2023 at 6:38 PM Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > Em Fri, Aug 25, 2023 at 03:56:54PM -0700, Ian Rogers escreveu: > > On Fri, Aug 25, 2023 at 1:56 PM Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > > [root@kernelqe3 linux]# git bisect bad > > > 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 is the first bad commit > > > commit 2e255b4f9f41f137d9e3dc4fae3603a9c2c3dd28 > > > Author: Ian Rogers <irogers@google.com> > > > Date: Wed Aug 23 21:13:16 2023 -0700 > > > > > > perf jevents: Group events by PMU > > > > > > Prior to this change a cpuid would map to a list of events where the PMU > > > would be encoded alongside the event information. This change breaks > > > apart each group of events so that there is a group per PMU. A new table > > > is added with the PMU's name and the list of events, the original table > > > now holding an array of these per PMU tables. > > > > > > These changes are to make it easier to get per PMU information about > > > events, rather than the current approach of scanning all events. The > > > perf binary size with BPF skeletons on x86 is reduced by about 1%. The > > > unidentified PMU is now always expanded to "cpu". > > > > > > Signed-off-by: Ian Rogers <irogers@google.com> > > > Cc: Adrian Hunter <adrian.hunter@intel.com> > > > Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> > > > Cc: Gaosheng Cui <cuigaosheng1@huawei.com> > > > Cc: Ingo Molnar <mingo@redhat.com> > > > Cc: James Clark <james.clark@arm.com> > > > Cc: Jing Zhang <renyu.zj@linux.alibaba.com> > > > Cc: Jiri Olsa <jolsa@kernel.org> > > > Cc: John Garry <john.g.garry@oracle.com> > > > Cc: Kajol Jain <kjain@linux.ibm.com> > > > Cc: Kan Liang <kan.liang@linux.intel.com> > > > Cc: Mark Rutland <mark.rutland@arm.com> > > > Cc: Namhyung Kim <namhyung@kernel.org> > > > Cc: Peter Zijlstra <peterz@infradead.org> > > > Cc: Ravi Bangoria <ravi.bangoria@amd.com> > > > Cc: Rob Herring <robh@kernel.org> > > > Link: https://lore.kernel.org/r/20230824041330.266337-5-irogers@google.com > > > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > > > > > > tools/perf/pmu-events/jevents.py | 181 +++++++++++++++++++++++++++++---------- > > > tools/perf/tests/pmu-events.c | 30 ++++--- > > > 2 files changed, 154 insertions(+), 57 deletions(-) > > > [root@kernelqe3 linux]# > > > > This change defaulted events without a specified PMU to being for the > > PMU 'cpu', so that events in pmu-events.c were associated with a PMU > > and we could find per-PMU information easily. The test events have no > > PMU and so this has broken s390 where the the PMU should be "cpum_cf". > > It has probably also broken x86 hybrid and arm where their default PMU > > isn't cpu. I'll work on a fix, but the problem will be limited to the > > test. > > Ok, please use tmp.perf-tools-next as the basis for your work, that is > what I have right now. Thanks. I repro-ed the PMU events failure on alderlake and the patch I sent: https://lore.kernel.org/lkml/20230826062203.1058041-1-irogers@google.com/ addressed it. I didn't repro the sysfs issue and so it may be resolved by this too, but it may be a different issue. There may also be more issues specific to s390. I'm hopeful the patch fixes them but please give it a go. Thanks, Ian > - Arnaldo
On Thu, Aug 24, 2023 at 7:00 AM Arnaldo Carvalho de Melo
<acme@kernel.org> wrote:
>
> Em Wed, Aug 23, 2023 at 09:13:18PM -0700, Ian Rogers escreveu:
> > Rather than scanning all PMUs for a counter name, scan the PMU
> > associated with the evsel of the sample. This is done to remove a
> > dependence on pmu-events.h.
>
> I'm applying this one, and CCing the S/390 developers so that they can
> try this and maybe provide an Acked-by/Tested-by,
Thanks Arnaldo! You're right that I wasn't able to test this s390
change on an s390.
Ian
> - Arnaldo
>
> > Signed-off-by: Ian Rogers <irogers@google.com>
> > ---
> > tools/perf/util/s390-sample-raw.c | 50 ++++++++++++++++---------------
> > 1 file changed, 26 insertions(+), 24 deletions(-)
> >
> > diff --git a/tools/perf/util/s390-sample-raw.c b/tools/perf/util/s390-sample-raw.c
> > index 91330c874170..dc1ed3e95d4d 100644
> > --- a/tools/perf/util/s390-sample-raw.c
> > +++ b/tools/perf/util/s390-sample-raw.c
> > @@ -27,7 +27,7 @@
> > #include "color.h"
> > #include "sample-raw.h"
> > #include "s390-cpumcf-kernel.h"
> > -#include "pmu-events/pmu-events.h"
> > +#include "util/pmu.h"
> > #include "util/sample.h"
> >
> > static size_t ctrset_size(struct cf_ctrset_entry *set)
> > @@ -132,56 +132,57 @@ static int get_counterset_start(int setnr)
> >
> > struct get_counter_name_data {
> > int wanted;
> > - const char *result;
> > + char *result;
> > };
> >
> > -static int get_counter_name_callback(const struct pmu_event *evp,
> > - const struct pmu_events_table *table __maybe_unused,
> > - void *vdata)
> > +static int get_counter_name_callback(void *vdata, struct pmu_event_info *info)
> > {
> > struct get_counter_name_data *data = vdata;
> > int rc, event_nr;
> > + const char *event_str;
> >
> > - if (evp->name == NULL || evp->event == NULL)
> > + if (info->str == NULL)
> > return 0;
> > - rc = sscanf(evp->event, "event=%x", &event_nr);
> > +
> > + event_str = strstr(info->str, "event=");
> > + if (!event_str)
> > + return 0;
> > +
> > + rc = sscanf(event_str, "event=%x", &event_nr);
> > if (rc == 1 && event_nr == data->wanted) {
> > - data->result = evp->name;
> > + data->result = strdup(info->name);
> > return 1; /* Terminate the search. */
> > }
> > return 0;
> > }
> >
> > -/* Scan the PMU table and extract the logical name of a counter from the
> > - * PMU events table. Input is the counter set and counter number with in the
> > - * set. Construct the event number and use this as key. If they match return
> > - * the name of this counter.
> > +/* Scan the PMU and extract the logical name of a counter from the event. Input
> > + * is the counter set and counter number with in the set. Construct the event
> > + * number and use this as key. If they match return the name of this counter.
> > * If no match is found a NULL pointer is returned.
> > */
> > -static const char *get_counter_name(int set, int nr, const struct pmu_events_table *table)
> > +static char *get_counter_name(int set, int nr, struct perf_pmu *pmu)
> > {
> > struct get_counter_name_data data = {
> > .wanted = get_counterset_start(set) + nr,
> > .result = NULL,
> > };
> >
> > - if (!table)
> > + if (!pmu)
> > return NULL;
> >
> > - pmu_events_table__for_each_event(table, get_counter_name_callback, &data);
> > + perf_pmu__for_each_event(pmu, &data, get_counter_name_callback);
> > return data.result;
> > }
> >
> > -static void s390_cpumcfdg_dump(struct perf_sample *sample)
> > +static void s390_cpumcfdg_dump(struct perf_pmu *pmu, struct perf_sample *sample)
> > {
> > size_t i, len = sample->raw_size, offset = 0;
> > unsigned char *buf = sample->raw_data;
> > const char *color = PERF_COLOR_BLUE;
> > struct cf_ctrset_entry *cep, ce;
> > - const struct pmu_events_table *table;
> > u64 *p;
> >
> > - table = pmu_events_table__find();
> > while (offset < len) {
> > cep = (struct cf_ctrset_entry *)(buf + offset);
> >
> > @@ -199,11 +200,12 @@ static void s390_cpumcfdg_dump(struct perf_sample *sample)
> > color_fprintf(stdout, color, " [%#08zx] Counterset:%d"
> > " Counters:%d\n", offset, ce.set, ce.ctr);
> > for (i = 0, p = (u64 *)(cep + 1); i < ce.ctr; ++i, ++p) {
> > - const char *ev_name = get_counter_name(ce.set, i, table);
> > + char *ev_name = get_counter_name(ce.set, i, pmu);
> >
> > color_fprintf(stdout, color,
> > "\tCounter:%03d %s Value:%#018lx\n", i,
> > ev_name ?: "<unknown>", be64_to_cpu(*p));
> > + free(ev_name);
> > }
> > offset += ctrset_size(&ce);
> > }
> > @@ -216,14 +218,14 @@ static void s390_cpumcfdg_dump(struct perf_sample *sample)
> > */
> > void evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event, struct perf_sample *sample)
> > {
> > - struct evsel *ev_bc000;
> > + struct evsel *evsel;
> >
> > if (event->header.type != PERF_RECORD_SAMPLE)
> > return;
> >
> > - ev_bc000 = evlist__event2evsel(evlist, event);
> > - if (ev_bc000 == NULL ||
> > - ev_bc000->core.attr.config != PERF_EVENT_CPUM_CF_DIAG)
> > + evsel = evlist__event2evsel(evlist, event);
> > + if (evsel == NULL ||
> > + evsel->core.attr.config != PERF_EVENT_CPUM_CF_DIAG)
> > return;
> >
> > /* Display raw data on screen */
> > @@ -231,5 +233,5 @@ void evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event, str
> > pr_err("Invalid counter set data encountered\n");
> > return;
> > }
> > - s390_cpumcfdg_dump(sample);
> > + s390_cpumcfdg_dump(evsel->pmu, sample);
> > }
> > --
> > 2.42.0.rc1.204.g551eb34607-goog
> >
>
> --
>
> - Arnaldo
© 2016 - 2025 Red Hat, Inc.