diff options
| author | Ian Rogers <irogers@google.com> | 2023-11-29 22:34:26 +0100 |
|---|---|---|
| committer | Namhyung Kim <namhyung@kernel.org> | 2023-12-05 20:16:00 +0100 |
| commit | b1693747487442984050eb0f462b83a3a8307525 (patch) | |
| tree | ee14737cfa114fdb09264a104396965edf7e3bb3 /tools | |
| parent | perf vendor events arm64: AmpereOne: Add missing DefaultMetricgroupName fields (diff) | |
| download | linux-b1693747487442984050eb0f462b83a3a8307525.tar.xz linux-b1693747487442984050eb0f462b83a3a8307525.zip | |
perf list: Fix JSON segfault by setting the used skip_duplicate_pmus callback
Json output didn't set the skip_duplicate_pmus callback yielding a
segfault.
Fixes: cd4e1efbbc40 ("perf pmus: Skip duplicate PMUs and don't print list suffix by default")
Signed-off-by: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@arm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20231129213428.2227448-2-irogers@google.com
[namhyung: updated subject line according to Arnaldo]
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/builtin-list.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index a343823c8ddf..61c2c96cc070 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -434,6 +434,11 @@ static void json_print_metric(void *ps __maybe_unused, const char *group, strbuf_release(&buf); } +static bool json_skip_duplicate_pmus(void *ps __maybe_unused) +{ + return false; +} + static bool default_skip_duplicate_pmus(void *ps) { struct print_state *print_state = ps; @@ -503,6 +508,7 @@ int cmd_list(int argc, const char **argv) .print_end = json_print_end, .print_event = json_print_event, .print_metric = json_print_metric, + .skip_duplicate_pmus = json_skip_duplicate_pmus, }; ps = &json_ps; } else { |