Skip to content

Commit bfb2436

Browse files
namhyungopsiff
authored andcommitted
perf sched: Fix memory leaks for evsel->priv in timehist
[ Upstream commit 117e5c33b1c44037af016d77ce6c0b086d55535f ] 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: 49394a2 ("perf sched timehist: Introduce timehist command") Reviewed-by: Ian Rogers <[email protected]> Tested-by: Ian Rogers <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Namhyung Kim <[email protected]> Signed-off-by: Sasha Levin <[email protected]> (cherry picked from commit f34d54d2c2763fddde5a03a6e632e30d321c6dec)
1 parent 72c4d63 commit bfb2436

File tree

3 files changed

+25
-0
lines changed

3 files changed

+25
-0
lines changed

tools/perf/builtin-sched.c

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2025,6 +2025,16 @@ static u64 evsel__get_time(struct evsel *evsel, u32 cpu)
20252025
return r->last_time[cpu];
20262026
}
20272027

2028+
static void timehist__evsel_priv_destructor(void *priv)
2029+
{
2030+
struct evsel_runtime *r = priv;
2031+
2032+
if (r) {
2033+
free(r->last_time);
2034+
free(r);
2035+
}
2036+
}
2037+
20282038
static int comm_width = 30;
20292039

20302040
static char *timehist_get_commstr(struct thread *thread)
@@ -3278,6 +3288,8 @@ static int perf_sched__timehist(struct perf_sched *sched)
32783288

32793289
setup_pager();
32803290

3291+
evsel__set_priv_destructor(timehist__evsel_priv_destructor);
3292+
32813293
/* prefer sched_waking if it is captured */
32823294
if (evlist__find_tracepoint_by_name(session->evlist, "sched:sched_waking"))
32833295
handlers[1].handler = timehist_sched_wakeup_ignore;

tools/perf/util/evsel.c

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1477,6 +1477,15 @@ static void evsel__free_config_terms(struct evsel *evsel)
14771477
free_config_terms(&evsel->config_terms);
14781478
}
14791479

1480+
static void (*evsel__priv_destructor)(void *priv);
1481+
1482+
void evsel__set_priv_destructor(void (*destructor)(void *priv))
1483+
{
1484+
assert(evsel__priv_destructor == NULL);
1485+
1486+
evsel__priv_destructor = destructor;
1487+
}
1488+
14801489
void evsel__exit(struct evsel *evsel)
14811490
{
14821491
assert(list_empty(&evsel->core.node));
@@ -1502,6 +1511,8 @@ void evsel__exit(struct evsel *evsel)
15021511
hashmap__free(evsel->per_pkg_mask);
15031512
evsel->per_pkg_mask = NULL;
15041513
zfree(&evsel->metric_events);
1514+
if (evsel__priv_destructor)
1515+
evsel__priv_destructor(evsel->priv);
15051516
perf_evsel__object.fini(evsel);
15061517
if (evsel__tool_event(evsel) == PERF_TOOL_SYSTEM_TIME ||
15071518
evsel__tool_event(evsel) == PERF_TOOL_USER_TIME)

tools/perf/util/evsel.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,8 @@ void evsel__init(struct evsel *evsel, struct perf_event_attr *attr, int idx);
282282
void evsel__exit(struct evsel *evsel);
283283
void evsel__delete(struct evsel *evsel);
284284

285+
void evsel__set_priv_destructor(void (*destructor)(void *priv));
286+
285287
struct callchain_param;
286288

287289
void evsel__config(struct evsel *evsel, struct record_opts *opts,

0 commit comments

Comments
 (0)