summaryrefslogtreecommitdiffstats
path: root/tools/perf/util
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2022-05-06 14:25:43 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2022-05-10 19:24:32 +0200
commitd205a3a665158f4229845aaa29245b19a9e4be03 (patch)
treecf9c85ffe81d905c39d57f276d0632973bdecf0a /tools/perf/util
parentperf auxtrace: Move evlist__enable_event_idx() to auxtrace.c (diff)
downloadlinux-d205a3a665158f4229845aaa29245b19a9e4be03.tar.xz
linux-d205a3a665158f4229845aaa29245b19a9e4be03.zip
perf auxtrace: Do not mix up mmap idx
The idx is with respect to evlist not evsel. That hasn't mattered because they are the same at present. Prepare for that not being the case, which it won't be when sideband tracking events are allowed on all CPUs even when auxtrace is limited to selected CPUs. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Acked-by: Ian Rogers <irogers@google.com> Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Leo Yan <leo.yan@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Link: http://lore.kernel.org/lkml/20220506122601.367589-6-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util')
-rw-r--r--tools/perf/util/auxtrace.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index 10936a38031f..b11549ae39df 100644
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -640,8 +640,14 @@ static int evlist__enable_event_idx(struct evlist *evlist, struct evsel *evsel,
{
bool per_cpu_mmaps = !perf_cpu_map__empty(evlist->core.user_requested_cpus);
- if (per_cpu_mmaps)
- return perf_evsel__enable_cpu(&evsel->core, idx);
+ if (per_cpu_mmaps) {
+ struct perf_cpu evlist_cpu = perf_cpu_map__cpu(evlist->core.all_cpus, idx);
+ int cpu_map_idx = perf_cpu_map__idx(evsel->core.cpus, evlist_cpu);
+
+ if (cpu_map_idx == -1)
+ return -EINVAL;
+ return perf_evsel__enable_cpu(&evsel->core, cpu_map_idx);
+ }
return perf_evsel__enable_thread(&evsel->core, idx);
}