From patchwork Sat Aug 29 04:21: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: 52841 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by patches.linaro.org (Postfix) with ESMTPS id 04BED20503 for ; Sat, 29 Aug 2015 04:29:05 +0000 (UTC) Received: by lbcue2 with SMTP id ue2sf22522974lbc.1 for ; Fri, 28 Aug 2015 21:29:04 -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=06zgGMNYTC4/cmrFHSjre3fLAgP5518QpDi3GLQ0AnY=; b=RBqa9tqZDVVUPPjeJWtDQfc2WflLvOMvYwF1v1MsMSwAO1aDpQpIAr3sYdBz59g+GW 2eBYnKloXsSVUyyvhQBfXm7jo/3a12MNT4SJOzB1p2gUrRkjWo2OSXVsws/PAMsk3828 s5BpugUt9z3V1H22Sfdan5trlfArKUv+QtWcKjo9F0Dy9oe5epX5d7xcBMKNmowCdfp4 tK3AMdMXLfkkMeJjyJEL76FFETiqL8ej//yMqG+5pIwrEnxBlOXCRNNgDAYKYTtMY7Gr Xd+txCAHKe5rpaMFXSi+ybGLRXfUpWhW7ceOhssT4YVokEDZnf+/XKCXzbbIuTajzIWf qjBw== X-Gm-Message-State: ALoCoQk79acQ/Cr+z/71EMfn02Ax9kuIiJt+ngQwqXqBWTTqV4AbUg8Ho8VfzZ2kRMEA5iHjQ6ea X-Received: by 10.180.92.73 with SMTP id ck9mr174641wib.7.1440822543995; Fri, 28 Aug 2015 21:29:03 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.170 with SMTP id l10ls282749lah.82.gmail; Fri, 28 Aug 2015 21:29:03 -0700 (PDT) X-Received: by 10.112.130.97 with SMTP id od1mr6067370lbb.37.1440822543674; Fri, 28 Aug 2015 21:29:03 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id e1si7668669lbs.96.2015.08.28.21.29.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Aug 2015 21:29:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by lanb10 with SMTP id b10so8389532lan.2 for ; Fri, 28 Aug 2015 21:29:03 -0700 (PDT) X-Received: by 10.152.207.39 with SMTP id lt7mr821436lac.88.1440822543544; Fri, 28 Aug 2015 21:29:03 -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.151.194 with SMTP id us2csp268980lbb; Fri, 28 Aug 2015 21:29:02 -0700 (PDT) X-Received: by 10.66.149.102 with SMTP id tz6mr20160017pab.125.1440822542444; Fri, 28 Aug 2015 21:29:02 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id do4si13357507pdb.168.2015.08.28.21.29.01; Fri, 28 Aug 2015 21:29:02 -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 S1753378AbbH2E3A (ORCPT + 28 others); Sat, 29 Aug 2015 00:29:00 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:39783 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752344AbbH2EXw (ORCPT ); Sat, 29 Aug 2015 00:23:52 -0400 Received: from 172.24.1.47 (EHLO szxeml431-hub.china.huawei.com) ([172.24.1.47]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CTY94472; Sat, 29 Aug 2015 12:23:17 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml431-hub.china.huawei.com (10.82.67.208) with Microsoft SMTP Server id 14.3.235.1; Sat, 29 Aug 2015 12:23:09 +0800 From: Wang Nan To: , , CC: , , , Wang Nan , He Kuang , Brendan Gregg , Daniel Borkmann , "David Ahern" , Jiri Olsa , Kaixu Xia , Masami Hiramatsu , Namhyung Kim , Peter Zijlstra Subject: [PATCH 17/31] perf tests: Enforce LLVM test for BPF test Date: Sat, 29 Aug 2015 04:21:51 +0000 Message-ID: <1440822125-52691-18-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1440822125-52691-1-git-send-email-wangnan0@huawei.com> References: <1440822125-52691-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected 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.41 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 replaces the original toy BPF program with previous introduced bpf-script-example.c. Dynamically embedded it into 'llvm-src.c'. The newly introduced BPF program attaches a BPF program at 'sys_epoll_pwait()', and collect half samples from it. perf itself never use that syscall, so further test can verify their result with it. Since BPF program require LINUX_VERSION_CODE of runtime kernel, this patch computes that code from uname. Since the resuling BPF object is useful for further testcases, this patch introduces 'prepare' and 'cleanup' method to tests, and makes test__llvm() create a MAP_SHARED memory array to hold the resulting object. Signed-off-by: He Kuang Signed-off-by: Wang Nan Cc: Arnaldo Carvalho de Melo Cc: Alexei Starovoitov Cc: Brendan Gregg Cc: Daniel Borkmann Cc: David Ahern Cc: Jiri Olsa Cc: Kaixu Xia Cc: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Zefan Li Cc: pi3orama@163.com Link: http://lkml.kernel.org/n/1440151770-129878-15-git-send-email-wangnan0@huawei.com --- tools/perf/tests/Build | 9 +++- tools/perf/tests/builtin-test.c | 8 ++++ tools/perf/tests/llvm.c | 104 +++++++++++++++++++++++++++++++++++----- tools/perf/tests/llvm.h | 14 ++++++ tools/perf/tests/tests.h | 2 + 5 files changed, 123 insertions(+), 14 deletions(-) create mode 100644 tools/perf/tests/llvm.h diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build index c1518bd..8c98409 100644 --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -32,7 +32,14 @@ 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 +perf-y += llvm.o llvm-src.o + +$(OUTPUT)tests/llvm-src.c: tests/bpf-script-example.c + $(Q)echo '#include ' > $@ + $(Q)echo 'const char test_llvm__bpf_prog[] =' >> $@ + $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@ + $(Q)echo ';' >> $@ + perf-$(CONFIG_X86) += perf-time-to-tsc.o diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 136cd93..1a349e8 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -17,6 +17,8 @@ static struct test { const char *desc; int (*func)(void); + void (*prepare)(void); + void (*cleanup)(void); } tests[] = { { .desc = "vmlinux symtab matches kallsyms", @@ -177,6 +179,8 @@ static struct test { { .desc = "Test LLVM searching and compiling", .func = test__llvm, + .prepare = test__llvm_prepare, + .cleanup = test__llvm_cleanup, }, { .func = NULL, @@ -265,7 +269,11 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) } pr_debug("\n--- start ---\n"); + if (tests[curr].prepare) + tests[curr].prepare(); err = run_test(&tests[curr]); + if (tests[curr].cleanup) + tests[curr].cleanup(); pr_debug("---- end ----\n%s:", tests[curr].desc); switch (err) { diff --git a/tools/perf/tests/llvm.c b/tools/perf/tests/llvm.c index 52d5597..236bf39 100644 --- a/tools/perf/tests/llvm.c +++ b/tools/perf/tests/llvm.c @@ -1,9 +1,13 @@ #include +#include #include #include #include +#include +#include #include "tests.h" #include "debug.h" +#include "llvm.h" static int perf_config_cb(const char *var, const char *val, void *arg __maybe_unused) @@ -11,16 +15,6 @@ static int perf_config_cb(const char *var, const char *val, return perf_default_config(var, val, arg); } -/* - * Randomly give it a "version" section since we don't really load it - * into kernel - */ -static const char test_bpf_prog[] = - "__attribute__((section(\"do_fork\"), used)) " - "int fork(void *ctx) {return 0;} " - "char _license[] __attribute__((section(\"license\"), used)) = \"GPL\";" - "int _version __attribute__((section(\"version\"), used)) = 0x40100;"; - #ifdef HAVE_LIBBPF_SUPPORT static int test__bpf_parsing(void *obj_buf, size_t obj_buf_sz) { @@ -41,12 +35,44 @@ static int test__bpf_parsing(void *obj_buf __maybe_unused, } #endif +static char * +compose_source(void) +{ + struct utsname utsname; + int version, patchlevel, sublevel, err; + unsigned long version_code; + char *code; + + if (uname(&utsname)) + return NULL; + + err = sscanf(utsname.release, "%d.%d.%d", + &version, &patchlevel, &sublevel); + if (err != 3) { + fprintf(stderr, " (Can't get kernel version from uname '%s')", + utsname.release); + return NULL; + } + + version_code = (version << 16) + (patchlevel << 8) + sublevel; + err = asprintf(&code, "#define LINUX_VERSION_CODE 0x%08lx;\n%s", + version_code, test_llvm__bpf_prog); + if (err < 0) + return NULL; + + return code; +} + +#define SHARED_BUF_INIT_SIZE (1 << 20) +struct test_llvm__bpf_result *p_test_llvm__bpf_result; + int test__llvm(void) { char *tmpl_new, *clang_opt_new; void *obj_buf; size_t obj_buf_sz; int err, old_verbose; + char *source; perf_config(perf_config_cb, NULL); @@ -73,10 +99,22 @@ int test__llvm(void) if (!llvm_param.clang_opt) llvm_param.clang_opt = strdup(""); - err = asprintf(&tmpl_new, "echo '%s' | %s", test_bpf_prog, - llvm_param.clang_bpf_cmd_template); - if (err < 0) + source = compose_source(); + if (!source) { + pr_err("Failed to compose source code\n"); + return -1; + } + + /* Quote __EOF__ so strings in source won't be expanded by shell */ + err = asprintf(&tmpl_new, "cat << '__EOF__' | %s\n%s\n__EOF__\n", + llvm_param.clang_bpf_cmd_template, source); + free(source); + source = NULL; + if (err < 0) { + pr_err("Failed to alloc new template\n"); return -1; + } + err = asprintf(&clang_opt_new, "-xc %s", llvm_param.clang_opt); if (err < 0) return -1; @@ -93,6 +131,46 @@ int test__llvm(void) } err = test__bpf_parsing(obj_buf, obj_buf_sz); + if (!err && p_test_llvm__bpf_result) { + if (obj_buf_sz > SHARED_BUF_INIT_SIZE) { + pr_err("Resulting object too large\n"); + } else { + p_test_llvm__bpf_result->size = obj_buf_sz; + memcpy(p_test_llvm__bpf_result->object, + obj_buf, obj_buf_sz); + } + } free(obj_buf); return err; } + +void test__llvm_prepare(void) +{ + p_test_llvm__bpf_result = mmap(NULL, SHARED_BUF_INIT_SIZE, + PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_ANONYMOUS, -1, 0); + if (!p_test_llvm__bpf_result) + return; + memset((void *)p_test_llvm__bpf_result, '\0', SHARED_BUF_INIT_SIZE); +} + +void test__llvm_cleanup(void) +{ + unsigned long boundary, buf_end; + + if (!p_test_llvm__bpf_result) + return; + if (p_test_llvm__bpf_result->size == 0) { + munmap((void *)p_test_llvm__bpf_result, SHARED_BUF_INIT_SIZE); + p_test_llvm__bpf_result = NULL; + return; + } + + buf_end = (unsigned long)p_test_llvm__bpf_result + SHARED_BUF_INIT_SIZE; + + boundary = (unsigned long)(p_test_llvm__bpf_result); + boundary += p_test_llvm__bpf_result->size; + boundary = (boundary + (page_size - 1)) & + (~((unsigned long)page_size - 1)); + munmap((void *)boundary, buf_end - boundary); +} diff --git a/tools/perf/tests/llvm.h b/tools/perf/tests/llvm.h new file mode 100644 index 0000000..1e89e46 --- /dev/null +++ b/tools/perf/tests/llvm.h @@ -0,0 +1,14 @@ +#ifndef PERF_TEST_LLVM_H +#define PERF_TEST_LLVM_H + +#include /* for size_t */ + +struct test_llvm__bpf_result { + size_t size; + char object[]; +}; + +extern struct test_llvm__bpf_result *p_test_llvm__bpf_result; +extern const char test_llvm__bpf_prog[]; + +#endif diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index bf113a2..0d79f04 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -63,6 +63,8 @@ int test__fdarray__add(void); int test__kmod_path__parse(void); int test__thread_map(void); int test__llvm(void); +void test__llvm_prepare(void); +void test__llvm_cleanup(void); #if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__) #ifdef HAVE_DWARF_UNWIND_SUPPORT