linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: tip-bot for Jiri Olsa <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: hpa@zytor.com, adrian.hunter@intel.com, namhyung@kernel.org,
	jolsa@kernel.org, acme@redhat.com, a.p.zijlstra@chello.nl,
	tglx@linutronix.de, wangnan0@huawei.com, dsahern@gmail.com,
	masami.hiramatsu.pt@hitachi.com, linux-kernel@vger.kernel.org,
	mingo@kernel.org
Subject: [tip:perf/core] perf test: Fix cpus and thread maps reference in error path
Date: Mon, 7 Dec 2015 20:32:01 -0800	[thread overview]
Message-ID: <tip-7320b1b3d9e6af30adcbead64568be3c40b50e59@git.kernel.org> (raw)
In-Reply-To: <1449131658-1841-5-git-send-email-jolsa@kernel.org>

Commit-ID:  7320b1b3d9e6af30adcbead64568be3c40b50e59
Gitweb:     http://git.kernel.org/tip/7320b1b3d9e6af30adcbead64568be3c40b50e59
Author:     Jiri Olsa <jolsa@kernel.org>
AuthorDate: Thu, 3 Dec 2015 09:34:15 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 7 Dec 2015 18:12:55 -0300

perf test: Fix cpus and thread maps reference in error path

In error path to try user space event, both cpus and threads map now
owned by evlist and freed by perf_evlist__set_maps call.  Getting
reference to keep them alive.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/1449131658-1841-5-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/tests/code-reading.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index 26182ff..313a48c 100644
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -547,6 +547,13 @@ static int do_test_code_reading(bool try_kcore)
 		if (ret < 0) {
 			if (!excl_kernel) {
 				excl_kernel = true;
+				/*
+				 * Both cpus and threads are now owned by evlist
+				 * and will be freed by following perf_evlist__set_maps
+				 * call. Getting refference to keep them alive.
+				 */
+				cpu_map__get(cpus);
+				thread_map__get(threads);
 				perf_evlist__set_maps(evlist, NULL, NULL);
 				perf_evlist__delete(evlist);
 				evlist = NULL;

  reply	other threads:[~2015-12-08  4:32 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-03  8:34 [PATCH 0/7] perf test: Fixes Jiri Olsa
2015-12-03  8:34 ` [PATCH 1/7] perf test: Use machine__new_host in dwarf unwind test Jiri Olsa
2015-12-08  4:31   ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-12-03  8:34 ` [PATCH 2/7] perf test: Use machine__new_host in mma thread lookup test Jiri Olsa
2015-12-04 13:22   ` Namhyung Kim
2015-12-06 16:05     ` Jiri Olsa
2015-12-08  4:31   ` [tip:perf/core] perf test: Use machine__new_host in mmap " tip-bot for Jiri Olsa
2015-12-03  8:34 ` [PATCH 3/7] perf test: Use machine__new_host in mma thread code reading test Jiri Olsa
2015-12-08  4:31   ` [tip:perf/core] perf test: Use machine__new_host in mmap " tip-bot for Jiri Olsa
2015-12-03  8:34 ` [PATCH 4/7] perf test: Fix cpus and thread maps refference in error path Jiri Olsa
2015-12-08  4:32   ` tip-bot for Jiri Olsa [this message]
2015-12-03  8:34 ` [PATCH 5/7] perf test: Prevent using bpf-output event in round trip name test Jiri Olsa
2015-12-08  4:32   ` [tip:perf/core] " tip-bot for Jiri Olsa
2015-12-03  8:34 ` [PATCH 6/7] perf test: Use machine__new_host in thread mg sharing test Jiri Olsa
2015-12-03  8:34 ` [PATCH 7/7] perf test: Create kernel maps properly for hist entries test Jiri Olsa
2015-12-04 13:23   ` Namhyung Kim
2015-12-06 16:07     ` [PATCHv2 " Jiri Olsa
2015-12-03  9:09 ` [PATCH 0/7] perf test: Fixes Jiri Olsa
2015-12-04 13:26 ` Namhyung Kim

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=tip-7320b1b3d9e6af30adcbead64568be3c40b50e59@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@redhat.com \
    --cc=adrian.hunter@intel.com \
    --cc=dsahern@gmail.com \
    --cc=hpa@zytor.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=wangnan0@huawei.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;
as well as URLs for NNTP newsgroup(s).