Skip to content

Commit 71b3ee7

Browse files
WangNan0acmel
authored andcommitted
perf test: Fix false TEST_OK result for 'perf test hist'
Commit 71d6de6 ("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 <[email protected]> Signed-off-by: Wang Nan <[email protected]> Tested-by: Arnaldo Carvalho de Melo <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Masami Hiramatsu <[email protected]> Cc: Zefan Li <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 0c4d40d commit 71b3ee7

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

tools/perf/tests/hists_common.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,6 @@ struct machine *setup_fake_machine(struct machines *machines)
8787
return NULL;
8888
}
8989

90-
if (machine__create_kernel_maps(machine)) {
91-
pr_debug("Cannot create kernel maps\n");
92-
return NULL;
93-
}
94-
9590
for (i = 0; i < ARRAY_SIZE(fake_threads); i++) {
9691
struct thread *thread;
9792

0 commit comments

Comments
 (0)