mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 14:44:12 +00:00
perf list: Fix JSON segfault by setting the used skip_duplicate_pmus callback
commitb169374748
upstream. Json output didn't set the skip_duplicate_pmus callback yielding a segfault. Fixes:cd4e1efbbc
("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
dea8cfe773
commit
1f4d4d2cd6
1 changed files with 6 additions and 0 deletions
|
@ -434,6 +434,11 @@ static void json_print_metric(void *ps __maybe_unused, const char *group,
|
||||||
strbuf_release(&buf);
|
strbuf_release(&buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static bool json_skip_duplicate_pmus(void *ps __maybe_unused)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
static bool default_skip_duplicate_pmus(void *ps)
|
static bool default_skip_duplicate_pmus(void *ps)
|
||||||
{
|
{
|
||||||
struct print_state *print_state = 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_end = json_print_end,
|
||||||
.print_event = json_print_event,
|
.print_event = json_print_event,
|
||||||
.print_metric = json_print_metric,
|
.print_metric = json_print_metric,
|
||||||
|
.skip_duplicate_pmus = json_skip_duplicate_pmus,
|
||||||
};
|
};
|
||||||
ps = &json_ps;
|
ps = &json_ps;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in a new issue