public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Taeung Song <treeze.taeung@gmail.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 3/8] perf kmem: Fill in the missing session freeing after an error occurs
Date: Wed,  1 Jul 2015 18:23:24 -0300	[thread overview]
Message-ID: <1435785809-3927-4-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1435785809-3927-1-git-send-email-acme@kernel.org>

From: Taeung Song <treeze.taeung@gmail.com>

When an error occurs an error value is just returned without freeing the
session. So allocating and freeing session have to be matched as a pair
even if an error occurs.

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1435652124-22414-3-git-send-email-treeze.taeung@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/builtin-kmem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 950f296dfcf7..23b1faaaa4cc 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -1916,7 +1916,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
 		if (!perf_evlist__find_tracepoint_by_name(session->evlist,
 							  "kmem:kmalloc")) {
 			pr_err(errmsg, "slab", "slab");
-			return -1;
+			goto out_delete;
 		}
 	}
 
@@ -1927,7 +1927,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
 							     "kmem:mm_page_alloc");
 		if (evsel == NULL) {
 			pr_err(errmsg, "page", "page");
-			return -1;
+			goto out_delete;
 		}
 
 		kmem_page_size = pevent_get_page_size(evsel->tp_format->pevent);
-- 
2.1.0


  parent reply	other threads:[~2015-07-01 21:25 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-01 21:23 [GIT PULL 0/8] perf/core fixes Arnaldo Carvalho de Melo
2015-07-01 21:23 ` [PATCH 1/8] perf tools: Add missing break for PERF_RECORD_ITRACE_START Arnaldo Carvalho de Melo
2015-07-01 21:23 ` [PATCH 2/8] perf inject: Fill in the missing session freeing after an error occurs Arnaldo Carvalho de Melo
2015-07-01 21:23 ` Arnaldo Carvalho de Melo [this message]
2015-07-01 21:23 ` [PATCH 4/8] perf report: " Arnaldo Carvalho de Melo
2015-07-01 21:23 ` [PATCH 5/8] perf kvm: " Arnaldo Carvalho de Melo
2015-07-01 21:23 ` [PATCH 6/8] perf mem: " Arnaldo Carvalho de Melo
2015-07-01 21:23 ` [PATCH 7/8] perf tools: Create config.detected into OUTPUT directory Arnaldo Carvalho de Melo
2015-07-01 21:23 ` [PATCH 8/8] perf tools: Allow to specify custom linker command Arnaldo Carvalho de Melo
2015-07-02  8:50 ` [GIT PULL 0/8] perf/core fixes Ingo Molnar
2015-07-02  8:56 ` Ingo Molnar
2015-07-02  9:11   ` Jiri Olsa
2015-07-02  9:22     ` Ingo Molnar

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=1435785809-3927-4-git-send-email-acme@kernel.org \
    --to=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=treeze.taeung@gmail.com \
    /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