From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: lkml <linux-kernel@vger.kernel.org>,
"David Ahern" <dsahern@gmail.com>,
"Ingo Molnar" <mingo@kernel.org>,
"Namhyung Kim" <namhyung@kernel.org>,
"Peter Zijlstra" <a.p.zijlstra@chello.nl>,
HIRAMATU,MASAMI <masami.hiramatsu.pt@hitachi.com>,
"Wang Nan" <wangnan0@huawei.com>,
"Adrian Hunter" <adrian.hunter@intel.com>
Subject: [PATCH 7/7] perf test: Create kernel maps properly for hist entries test
Date: Thu, 3 Dec 2015 09:34:18 +0100 [thread overview]
Message-ID: <1449131658-1841-8-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1449131658-1841-1-git-send-email-jolsa@kernel.org>
It fixes segfault within machine__exit, that's caused
but not creating kernel maps for machine.. We're calling
machine__destroy_kernel_maps in machine__exit since commit:
ebe9729c8c31 perf machine: Fix to destroy kernel maps when machine exits
Link: http://lkml.kernel.org/n/tip-k4snzv5t4dvdckggzwdzyljo@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/perf/tests/hists_common.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/perf/tests/hists_common.c b/tools/perf/tests/hists_common.c
index ce80b274b097..6ccdc8ac9578 100644
--- a/tools/perf/tests/hists_common.c
+++ b/tools/perf/tests/hists_common.c
@@ -87,6 +87,11 @@ struct machine *setup_fake_machine(struct machines *machines)
return NULL;
}
+ if (machine__create_kernel_maps(machine)) {
+ pr_debug("Not enough memory for machine setup\n");
+ goto out_maps;
+ }
+
for (i = 0; i < ARRAY_SIZE(fake_threads); i++) {
struct thread *thread;
@@ -149,6 +154,8 @@ struct machine *setup_fake_machine(struct machines *machines)
out:
pr_debug("Not enough memory for machine setup\n");
+
+out_maps:
machine__delete_threads(machine);
machine__delete(machine);
return NULL;
--
2.4.3
next prev parent reply other threads:[~2015-12-03 8:34 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:perf/core] perf test: Fix cpus and thread maps reference " tip-bot for Jiri Olsa
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 ` Jiri Olsa [this message]
2015-12-04 13:23 ` [PATCH 7/7] perf test: Create kernel maps properly for hist entries test 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=1449131658-1841-8-git-send-email-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=dsahern@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=namhyung@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 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).