Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752497AbbKWQJG (ORCPT ); Mon, 23 Nov 2015 11:09:06 -0500 Received: from terminus.zytor.com ([198.137.202.10]:43798 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751429AbbKWQJE (ORCPT ); Mon, 23 Nov 2015 11:09:04 -0500 Date: Mon, 23 Nov 2015 08:08:27 -0800 From: tip-bot for Wang Nan Message-ID: Cc: lizefan@huawei.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, wangnan0@huawei.com, acme@redhat.com, mingo@kernel.org, ast@kernel.org, hpa@zytor.com, masami.hiramatsu.pt@hitachi.com Reply-To: ast@kernel.org, hpa@zytor.com, masami.hiramatsu.pt@hitachi.com, mingo@kernel.org, acme@redhat.com, wangnan0@huawei.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, lizefan@huawei.com In-Reply-To: <1447749170-175898-2-git-send-email-wangnan0@huawei.com> References: <1447749170-175898-2-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf test: Fix 'perf test BPF' when it fails to find a suitable vmlinux Git-Commit-ID: ad0dd7aed5df8009b3ffa39bec73ad93283332c9 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 Content-Length: 2365 Lines: 70 Commit-ID: ad0dd7aed5df8009b3ffa39bec73ad93283332c9 Gitweb: http://git.kernel.org/tip/ad0dd7aed5df8009b3ffa39bec73ad93283332c9 Author: Wang Nan AuthorDate: Tue, 17 Nov 2015 08:32:46 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 18 Nov 2015 17:51:04 -0300 perf test: Fix 'perf test BPF' when it fails to find a suitable vmlinux Two bugs in 'perf test BPF' are found when testing BPF prologue without vmlinux: # mv /lib/modules/4.3.0-rc4+/build/vmlinux{,.bak} # ./perf test BPF 37: Test BPF filter :Failed to find the path for kernel: No such file or directory Ok Test BPF should fail in this case. After this patch: # ./perf test BPF 37: Test BPF filter :Failed to find the path for kernel: No such file or directory FAILED! # mv /lib/modules/4.3.0-rc4+/build/vmlinux{.bak,} # ./perf test BPF 37: Test BPF filter : Ok Signed-off-by: Wang Nan Cc: Alexei Starovoitov Cc: Masami Hiramatsu Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1447749170-175898-2-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/bpf.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c index d584422..232043c 100644 --- a/tools/perf/tests/bpf.c +++ b/tools/perf/tests/bpf.c @@ -102,8 +102,7 @@ static int do_test(struct bpf_object *obj, int (*func)(void), err = parse_events_load_bpf_obj(&parse_evlist, &parse_evlist.list, obj); if (err || list_empty(&parse_evlist.list)) { pr_debug("Failed to add events selected by BPF\n"); - if (!err) - return TEST_FAIL; + return TEST_FAIL; } snprintf(pid, sizeof(pid), "%d", getpid()); @@ -157,8 +156,10 @@ static int do_test(struct bpf_object *obj, int (*func)(void), } } - if (count != expect) + if (count != expect) { pr_debug("BPF filter result incorrect\n"); + goto out_delete_evlist; + } ret = TEST_OK; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/