From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755763AbcBCKTQ (ORCPT ); Wed, 3 Feb 2016 05:19:16 -0500 Received: from terminus.zytor.com ([198.137.202.10]:54740 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753438AbcBCKTM (ORCPT ); Wed, 3 Feb 2016 05:19:12 -0500 Date: Wed, 3 Feb 2016 02:18:11 -0800 From: tip-bot for Wang Nan Message-ID: Cc: lizefan@huawei.com, wangnan0@huawei.com, ast@kernel.org, hpa@zytor.com, peterz@infradead.org, masami.hiramatsu.pt@hitachi.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, daniel@iogearbox.net, mingo@kernel.org, acme@redhat.com, brendan.d.gregg@gmail.com, jolsa@kernel.org, hekuang@huawei.com, tglx@linutronix.de, will.deacon@arm.com Reply-To: namhyung@kernel.org, linux-kernel@vger.kernel.org, peterz@infradead.org, masami.hiramatsu.pt@hitachi.com, wangnan0@huawei.com, ast@kernel.org, hpa@zytor.com, lizefan@huawei.com, will.deacon@arm.com, hekuang@huawei.com, tglx@linutronix.de, brendan.d.gregg@gmail.com, acme@redhat.com, jolsa@kernel.org, mingo@kernel.org, daniel@iogearbox.net In-Reply-To: <1453715801-7732-7-git-send-email-wangnan0@huawei.com> References: <1453715801-7732-7-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf test: Check environment before start real BPF test Git-Commit-ID: 6a7d550e8b2eeb380ab85d9bc53571123b98345b 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: 6a7d550e8b2eeb380ab85d9bc53571123b98345b Gitweb: http://git.kernel.org/tip/6a7d550e8b2eeb380ab85d9bc53571123b98345b Author: Wang Nan AuthorDate: Mon, 25 Jan 2016 09:55:53 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 29 Jan 2016 17:25:43 -0300 perf test: Check environment before start real BPF test Copying perf to old kernel system results: # perf test bpf 37: Test BPF filter : 37.1: Test basic BPF filtering : FAILED! 37.2: Test BPF prologue generation : Skip However, in case when kernel doesn't support a test case it should return 'Skip', 'FAILED!' should be reserved for kernel tests for when the kernel supports a feature that then fails to work as advertised. This patch checks environment before real testcase. Signed-off-by: Wang Nan Suggested-by: Arnaldo Carvalho de Melo Cc: Alexei Starovoitov Cc: Brendan Gregg Cc: Daniel Borkmann Cc: He Kuang Cc: Jiri Olsa Cc: Li Zefan Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Will Deacon Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1453715801-7732-7-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/bpf.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c index 952ca99..4aed5cb 100644 --- a/tools/perf/tests/bpf.c +++ b/tools/perf/tests/bpf.c @@ -1,7 +1,11 @@ #include #include +#include #include #include +#include +#include +#include #include "tests.h" #include "llvm.h" #include "debug.h" @@ -243,6 +247,36 @@ const char *test__bpf_subtest_get_desc(int i) return bpf_testcase_table[i].desc; } +static int check_env(void) +{ + int err; + unsigned int kver_int; + char license[] = "GPL"; + + struct bpf_insn insns[] = { + BPF_MOV64_IMM(BPF_REG_0, 1), + BPF_EXIT_INSN(), + }; + + err = fetch_kernel_version(&kver_int, NULL, 0); + if (err) { + pr_debug("Unable to get kernel version\n"); + return err; + } + + err = bpf_load_program(BPF_PROG_TYPE_KPROBE, insns, + sizeof(insns) / sizeof(insns[0]), + license, kver_int, NULL, 0); + if (err < 0) { + pr_err("Missing basic BPF support, skip this test: %s\n", + strerror(errno)); + return err; + } + close(err); + + return 0; +} + int test__bpf(int i) { int err; @@ -255,6 +289,9 @@ int test__bpf(int i) return TEST_SKIP; } + if (check_env()) + return TEST_SKIP; + err = __test__bpf(i); return err; }