shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

perf sched: Avoid large stack allocations

Browse Source 
[ Upstream commit 232418a0b2 ]

Commit 5ded57ac1b ("perf inject: Remove static variables") moved
static variables to local, however, in this case 3 MAX_CPUS (4096)
sized arrays were moved onto the stack making the stack frame quite
large. Avoid the stack usage by dynamically allocating the arrays.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230527034324.2597593-2-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Stable-dep-of: 1a5efc9e13f3 ("libsubcmd: Don't free the usage string")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ian Rogers
2023-05-26 20:43:19 -07:00
committed by Greg Kroah-Hartman
parent 4d9a5864c3
commit aba6841a6c
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/perf/builtin-sched.c
View File

@@ -193,8 +193,8 @@ struct perf_sched {
* weird events, such as a task being switched away that is not current. * weird events, such as a task being switched away that is not current.
*/ */
struct perf_cpu max_cpu; struct perf_cpu max_cpu;
u32 curr_pid[MAX_CPUS]; u32 *curr_pid;
struct thread *curr_thread[MAX_CPUS]; struct thread **curr_thread;
char next_shortname1; char next_shortname1;
char next_shortname2; char next_shortname2;
unsigned int replay_repeat; unsigned int replay_repeat;
@@ -224,7 +224,7 @@ struct perf_sched {
u64 run_avg; u64 run_avg;
u64 all_runtime; u64 all_runtime;
u64 all_count; u64 all_count;
u64 cpu_last_switched[MAX_CPUS]; u64 *cpu_last_switched;
struct rb_root_cached atom_root, sorted_atom_root, merged_atom_root; struct rb_root_cached atom_root, sorted_atom_root, merged_atom_root;
struct list_head sort_list, cmp_pid; struct list_head sort_list, cmp_pid;
bool force; bool force;
@@ -3590,7 +3590,22 @@ int cmd_sched(int argc, const char **argv)
mutex_init(&sched.start_work_mutex); mutex_init(&sched.start_work_mutex);
mutex_init(&sched.work_done_wait_mutex); mutex_init(&sched.work_done_wait_mutex);
for (i = 0; i < ARRAY_SIZE(sched.curr_pid); i++) sched.curr_thread = calloc(MAX_CPUS, sizeof(*sched.curr_thread));
if (!sched.curr_thread) {
ret = -ENOMEM;
goto out;
}
sched.cpu_last_switched = calloc(MAX_CPUS, sizeof(*sched.cpu_last_switched));
if (!sched.cpu_last_switched) {
ret = -ENOMEM;
goto out;
}
sched.curr_pid = malloc(MAX_CPUS * sizeof(*sched.curr_pid));
if (!sched.curr_pid) {
ret = -ENOMEM;
goto out;
}
for (i = 0; i < MAX_CPUS; i++)
sched.curr_pid[i] = -1; sched.curr_pid[i] = -1;
argc = parse_options_subcommand(argc, argv, sched_options, sched_subcommands, argc = parse_options_subcommand(argc, argv, sched_options, sched_subcommands,
@@ -3659,6 +3674,9 @@ int cmd_sched(int argc, const char **argv)
} }
out: out:
free(sched.curr_pid);
free(sched.cpu_last_switched);
free(sched.curr_thread);
mutex_destroy(&sched.start_work_mutex); mutex_destroy(&sched.start_work_mutex);
mutex_destroy(&sched.work_done_wait_mutex); mutex_destroy(&sched.work_done_wait_mutex);