From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
David Ahern <dsahern@gmail.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Wang Nan <wangnan0@huawei.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 05/14] perf test: Fix cpus and thread maps reference in error path
Date: Mon, 7 Dec 2015 19:17:10 -0300 [thread overview]
Message-ID: <1449526639-3667-6-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1449526639-3667-1-git-send-email-acme@kernel.org>
From: Jiri Olsa <jolsa@kernel.org>
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 26182ffcea75..313a48c6b2bc 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;
--
2.1.0
next prev parent reply other threads:[~2015-12-07 22:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-07 22:17 [GIT PULL 00/14] perf/core improvements and fixes Arnaldo Carvalho de Melo
2015-12-07 22:17 ` [PATCH 01/14] perf machine: Pass correct string to dso__adjust_kmod_long_name Arnaldo Carvalho de Melo
2015-12-07 22:17 ` [PATCH 02/14] perf test: Use machine__new_host in dwarf unwind test Arnaldo Carvalho de Melo
2015-12-07 22:17 ` [PATCH 03/14] perf test: Use machine__new_host in mmap thread lookup test Arnaldo Carvalho de Melo
2015-12-07 22:17 ` [PATCH 04/14] perf test: Use machine__new_host in mmap thread code reading test Arnaldo Carvalho de Melo
2015-12-07 22:17 ` Arnaldo Carvalho de Melo [this message]
2015-12-07 22:17 ` [PATCH 06/14] perf test: Prevent using bpf-output event in round trip name test Arnaldo Carvalho de Melo
2015-12-07 22:17 ` [PATCH 07/14] perf test: Create kernel maps properly for hist entries test Arnaldo Carvalho de Melo
2015-12-07 22:17 ` [PATCH 08/14] perf evsel: Use event maps directly in perf_evsel__enable Arnaldo Carvalho de Melo
2015-12-07 22:17 ` [PATCH 09/14] perf evsel: Introduce disable() method Arnaldo Carvalho de Melo
2015-12-07 22:17 ` [PATCH 10/14] perf evlist: Factor perf_evlist__(enable|disable) functions Arnaldo Carvalho de Melo
2015-12-07 22:17 ` [PATCH 11/14] perf stat: Use perf_evlist__enable in handle_initial_delay Arnaldo Carvalho de Melo
2015-12-07 22:17 ` [PATCH 12/14] perf stat: Create events as disabled Arnaldo Carvalho de Melo
2015-12-07 22:17 ` [PATCH 13/14] perf stat: Move enable_on_exec setup under earlier code Arnaldo Carvalho de Melo
2015-12-07 22:17 ` [PATCH 14/14] perf annotate: ARM support Arnaldo Carvalho de Melo
2015-12-08 4:24 ` [GIT PULL 00/14] perf/core improvements and fixes 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=1449526639-3667-6-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.