From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Wang Nan <wangnan0@huawei.com>,
Jiri Olsa <jolsa@kernel.org>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Zefan Li <lizefan@huawei.com>,
pi3orama@163.com, Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 11/12] perf test: Fix false TEST_OK result for 'perf test hist'
Date: Mon, 11 Jan 2016 20:32:00 -0300 [thread overview]
Message-ID: <1452555121-21739-12-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1452555121-21739-1-git-send-email-acme@kernel.org>
From: Wang Nan <wangnan0@huawei.com>
Commit 71d6de64fedd ("perf test: Fix hist testcases when kptr_restrict is on")
solves a double free problem when 'perf test hist' calling
setup_fake_machine(). However, the result is still incorrect. For example:
$ ./perf test -v 'filtering hist entries'
25: Test filtering hist entries :
--- start ---
test child forked, pid 4186
Cannot create kernel maps
test child finished with 0
---- end ----
Test filtering hist entries: Ok
In this case the body of this test is not get executed at all, but the
result is 'Ok'.
Actually, in setup_fake_machine() there's no need to create real kernel
maps. What we want are the fake maps. This patch removes the
machine__create_kernel_maps() in setup_fake_machine(), so it won't be
affected by kptr_restrict setting.
Test result:
$ cat /proc/sys/kernel/kptr_restrict
1
$ ~/perf test -v hist
15: Test matching and linking multiple hists :
--- start ---
test child forked, pid 24031
test child finished with 0
---- end ----
Test matching and linking multiple hists: Ok
[SNIP]
Suggested-and-Acked-by: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1452520124-2073-12-git-send-email-wangnan0@huawei.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/tests/hists_common.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/tools/perf/tests/hists_common.c b/tools/perf/tests/hists_common.c
index bcfd081ee1d2..071a8b5f5232 100644
--- a/tools/perf/tests/hists_common.c
+++ b/tools/perf/tests/hists_common.c
@@ -87,11 +87,6 @@ struct machine *setup_fake_machine(struct machines *machines)
return NULL;
}
- if (machine__create_kernel_maps(machine)) {
- pr_debug("Cannot create kernel maps\n");
- return NULL;
- }
-
for (i = 0; i < ARRAY_SIZE(fake_threads); i++) {
struct thread *thread;
--
2.1.0
next prev parent reply other threads:[~2016-01-11 23:33 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-11 23:31 [GIT PULL 00/12] perf/core fixes Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 01/12] tools: Add clean targets for tools directory Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 02/12] tools bpf: Add *.cmd files clean up Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 03/12] tools lockdep: " Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 04/12] perf tools: Add missing sources to perf's MANIFEST Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 05/12] perf tools: Add -lutil in python lib list for broken python-config Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 06/12] perf tools: Fix phony build target for build-test Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 07/12] perf tools: Fix PowerPC native building Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 08/12] tools: Move Makefile.arch from perf/config to tools/scripts Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 09/12] perf bpf: Fix build breakage due to libbpf Arnaldo Carvalho de Melo
2016-01-11 23:31 ` [PATCH 10/12] tools build: Add BPF feature check to test-all Arnaldo Carvalho de Melo
2016-01-11 23:32 ` Arnaldo Carvalho de Melo [this message]
2016-01-11 23:32 ` [PATCH 12/12] perf test: Reset err after using it hold errcode in hist testcases Arnaldo Carvalho de Melo
2016-01-12 10:04 ` [GIT PULL 00/12] perf/core 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=1452555121-21739-12-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=acme@redhat.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@kernel.org \
--cc=pi3orama@163.com \
--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.