Commit d205a3a6 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarIan 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 024b3b42

tools/perf/util/auxtrace.c

+8 −2
Original line number Diff line number Diff line
@@ -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);

}