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

perf tools: Allow system-wide events to keep their own CPUs 



Currently, user_requested_cpus supplants system-wide CPUs when the evlist
has_user_cpus. Change that so that system-wide events retain their own
CPUs and they are added to all_cpus.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Leo Yan <leo.yan@linaro.org>
Link: https://lore.kernel.org/r/20220524075436.29144-15-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent f5fb6d4e

tools/lib/perf/evlist.c

+5 −6
Original line number Diff line number Diff line
@@ -40,12 +40,11 @@ static void __perf_evlist__propagate_maps(struct perf_evlist *evlist, 
	 * We already have cpus for evsel (via PMU sysfs) so

	 * keep it, if there's no target cpu list defined.

	 */

	if (!evsel->own_cpus || evlist->has_user_cpus) {

		perf_cpu_map__put(evsel->cpus);

		evsel->cpus = perf_cpu_map__get(evlist->user_requested_cpus);

	} else if (!evsel->system_wide &&

	if (!evsel->own_cpus ||

	    (!evsel->system_wide && evlist->has_user_cpus) ||

	    (!evsel->system_wide &&

	     !evsel->requires_cpu &&

		   perf_cpu_map__empty(evlist->user_requested_cpus)) {

	     perf_cpu_map__empty(evlist->user_requested_cpus))) {

		perf_cpu_map__put(evsel->cpus);

		evsel->cpus = perf_cpu_map__get(evlist->user_requested_cpus);

	} else if (evsel->cpus != evsel->own_cpus) {