Skip to content

Commit 372b463

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 282d4b34694f83b00c45ab85f85bd5fbdabed491)
1 parent 4438474 commit 372b463

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
@@ -1949,6 +1949,16 @@ static u64 evsel__get_time(struct evsel *evsel, u32 cpu)
19491949
return r->last_time[cpu];
19501950
}
19511951

1952+
static void timehist__evsel_priv_destructor(void *priv)
1953+
{
1954+
struct evsel_runtime *r = priv;
1955+
1956+
if (r) {
1957+
free(r->last_time);
1958+
free(r);
1959+
}
1960+
}
1961+
19521962
static int comm_width = 30;
19531963

19541964
static char *timehist_get_commstr(struct thread *thread)
@@ -3080,6 +3090,8 @@ static int perf_sched__timehist(struct perf_sched *sched)
30803090

30813091
setup_pager();
30823092

3093+
evsel__set_priv_destructor(timehist__evsel_priv_destructor);
3094+
30833095
/* prefer sched_waking if it is captured */
30843096
if (evlist__find_tracepoint_by_name(session->evlist, "sched:sched_waking"))
30853097
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
@@ -1460,6 +1460,15 @@ static void evsel__free_config_terms(struct evsel *evsel)
14601460
free_config_terms(&evsel->config_terms);
14611461
}
14621462

1463+
static void (*evsel__priv_destructor)(void *priv);
1464+
1465+
void evsel__set_priv_destructor(void (*destructor)(void *priv))
1466+
{
1467+
assert(evsel__priv_destructor == NULL);
1468+
1469+
evsel__priv_destructor = destructor;
1470+
}
1471+
14631472
void evsel__exit(struct evsel *evsel)
14641473
{
14651474
assert(list_empty(&evsel->core.node));
@@ -1485,6 +1494,8 @@ void evsel__exit(struct evsel *evsel)
14851494
hashmap__free(evsel->per_pkg_mask);
14861495
evsel->per_pkg_mask = NULL;
14871496
zfree(&evsel->metric_events);
1497+
if (evsel__priv_destructor)
1498+
evsel__priv_destructor(evsel->priv);
14881499
perf_evsel__object.fini(evsel);
14891500
}
14901501

tools/perf/util/evsel.h

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

255+
void evsel__set_priv_destructor(void (*destructor)(void *priv));
256+
255257
struct callchain_param;
256258

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

0 commit comments

Comments
 (0)