github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 16:44:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

perf sched: Fix memory leaks for evsel->priv in timehist

Browse Source 
It uses evsel->priv to save per-cpu timing information.  It should be
freed when the evsel is released.

Add the priv destructor for evsel same as thread to handle that.

Fixes: 49394a2a24 ("perf sched timehist: Introduce timehist command")
Reviewed-by: Ian Rogers <irogers@google.com>
Tested-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20250703014942.1369397-6-namhyung@kernel.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
Namhyung Kim 2025-07-02 18:49:39 -07:00
parent e2eb59260c
commit 117e5c33b1
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2020,6 +2020,16 @@ static u64 evsel__get_time(struct evsel *evsel, u32 cpu)
return r->last_time[cpu];
}
static void timehist__evsel_priv_destructor(void *priv)
{
struct evsel_runtime *r = priv;
if (r) {
free(r->last_time);
free(r);
}
}
static int comm_width = 30;
static char *timehist_get_commstr(struct thread *thread)
@ -3314,6 +3324,8 @@ static int perf_sched__timehist(struct perf_sched *sched)
setup_pager();
evsel__set_priv_destructor(timehist__evsel_priv_destructor);
/* prefer sched_waking if it is captured */
if (evlist__find_tracepoint_by_name(session->evlist, "sched:sched_waking"))
handlers[1].handler = timehist_sched_wakeup_ignore;

11
tools/perf/util/evsel.c
View File

@ -1657,6 +1657,15 @@ static void evsel__free_config_terms(struct evsel *evsel)
free_config_terms(&evsel->config_terms);
}
static void (*evsel__priv_destructor)(void *priv);
void evsel__set_priv_destructor(void (*destructor)(void *priv))
{
assert(evsel__priv_destructor == NULL);
evsel__priv_destructor = destructor;
}
void evsel__exit(struct evsel *evsel)
{
assert(list_empty(&evsel->core.node));
@ -1687,6 +1696,8 @@ void evsel__exit(struct evsel *evsel)
hashmap__free(evsel->per_pkg_mask);
evsel->per_pkg_mask = NULL;
zfree(&evsel->metric_events);
if (evsel__priv_destructor)
evsel__priv_destructor(evsel->priv);
perf_evsel__object.fini(evsel);
if (evsel__tool_event(evsel) == TOOL_PMU__EVENT_SYSTEM_TIME ||
evsel__tool_event(evsel) == TOOL_PMU__EVENT_USER_TIME)

2
tools/perf/util/evsel.h
View File

@ -280,6 +280,8 @@ void evsel__init(struct evsel *evsel, struct perf_event_attr *attr, int idx);
void evsel__exit(struct evsel *evsel);
void evsel__delete(struct evsel *evsel);
void evsel__set_priv_destructor(void (*destructor)(void *priv));
struct callchain_param;
void evsel__config(struct evsel *evsel, struct record_opts *opts,