averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-04-03 12:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

perf sched: Fix memory leaks in 'perf sched latency'

Browse Source 
[ Upstream commit e68b1c0098 ]

The work_atoms should be freed after use.  Add free_work_atoms() to
make sure to release all.  It should use list_splice_init() when merging
atoms to prevent accessing invalid pointers.

Fixes: b1ffe8f3e0 ("perf sched: Finish latency => atom rename and misc cleanups")
Reviewed-by: Ian Rogers <irogers@google.com>
Tested-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20250703014942.1369397-8-namhyung@kernel.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Namhyung Kim
2025-07-02 18:49:41 -07:00
committed by Greg Kroah-Hartman
parent f7786e6a4f
commit ffc3c00a0e
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1116,6 +1116,21 @@ add_sched_in_event(struct work_atoms *atoms, u64 timestamp)
atoms->nb_atoms++;
}
static void free_work_atoms(struct work_atoms *atoms)
{
struct work_atom *atom, *tmp;
if (atoms == NULL)
return;
list_for_each_entry_safe(atom, tmp, &atoms->work_list, list) {
list_del(&atom->list);
free(atom);
}
thread__zput(atoms->thread);
free(atoms);
}
static int latency_switch_event(struct perf_sched *sched,
struct evsel *evsel,
struct perf_sample *sample,
@@ -3390,13 +3405,13 @@ static void __merge_work_atoms(struct rb_root_cached *root, struct work_atoms *d
this->total_runtime += data->total_runtime;
this->nb_atoms += data->nb_atoms;
this->total_lat += data->total_lat;
list_splice(&data->work_list, &this->work_list);
list_splice_init(&data->work_list, &this->work_list);
if (this->max_lat < data->max_lat) {
this->max_lat = data->max_lat;
this->max_lat_start = data->max_lat_start;
this->max_lat_end = data->max_lat_end;
}
zfree(&data);
free_work_atoms(data);
return;
}
}
@@ -3475,7 +3490,6 @@ static int perf_sched__lat(struct perf_sched *sched)
work_list = rb_entry(next, struct work_atoms, node);
output_lat_thread(sched, work_list);
next = rb_next(next);
thread__zput(work_list->thread);
}
printf(" -----------------------------------------------------------------------------------------------------------------\n");
@@ -3489,6 +3503,13 @@ static int perf_sched__lat(struct perf_sched *sched)
rc = 0;
while ((next = rb_first_cached(&sched->sorted_atom_root))) {
struct work_atoms *data;
data = rb_entry(next, struct work_atoms, node);
rb_erase_cached(next, &sched->sorted_atom_root);
free_work_atoms(data);
}
out_free_cpus_switch_event:
free_cpus_switch_event(sched);
return rc;