From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762197AbcALKLx (ORCPT ); Tue, 12 Jan 2016 05:11:53 -0500 Received: from terminus.zytor.com ([198.137.202.10]:56594 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753089AbcALKLs (ORCPT ); Tue, 12 Jan 2016 05:11:48 -0500 Date: Tue, 12 Jan 2016 02:11:33 -0800 From: tip-bot for Wang Nan Message-ID: Cc: linux-kernel@vger.kernel.org, lizefan@huawei.com, tglx@linutronix.de, hpa@zytor.com, masami.hiramatsu.pt@hitachi.com, acme@redhat.com, namhyung@kernel.org, jolsa@kernel.org, mingo@kernel.org, wangnan0@huawei.com Reply-To: acme@redhat.com, namhyung@kernel.org, jolsa@kernel.org, mingo@kernel.org, wangnan0@huawei.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, lizefan@huawei.com, hpa@zytor.com, masami.hiramatsu.pt@hitachi.com In-Reply-To: <1452520124-2073-12-git-send-email-wangnan0@huawei.com> References: <1452520124-2073-12-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf test: Fix false TEST_OK result for ' perf test hist' Git-Commit-ID: 71b3ee7e65ffb48135d875d9c36e3183b9ecffeb X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 71b3ee7e65ffb48135d875d9c36e3183b9ecffeb Gitweb: http://git.kernel.org/tip/71b3ee7e65ffb48135d875d9c36e3183b9ecffeb Author: Wang Nan AuthorDate: Mon, 11 Jan 2016 13:48:02 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 11 Jan 2016 19:22:22 -0300 perf test: Fix false TEST_OK result for 'perf test hist' 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 Signed-off-by: Wang Nan Tested-by: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Masami Hiramatsu Cc: Zefan Li 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 --- 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 bcfd081..071a8b5 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;