* [tip:perf/core] perf test: Create kernel maps properly for hist entries test
[not found] <tip-k4snzv5t4dvdckggzwdzyljo@git.kernel.org>
@ 2015-12-08 4:32 ` tip-bot for Jiri Olsa
0 siblings, 0 replies; only message in thread
From: tip-bot for Jiri Olsa @ 2015-12-08 4:32 UTC (permalink / raw)
To: linux-tip-commits
Cc: masami.hiramatsu.pt, adrian.hunter, mingo, jolsa, tglx,
linux-kernel, acme, a.p.zijlstra, dsahern, wangnan0, hpa,
namhyung
Commit-ID: d6e94fa6b6dab4668e46665bbe766142af32cc15
Gitweb: http://git.kernel.org/tip/d6e94fa6b6dab4668e46665bbe766142af32cc15
Author: Jiri Olsa <jolsa@kernel.org>
AuthorDate: Wed, 2 Dec 2015 22:08:29 +0100
Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Mon, 7 Dec 2015 18:12:56 -0300
perf test: Create kernel maps properly for hist entries test
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
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
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/tip-k4snzv5t4dvdckggzwdzyljo@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/tests/hists_common.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/perf/tests/hists_common.c b/tools/perf/tests/hists_common.c
index ce80b27..46f453b 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;
+ }
+
for (i = 0; i < ARRAY_SIZE(fake_threads); i++) {
struct thread *thread;
^ permalink raw reply [flat|nested] only message in thread