From patchwork Sun Sep 6 06:04:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 53165 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id A3B37212FE for ; Sun, 6 Sep 2015 06:05:53 +0000 (UTC) Received: by lbbmp1 with SMTP id mp1sf17147033lbb.2 for ; Sat, 05 Sep 2015 23:05:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe; bh=UjGSQx8G5wuAldJ6BhMqwaVu8mRqSOfAo/EMQG8v2QI=; b=G+vbQqmygRRFbqmwmMchpRL2y2WO48/jKWzXy541e6tSTpSiG/pQb2LS5eFx8K3xkO kHg+oKQkD7bvqosiG8qyDQVSoVJ3EOfnbP9R0IUqdslbAEhReYJkaWdTjlgdd4X0Q7KD LALXjJP1P6C2QT9rq+aCvkJLe3Q+r6oWuwkX4eO5FkYY1Cx4pUrt4lWbSNuDtRrEKNoc QoSxZXDnOUwa3BJ3BjMIHb0ldl1644QR2lvyjkKLRdl6N3ORh8eReRQgeSowjFmmf8Aq 4wURotAxsaB4Fi/40Q+7bYvQQrzxUxC4W9E01io0MKrRvsgUUXlHyaV9ehJUhNTfKdey Ljfg== X-Gm-Message-State: ALoCoQlqi2etq0v83wN5q4wK6+8b8XWMxiKBp9CR8FTt0znTNW7w4Om386H5xNqsGgT8P+wI6ISm X-Received: by 10.194.80.69 with SMTP id p5mr3282271wjx.2.1441519552553; Sat, 05 Sep 2015 23:05:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.4.71 with SMTP id i7ls82705lai.11.gmail; Sat, 05 Sep 2015 23:05:52 -0700 (PDT) X-Received: by 10.112.36.229 with SMTP id t5mr11340354lbj.61.1441519552351; Sat, 05 Sep 2015 23:05:52 -0700 (PDT) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id v7si5568968lav.62.2015.09.05.23.05.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Sep 2015 23:05:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by lagj9 with SMTP id j9so35439126lag.2 for ; Sat, 05 Sep 2015 23:05:52 -0700 (PDT) X-Received: by 10.112.166.106 with SMTP id zf10mr11424413lbb.36.1441519552200; Sat, 05 Sep 2015 23:05:52 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.164.42 with SMTP id yn10csp822455lbb; Sat, 5 Sep 2015 23:05:51 -0700 (PDT) X-Received: by 10.66.163.161 with SMTP id yj1mr29779562pab.34.1441519550987; Sat, 05 Sep 2015 23:05:50 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id zi5si13532460pac.113.2015.09.05.23.05.50; Sat, 05 Sep 2015 23:05:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751784AbbIFGFs (ORCPT + 28 others); Sun, 6 Sep 2015 02:05:48 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:7563 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751002AbbIFGFk (ORCPT ); Sun, 6 Sep 2015 02:05:40 -0400 Received: from 172.24.1.48 (EHLO szxeml426-hub.china.huawei.com) ([172.24.1.48]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id BMJ86864; Sun, 06 Sep 2015 14:05:09 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml426-hub.china.huawei.com (10.82.67.181) with Microsoft SMTP Server id 14.3.235.1; Sun, 6 Sep 2015 14:04:58 +0800 From: Wang Nan To: , CC: , Wang Nan , "Alexei Starovoitov" , Brendan Gregg , Daniel Borkmann , David Ahern , "He Kuang" , Jiri Olsa , Kaixu Xia , Namhyung Kim , Peter Zijlstra , Zefan Li , Subject: [PATCH] perf test: Test BPF prologue Date: Sun, 6 Sep 2015 06:04:51 +0000 Message-ID: <1441519491-149819-1-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1441519463-149781-1-git-send-email-wangnan0@huawei.com> References: <1441519463-149781-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020206.55EBD797.0004, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: c101a474b97ce91f21bc048a95d549ce Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangnan0@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch introduces a new BPF script to test BPF prologue. The new script probes at null_lseek, which is the function pointer when we try to lseek on '/dev/null'. null_lseek is chosen because it is a function pointer, so we don't need to consider inlining and LTP. By extracting file->f_mode, bpf-script-test-prologue.c should know whether the file is writable or readonly. According to llseek_loop() and bpf-script-test-prologue.c, one forth of total lseeks should be collected. This patch improve test__bpf so it can run multiple BPF programs on different test functions. Signed-off-by: Wang Nan Cc: Arnaldo Carvalho de Melo Cc: Alexei Starovoitov Cc: Brendan Gregg Cc: Daniel Borkmann Cc: David Ahern Cc: He Kuang Cc: Jiri Olsa Cc: Kaixu Xia Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama@163.com --- tools/perf/tests/Build | 9 ++- tools/perf/tests/bpf-script-test-prologue.c | 35 +++++++++++ tools/perf/tests/bpf.c | 93 +++++++++++++++++++++++------ tools/perf/tests/llvm.c | 5 ++ tools/perf/tests/llvm.h | 8 +++ 5 files changed, 130 insertions(+), 20 deletions(-) create mode 100644 tools/perf/tests/bpf-script-test-prologue.c diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build index 2bd5f37..3e98a97 100644 --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -32,7 +32,7 @@ perf-y += sample-parsing.o perf-y += parse-no-sample-id-all.o perf-y += kmod-path.o perf-y += thread-map.o -perf-y += llvm.o llvm-src-base.o llvm-src-kbuild.o +perf-y += llvm.o llvm-src-base.o llvm-src-kbuild.o llvm-src-prologue.o perf-y += bpf.o perf-y += topology.o @@ -50,6 +50,13 @@ $(OUTPUT)tests/llvm-src-kbuild.c: tests/bpf-script-test-kbuild.c $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@ $(Q)echo ';' >> $@ +$(OUTPUT)tests/llvm-src-prologue.c: tests/bpf-script-test-prologue.c + $(call rule_mkdir) + $(Q)echo '#include ' > $@ + $(Q)echo 'const char test_llvm__bpf_test_prologue_prog[] =' >> $@ + $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@ + $(Q)echo ';' >> $@ + perf-$(CONFIG_X86) += perf-time-to-tsc.o ifdef CONFIG_AUXTRACE perf-$(CONFIG_X86) += insn-x86.o diff --git a/tools/perf/tests/bpf-script-test-prologue.c b/tools/perf/tests/bpf-script-test-prologue.c new file mode 100644 index 0000000..7230e62 --- /dev/null +++ b/tools/perf/tests/bpf-script-test-prologue.c @@ -0,0 +1,35 @@ +/* + * bpf-script-test-prologue.c + * Test BPF prologue + */ +#ifndef LINUX_VERSION_CODE +# error Need LINUX_VERSION_CODE +# error Example: for 4.2 kernel, put 'clang-opt="-DLINUX_VERSION_CODE=0x40200" into llvm section of ~/.perfconfig' +#endif +#define SEC(NAME) __attribute__((section(NAME), used)) + +#include + +#define FMODE_READ 0x1 +#define FMODE_WRITE 0x2 + +static void (*bpf_trace_printk)(const char *fmt, int fmt_size, ...) = + (void *) 6; + +SEC("func=null_lseek file->f_mode offset orig") +int bpf_func__null_lseek(void *ctx, int err, unsigned long f_mode, + unsigned long offset, unsigned long orig) +{ + if (err) + return 0; + if (f_mode & FMODE_WRITE) + return 0; + if (offset & 1) + return 0; + if (orig == SEEK_CUR) + return 0; + return 1; +} + +char _license[] SEC("license") = "GPL"; +int _version SEC("version") = LINUX_VERSION_CODE; diff --git a/tools/perf/tests/bpf.c b/tools/perf/tests/bpf.c index 64aaab68..6305b3d 100644 --- a/tools/perf/tests/bpf.c +++ b/tools/perf/tests/bpf.c @@ -19,14 +19,37 @@ static int epoll_pwait_loop(void) return 0; } -static int prepare_bpf(void *obj_buf, size_t obj_buf_sz) +#ifdef HAVE_BPF_PROLOGUE + +static int llseek_loop(void) +{ + int fds[2], i; + + fds[0] = open("/dev/null", O_RDONLY); + fds[1] = open("/dev/null", O_RDWR); + + if (fds[0] < 0 || fds[1] < 0) + return -1; + + for (i = 0; i < NR_ITERS; i++) { + lseek(fds[i % 2], i, (i / 2) % 2 ? SEEK_CUR : SEEK_SET); + lseek(fds[(i + 1) % 2], i, (i / 2) % 2 ? SEEK_CUR : SEEK_SET); + } + close(fds[0]); + close(fds[1]); + return 0; +} + +#endif + +static int prepare_bpf(const char *name, void *obj_buf, size_t obj_buf_sz) { int err; char errbuf[BUFSIZ]; - err = bpf__prepare_load_buffer(obj_buf, obj_buf_sz, NULL); + err = bpf__prepare_load_buffer(obj_buf, obj_buf_sz, name); if (err) { - bpf__strerror_prepare_load("[buffer]", false, err, errbuf, + bpf__strerror_prepare_load(name, false, err, errbuf, sizeof(errbuf)); fprintf(stderr, " (%s)", errbuf); return TEST_FAIL; @@ -49,7 +72,7 @@ static int prepare_bpf(void *obj_buf, size_t obj_buf_sz) return 0; } -static int do_test(void) +static int do_test(int (*func)(void), int expect) { struct record_opts opts = { .target = { @@ -106,7 +129,7 @@ static int do_test(void) } perf_evlist__enable(evlist); - epoll_pwait_loop(); + (*func)(); perf_evlist__disable(evlist); for (i = 0; i < evlist->nr_mmaps; i++) { @@ -120,8 +143,8 @@ static int do_test(void) } } - if (count != (NR_ITERS + 1) / 2) { - fprintf(stderr, " (filter result incorrect)"); + if (count != expect) { + fprintf(stderr, " (filter result incorrect: %d != %d)", count, expect); err = -EBADF; } @@ -132,30 +155,30 @@ out_delete_evlist: return 0; } -int test__bpf(void) +static int __test__bpf(int index, const char *name, + const char *message_compile, + const char *message_load, + int (*func)(void), int expect) { int err; void *obj_buf; size_t obj_buf_sz; - if (geteuid() != 0) { - fprintf(stderr, " (try run as root)"); - return TEST_SKIP; - } - - test_llvm__fetch_bpf_obj(&obj_buf, &obj_buf_sz, LLVM_TESTCASE_BASE); - + test_llvm__fetch_bpf_obj(&obj_buf, &obj_buf_sz, index); if (!obj_buf || !obj_buf_sz) { if (verbose == 0) - fprintf(stderr, " (fix 'perf test LLVM' first)"); + fprintf(stderr, " (%s)", message_compile); return TEST_SKIP; } - err = prepare_bpf(obj_buf, obj_buf_sz); - if (err) + err = prepare_bpf(name, obj_buf, obj_buf_sz); + if (err) { + if ((verbose == 0) && (message_load[0] != '\0')) + fprintf(stderr, " (%s)", message_load); goto out; + } - err = do_test(); + err = do_test(func, expect); if (err) goto out; out: @@ -166,6 +189,38 @@ out: return 0; } +int test__bpf(void) +{ + int err; + + if (geteuid() != 0) { + fprintf(stderr, " (try run as root)"); + return TEST_SKIP; + } + + err = __test__bpf(LLVM_TESTCASE_BASE, + "[basic_bpf_test]", + "fix 'perf test LLVM' first", + "load bpf object failed", + &epoll_pwait_loop, + (NR_ITERS + 1) / 2); + if (err) + return err; + +#ifdef HAVE_BPF_PROLOGUE + err = __test__bpf(LLVM_TESTCASE_BPF_PROLOGUE, + "[bpf_prologue_test]", + "fix kbuild first", + "check your vmlinux setting?", + &llseek_loop, + (NR_ITERS + 1) / 4); + return err; +#else + fprintf(stderr, " (skip BPF prologue test)"); + return TEST_OK; +#endif +} + #else int test__bpf(void) { diff --git a/tools/perf/tests/llvm.c b/tools/perf/tests/llvm.c index 75cd99f..e722e8a 100644 --- a/tools/perf/tests/llvm.c +++ b/tools/perf/tests/llvm.c @@ -22,6 +22,11 @@ struct llvm_testcase { [LLVM_TESTCASE_KBUILD] = {.source = test_llvm__bpf_test_kbuild_prog, .errmsg = "llvm.kbuild-dir can be fixed", .tried = false}, + /* Don't output if this one fail. */ + [LLVM_TESTCASE_BPF_PROLOGUE] = { + .source = test_llvm__bpf_test_prologue_prog, + .errmsg = "failed for unknown reason", + .tried = false}, {.source = NULL} }; diff --git a/tools/perf/tests/llvm.h b/tools/perf/tests/llvm.h index 78ec01d..c00c1be 100644 --- a/tools/perf/tests/llvm.h +++ b/tools/perf/tests/llvm.h @@ -10,10 +10,18 @@ struct test_llvm__bpf_result { extern const char test_llvm__bpf_prog[]; extern const char test_llvm__bpf_test_kbuild_prog[]; +extern const char test_llvm__bpf_test_prologue_prog[]; enum test_llvm__testcase { LLVM_TESTCASE_BASE, LLVM_TESTCASE_KBUILD, + /* + * We must put LLVM_TESTCASE_BPF_PROLOGUE after + * LLVM_TESTCASE_KBUILD, so if kbuild test failed, + * don't need to try this one, because it depend on + * kernel header. + */ + LLVM_TESTCASE_BPF_PROLOGUE, NR_LLVM_TESTCASES, }; void test_llvm__fetch_bpf_obj(void **p_obj_buf, size_t *p_obj_buf_sz, int index);