korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 00:04:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf session: Replace MAX_NR_CPUS with perf_env::nr_cpus_online

Browse Source 
nr_cpus, the number of CPUs online during a record session bound by
MAX_NR_CPUS, can be used as a dynamic alternative for MAX_NR_CPUS in
perf_session__cpu_bitmap.

Signed-off-by: Kyle Meyer <kyle.meyer@hpe.com>
Reviewed-by: Jiri Olsa <jolsa@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Russ Anderson <russ.anderson@hpe.com>
Link: http://lore.kernel.org/lkml/20190827214352.94272-5-meyerk@stormcage.eag.rdlabs.hpecorp.net
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Kyle Meyer 2019-08-27 16:43:49 -05:00 committed by Arnaldo Carvalho de Melo
parent 92b5a1545a
commit 7df4e36a47
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tools/perf/util/session.c
View File

@ -2292,6 +2292,7 @@ int perf_session__cpu_bitmap(struct perf_session *session,
{ {
int i, err = -1; int i, err = -1;
struct perf_cpu_map *map; struct perf_cpu_map *map;
int nr_cpus = min(session->header.env.nr_cpus_online, MAX_NR_CPUS);
for (i = 0; i < PERF_TYPE_MAX; ++i) { for (i = 0; i < PERF_TYPE_MAX; ++i) {
struct evsel *evsel; struct evsel *evsel;
@ -2316,7 +2317,7 @@ int perf_session__cpu_bitmap(struct perf_session *session,
for (i = 0; i < map->nr; i++) { for (i = 0; i < map->nr; i++) {
int cpu = map->map[i]; int cpu = map->map[i];
if (cpu >= MAX_NR_CPUS) { if (cpu >= nr_cpus) {
pr_err("Requested CPU %d too large. " pr_err("Requested CPU %d too large. "
"Consider raising MAX_NR_CPUS\n", cpu); "Consider raising MAX_NR_CPUS\n", cpu);
goto out_delete_map; goto out_delete_map;