Commit 44028699 authored Jan 21, 2022 by Ian Rogers Committed by Arnaldo Carvalho de Melo Jan 22, 2022

perf cpumap: Migrate to libperf cpumap api



Switch from directly accessing the perf_cpu_map to using the appropriate
libperf API when possible. Using the API simplifies the job of
refactoring use of perf_cpu_map.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: André Almeida <andrealmeid@collabora.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Dmitriy Vyukov <dvyukov@google.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Madhavan Srinivasan <maddy@linux.ibm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Miaoqian Lin <linmq006@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Shunsuke Nakamura <nakamura.shun@fujitsu.com>
Cc: Song Liu <song@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Stephen Brennan <stephen.s.brennan@oracle.com>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Yury Norov <yury.norov@gmail.com>
Link: http://lore.kernel.org/lkml/20220122045811.3402706-3-irogers@google.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 1d1d9af2

tools/lib/perf/evsel.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -141,7 +141,7 @@ int perf_evsel__open(struct perf_evsel evsel, struct perf_cpu_map cpus,
		}

		if (evsel->fd == NULL &&
		perf_evsel__alloc_fd(evsel, cpus->nr, threads->nr) < 0)
		perf_evsel__alloc_fd(evsel, perf_cpu_map__nr(cpus), threads->nr) < 0)
		return -ENOMEM;

		perf_cpu_map__for_each_cpu(cpu, idx, cpus) {
		@@ -384,7 +384,7 @@ int perf_evsel__apply_filter(struct perf_evsel evsel, const char filter)
		{
		int err = 0, i;

		for (i = 0; i < evsel->cpus->nr && !err; i++)
		for (i = 0; i < perf_cpu_map__nr(evsel->cpus) && !err; i++)
		err = perf_evsel__run_ioctl(evsel,
		PERF_EVENT_IOC_SET_FILTER,
		(void *)filter, i);

tools/perf/bench/epoll-ctl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -333,7 +333,7 @@ int bench_epoll_ctl(int argc, const char **argv)

		/* default to the number of CPUs */
		if (!nthreads)
		nthreads = cpu->nr;
		nthreads = perf_cpu_map__nr(cpu);

		worker = calloc(nthreads, sizeof(*worker));
		if (!worker)

tools/perf/bench/epoll-wait.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -452,7 +452,7 @@ int bench_epoll_wait(int argc, const char **argv)

		/* default to the number of CPUs and leave one for the writer pthread */
		if (!nthreads)
		nthreads = cpu->nr - 1;
		nthreads = perf_cpu_map__nr(cpu) - 1;

		worker = calloc(nthreads, sizeof(*worker));
		if (!worker) {

tools/perf/bench/evlist-open-close.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ static int evlist__count_evsel_fds(struct evlist *evlist)
		int cnt = 0;

		evlist__for_each_entry(evlist, evsel)
		cnt += evsel->core.threads->nr * evsel->core.cpus->nr;
		cnt += evsel->core.threads->nr * perf_cpu_map__nr(evsel->core.cpus);

		return cnt;
		}
		@@ -151,7 +151,7 @@ static int bench_evlist_open_close__run(char *evstr)

		init_stats(&time_stats);

		printf(" Number of cpus:\t%d\n", evlist->core.cpus->nr);
		printf(" Number of cpus:\t%d\n", perf_cpu_map__nr(evlist->core.cpus));
		printf(" Number of threads:\t%d\n", evlist->core.threads->nr);
		printf(" Number of events:\t%d (%d fds)\n",
		evlist->core.nr_entries, evlist__count_evsel_fds(evlist));

tools/perf/bench/futex-hash.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -150,7 +150,7 @@ int bench_futex_hash(int argc, const char **argv)
		}

		if (!params.nthreads) /* default to the number of CPUs */
		params.nthreads = cpu->nr;
		params.nthreads = perf_cpu_map__nr(cpu);

		worker = calloc(params.nthreads, sizeof(*worker));
		if (!worker)