public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-22 17:24:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf machine: 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
__machine__synthesize_threads and machine__set_current_tid.

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-6-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:50 -05:00 • committed by Arnaldo Carvalho de Melo
parent 7df4e36a47
commit 8c7274691f
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/perf/util/machine.c
View file

@ -2619,7 +2619,9 @@ int __machine__synthesize_threads(struct machine *machine, struct perf_tool *too
pid_t machine__get_current_tid(struct machine *machine, int cpu) pid_t machine__get_current_tid(struct machine *machine, int cpu)
{ {
if (cpu < 0 || cpu >= MAX_NR_CPUS || !machine->current_tid) int nr_cpus = min(machine->env->nr_cpus_online, MAX_NR_CPUS);
if (cpu < 0 || cpu >= nr_cpus || !machine->current_tid)
return -1; return -1;
return machine->current_tid[cpu]; return machine->current_tid[cpu];
@ -2629,6 +2631,7 @@ int machine__set_current_tid(struct machine *machine, int cpu, pid_t pid,
pid_t tid) pid_t tid)
{ {
struct thread *thread; struct thread *thread;
int nr_cpus = min(machine->env->nr_cpus_online, MAX_NR_CPUS);
if (cpu < 0) if (cpu < 0)
return -EINVAL; return -EINVAL;
@ -2636,14 +2639,14 @@ int machine__set_current_tid(struct machine *machine, int cpu, pid_t pid,
if (!machine->current_tid) { if (!machine->current_tid) {
int i; int i;
machine->current_tid = calloc(MAX_NR_CPUS, sizeof(pid_t)); machine->current_tid = calloc(nr_cpus, sizeof(pid_t));
if (!machine->current_tid) if (!machine->current_tid)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < MAX_NR_CPUS; i++) for (i = 0; i < nr_cpus; i++)
machine->current_tid[i] = -1; machine->current_tid[i] = -1;
} }
if (cpu >= MAX_NR_CPUS) { if (cpu >= nr_cpus) {
pr_err("Requested CPU %d too large. ", cpu); pr_err("Requested CPU %d too large. ", cpu);
pr_err("Consider raising MAX_NR_CPUS\n"); pr_err("Consider raising MAX_NR_CPUS\n");
return -EINVAL; return -EINVAL;