The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>, Jiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Mark Rutland <mark.rutland@arm.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Stephane Eranian <eranian@google.com>,
	LKML <linux-kernel@vger.kernel.org>,
	Andi Kleen <andi@firstfloor.org>, Ian Rogers <irogers@google.com>
Subject: [PATCH 4/9] perf test: Fix memory leaks in parse-metric test
Date: Mon,  7 Sep 2020 12:44:57 +0900	[thread overview]
Message-ID: <20200907034502.753230-5-namhyung@kernel.org> (raw)
In-Reply-To: <20200907034502.753230-1-namhyung@kernel.org>

It didn't release resources when there's an error so the
test_recursion_fail() will leak some memory.

Fixes: 0a507af9c681a ("perf tests: Add parse metric test for ipc metric")
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/perf/tests/parse-metric.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metric.c
index 23db8acc492d..cd7331aac3bd 100644
--- a/tools/perf/tests/parse-metric.c
+++ b/tools/perf/tests/parse-metric.c
@@ -153,8 +153,10 @@ static int __compute_metric(const char *name, struct value *vals,
 		return -ENOMEM;
 
 	cpus = perf_cpu_map__new("0");
-	if (!cpus)
+	if (!cpus) {
+		evlist__delete(evlist);
 		return -ENOMEM;
+	}
 
 	perf_evlist__set_maps(&evlist->core, cpus, NULL);
 
@@ -163,10 +165,11 @@ static int __compute_metric(const char *name, struct value *vals,
 					     false, false,
 					     &metric_events);
 	if (err)
-		return err;
+		goto out;
 
-	if (perf_evlist__alloc_stats(evlist, false))
-		return -1;
+	err = perf_evlist__alloc_stats(evlist, false);
+	if (err)
+		goto out;
 
 	/* Load the runtime stats with given numbers for events. */
 	runtime_stat__init(&st);
@@ -178,13 +181,14 @@ static int __compute_metric(const char *name, struct value *vals,
 	if (name2 && ratio2)
 		*ratio2 = compute_single(&metric_events, evlist, &st, name2);
 
+out:
 	/* ... clenup. */
 	metricgroup__rblist_exit(&metric_events);
 	runtime_stat__exit(&st);
 	perf_evlist__free_stats(evlist);
 	perf_cpu_map__put(cpus);
 	evlist__delete(evlist);
-	return 0;
+	return err;
 }
 
 static int compute_metric(const char *name, struct value *vals, double *ratio)
-- 
2.28.0.526.ge36021eeef-goog


  parent reply	other threads:[~2020-09-07  3:45 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-07  3:44 [PATCHSET 0/9] perf tools: Fix various memory leaks Namhyung Kim
2020-09-07  3:44 ` [PATCH 1/9] perf evlist: Fix cpu/thread map leak Namhyung Kim
2020-09-07 11:29   ` Jiri Olsa
2020-09-07 11:32     ` Jiri Olsa
2020-09-07 13:22       ` Namhyung Kim
2020-09-07  3:44 ` [PATCH 2/9] perf parse-event: Fix cpu map leaks Namhyung Kim
2020-09-07  3:44 ` [PATCH 3/9] perf parse-event: Fix memory leak in evsel->unit Namhyung Kim
2020-09-07  3:44 ` Namhyung Kim [this message]
2020-09-07  3:44 ` [PATCH 5/9] perf metric: Release expr_parse_ctx after testing Namhyung Kim
2020-09-07  3:44 ` [PATCH 6/9] perf metric: Free metric when it failed to resolve Namhyung Kim
2020-09-07  3:45 ` [PATCH 7/9] perf metric: Do not free metric when " Namhyung Kim
2020-09-07  3:45 ` [PATCH 8/9] perf test: Free aliases for PMU event map aliases test Namhyung Kim
2020-09-07 10:28   ` John Garry
2020-09-07 13:20     ` Namhyung Kim
2020-09-07 13:47       ` John Garry
2020-09-07  3:45 ` [PATCH 9/9] perf test: Free formats for perf pmu parse test Namhyung Kim
2020-09-07 11:35 ` [PATCHSET 0/9] perf tools: Fix various memory leaks Jiri Olsa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200907034502.753230-5-namhyung@kernel.org \
    --to=namhyung@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=andi@firstfloor.org \
    --cc=eranian@google.com \
    --cc=irogers@google.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=mingo@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox