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: 49394a2a24c78ce0 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index e440a00b1613e88d5e43e4f5201c244e807da2d6..244f9c6f61ae05b87630cdbf94f0e5257f49d502 100644 (file)
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1929,6 +1929,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)
@@ -3068,6 +3078,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;

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 7db35dbdfcefe77217182d173c0e118abae8539d..22969cc00a5fc3441b27625ff99f791cecbabf13 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1486,6 +1486,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));
@@ -1508,6 +1517,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);
 }
 

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 8ce30329a0772ccc55dd6a0a62b8e9f3a6c27db6..fabf0697c36a4765a2191fd858a40fca707013f5 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -246,6 +246,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,