Skip to contentSkip to conversation

perf metric: Fix memory leaks.

PATCH In review Ian Rogers 2 participants 3 messages Nov 5, 2021 – Nov 7, 2021 1 message not in the archive perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf metric: Fix memory leaks.

Certain error paths may leak memory as caught by address sanitizer. Ensure this is cleaned up to make sure address/leak sanitizer is happy.

Fixes 5ecd5a0c7d1c ("perf metrics: Modify setup and deduplication")
---
 tools/perf/util/metricgroup.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
tools/perf/util/metricgroup.c +12 -1
index 4917e9704765..734d2ce94825 100644
@@ -228,6 +228,7 @@ static void metric__free(struct metric *m)
 	free(m->metric_refs);
 	expr__ctx_free(m->pctx);
 	free((char *)m->modifier);
+	evlist__delete(m->evlist);
 	free(m);
 }
 
@@ -1352,6 +1353,14 @@ static int parse_ids(struct perf_pmu *fake_pmu, struct expr_parse_ctx *ids,
 	*out_evlist = parsed_evlist;
 	parsed_evlist = NULL;
 err_out:
+	/*
+	 * Errors are generally cleaned up by printing, but parsing may succeed
+	 * with intermediate unused errors being recorded.
+	 */
+	free(parse_error.str);
+	free(parse_error.help);
+	free(parse_error.first_str);
+	free(parse_error.first_help);
 	evlist__delete(parsed_evlist);
 	strbuf_release(&events);
 	return ret;
@@ -1481,8 +1490,10 @@ static int parse_groups(struct evlist *perf_evlist, const char *str,
 	}
 
 
-	if (combined_evlist)
+	if (combined_evlist) {
 		evlist__splice_list_tail(perf_evlist, &combined_evlist->core.entries);
+		evlist__delete(combined_evlist);
+	}
 
 	list_for_each_entry(m, &metric_list, nd) {
 		if (m->evlist)
Signature · 1 line
2.34.0.rc0.344.g81b53c2807-goog
#1 lore raw

Em Fri, Nov 05, 2021 at 09:46:57AM -0700, Ian Rogers escreveu:

Quoted 23 lines

Certain error paths may leak memory as caught by address sanitizer. Ensure this is cleaned up to make sure address/leak sanitizer is happy.

Fixes 5ecd5a0c7d1c ("perf metrics: Modify setup and deduplication")
---
 tools/perf/util/metricgroup.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
tools/perf/util/metricgroup.c +1 -0
index 4917e9704765..734d2ce94825 100644
@@ -228,6 +228,7 @@ static void metric__free(struct metric *m)
 	free(m->metric_refs);
 	expr__ctx_free(m->pctx);
 	free((char *)m->modifier);
+	evlist__delete(m->evlist);
 	free(m);
 }
 
@@ -1352,6 +1353,14 @@ static int parse_ids(struct perf_pmu *fake_pmu, struct expr_parse_ctx *ids,
 	*out_evlist = parsed_evlist;

tools/perf/util/metricgroup.c static int parse_ids(struct perf_pmu *fake_pmu, struct expr_parse_ctx *ids, · line 1363

Quoted 10 lines
tools/perf/util/metricgroup.c +8 -0
 	parsed_evlist = NULL;
 err_out:
+	/*
+	 * Errors are generally cleaned up by printing, but parsing may succeed
+	 * with intermediate unused errors being recorded.
+	 */
+	free(parse_error.str);
+	free(parse_error.help);
+	free(parse_error.first_str);
+	free(parse_error.first_help);

Can't this be in a parse_events__free_errors() routine?

- Arnaldo

Quoted 17 lines
tools/perf/util/metricgroup.c +3 -1
 	evlist__delete(parsed_evlist);
 	strbuf_release(&events);
 	return ret;
@@ -1481,8 +1490,10 @@ static int parse_groups(struct evlist *perf_evlist, const char *str,
 	}
 
 
-	if (combined_evlist)
+	if (combined_evlist) {
 		evlist__splice_list_tail(perf_evlist, &combined_evlist->core.entries);
+		evlist__delete(combined_evlist);
+	}
 
 	list_for_each_entry(m, &metric_list, nd) {
 		if (m->evlist)
Signature · 1 line
2.34.0.rc0.344.g81b53c2807-goog
Signature · 1 line
- Arnaldo

A message that is not in the archive (sent off-list or not yet received): CAP-5=fVMtO6zd_Qm9rJkMNGB==606hW-PRiQ7VCWFJLpJRmyBQ@mail.gmail.com

author reviewer
#3 lore raw
Quoted 43 lines · Ian Rogers
Quoted 23 lines · Arnaldo Carvalho de Melo

Em Fri, Nov 05, 2021 at 09:46:57AM -0700, Ian Rogers escreveu:

Quoted 21 lines

Certain error paths may leak memory as caught by address sanitizer. Ensure this is cleaned up to make sure address/leak sanitizer is happy.

Fixes 5ecd5a0c7d1c ("perf metrics: Modify setup and deduplication")
---
 tools/perf/util/metricgroup.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
tools/perf/util/metricgroup.c +1 -0
index 4917e9704765..734d2ce94825 100644
@@ -228,6 +228,7 @@ static void metric__free(struct metric *m)
      free(m->metric_refs);
      expr__ctx_free(m->pctx);
      free((char *)m->modifier);
+     evlist__delete(m->evlist);
      free(m);
 }
 
Quoted 14 lines

tools/perf/util/metricgroup.c static int parse_ids(struct perf_pmu *fake_pmu, struct expr_parse_ctx *ids, · line 1363

Quoted 12 lines
tools/perf/util/metricgroup.c +8 -0
@@ -1352,6 +1353,14 @@ static int parse_ids(struct perf_pmu *fake_pmu, struct expr_parse_ctx *ids,
      *out_evlist = parsed_evlist;
      parsed_evlist = NULL;
 err_out:
+     /*
+      * Errors are generally cleaned up by printing, but parsing may succeed
+      * with intermediate unused errors being recorded.
+      */
+     free(parse_error.str);
+     free(parse_error.help);
+     free(parse_error.first_str);
+     free(parse_error.first_help);

Can't this be in a parse_events__free_errors() routine?

Quoted 4 lines

I was wondering about an init and exit routine, I'm not sure on the convention here. The code currently assumes that an error will cause printing and the print routine frees. It is possible to have events that fail but overall parsing succeeds. We need to free in both cases which currently isn't done with a helper.

Thanks,
Ian

I did the bigger cleanup with init/exit in v2:
https://lore.kernel.org/lkml/[email protected]/

Thanks,
Ian

Quoted 25 lines
Quoted 25 lines

- Arnaldo

Quoted 16 lines
tools/perf/util/metricgroup.c +3 -2
      evlist__delete(parsed_evlist);
      strbuf_release(&events);
      return ret;
@@ -1481,8 +1490,10 @@ static int parse_groups(struct evlist *perf_evlist, const char *str,
      }
 
 
-     if (combined_evlist)
+     if (combined_evlist) {
              evlist__splice_list_tail(perf_evlist, &combined_evlist->core.entries);
+             evlist__delete(combined_evlist);
+     }
 
      list_for_each_entry(m, &metric_list, nd) {
              if (m->evlist)
--
Quoted 1 line

2.34.0.rc0.344.g81b53c2807-goog

--

- Arnaldo