From patchwork Thu Oct 8 08:29:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 54646 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by patches.linaro.org (Postfix) with ESMTPS id E2A3A22FF8 for ; Thu, 8 Oct 2015 08:43:09 +0000 (UTC) Received: by lbbti1 with SMTP id ti1sf20019930lbb.3 for ; Thu, 08 Oct 2015 01:43:08 -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=IRugGfuoOsIoPamJLmU4DbyppuGrAhcWNMGfIQWEgL8=; b=MpjmYXHqvrni0SebYcLff2SnBAs3y6WhtDloLEeDx49DYvFQVUJ04iXU5pRjIr/8PL T5u+aLpOUECwuMIq1kobOCMhbQKjEMVqwN4KxD0pCWQyJ53+dqM61p1ydZ6KxoIZbXlT kbp8V99QEQ4wehIpg3rEW3ycjAFzr4n8PK0IMX951zdtinghJXFcqjHhcId4j1ek7Z8y qJCpF5MDecke5zPFnZhpP7/L6VxvNb2Qzr1Dbt52hFj513oASHlEfG1JVDNl71gfTbuR brcrmFLBEHCkgkluCkR698qMOs644kiuaGQnKNF+Lvfb0MbQWq5znWJ4hNhBUcHDw0Fz hM5w== X-Gm-Message-State: ALoCoQnLbymBCYMNK9Kdxtsg1WsTFS6Vbi3rimebCRK4UMucfSNTXoBO60hT0Ds/LtLxLNuZAHXb X-Received: by 10.180.81.165 with SMTP id b5mr440871wiy.1.1444293788827; Thu, 08 Oct 2015 01:43:08 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.32.207 with SMTP id g198ls142591lfg.18.gmail; Thu, 08 Oct 2015 01:43:08 -0700 (PDT) X-Received: by 10.112.150.97 with SMTP id uh1mr2442089lbb.53.1444293788633; Thu, 08 Oct 2015 01:43:08 -0700 (PDT) Received: from mail-lb0-f180.google.com (mail-lb0-f180.google.com. [209.85.217.180]) by mx.google.com with ESMTPS id 82si28831071lfu.87.2015.10.08.01.43.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Oct 2015 01:43:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.180 as permitted sender) client-ip=209.85.217.180; Received: by lbbwt4 with SMTP id wt4so38864808lbb.1 for ; Thu, 08 Oct 2015 01:43:08 -0700 (PDT) X-Received: by 10.25.19.21 with SMTP id j21mr2003975lfi.106.1444293788416; Thu, 08 Oct 2015 01:43:08 -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.59.35 with SMTP id w3csp443135lbq; Thu, 8 Oct 2015 01:43:07 -0700 (PDT) X-Received: by 10.66.165.106 with SMTP id yx10mr6898285pab.102.1444293787276; Thu, 08 Oct 2015 01:43:07 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gh10si64827241pbd.13.2015.10.08.01.43.06; Thu, 08 Oct 2015 01:43:07 -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 S1754760AbbJHInE (ORCPT + 30 others); Thu, 8 Oct 2015 04:43:04 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:49583 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754078AbbJHIcA (ORCPT ); Thu, 8 Oct 2015 04:32:00 -0400 Received: from 172.24.1.48 (EHLO szxeml427-hub.china.huawei.com) ([172.24.1.48]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CTW16128; Thu, 08 Oct 2015 16:29:59 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml427-hub.china.huawei.com (10.82.67.182) with Microsoft SMTP Server id 14.3.235.1; Thu, 8 Oct 2015 16:29:33 +0800 From: Wang Nan To: CC: , , , Wang Nan , He Kuang , "Alexei Starovoitov" , Brendan Gregg , Daniel Borkmann , David Ahern , Jiri Olsa , Kaixu Xia , "Masami Hiramatsu" , Namhyung Kim , Peter Zijlstra Subject: [PATCH 10/22] perf test: Enforce LLVM test for BPF test Date: Thu, 8 Oct 2015 08:29:32 +0000 Message-ID: <1444292984-13135-11-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1444292984-13135-1-git-send-email-wangnan0@huawei.com> References: <1444292984-13135-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.217.180 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/ebpf-6yw9eg0ej3l4jnqhinngkw86@git.kernel.org --- tools/perf/tests/Build | 9 +++- tools/perf/tests/builtin-test.c | 6 +++ tools/perf/tests/llvm.c | 104 +++++++++++++++++++++++++++++++++++----- tools/perf/tests/llvm.h | 14 ++++++ tools/perf/tests/tests.h | 4 ++ 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 50de225..4afc8c8 100644 --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -31,9 +31,16 @@ 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 perf-y += topology.o +$(OUTPUT)tests/llvm-src.c: tests/bpf-script-example.c + $(call rule_mkdir) + $(Q)echo '#include ' > $@ + $(Q)echo 'const char test_llvm__bpf_prog[] =' >> $@ + $(Q)sed -e 's/"/\\"/g' -e 's/\(.*\)/"\1\\n"/g' $< >> $@ + $(Q)echo ';' >> $@ + ifeq ($(ARCH),$(filter $(ARCH),x86 arm arm64)) perf-$(CONFIG_DWARF_UNWIND) += dwarf-unwind.o endif diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 66f72d3..e812a0c 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -160,6 +160,8 @@ static struct test generic_tests[] = { { .desc = "Test LLVM searching and compiling", .func = test__llvm, + .prepare = test__llvm_prepare, + .cleanup = test__llvm_cleanup, }, { .desc = "Test topology in session", @@ -261,7 +263,11 @@ static int __cmd_test(int argc, const char *argv[], struct intlist *skiplist) } pr_debug("\n--- start ---\n"); + if (t->prepare) + t->prepare(); err = run_test(t); + if (t->cleanup) + t->cleanup(); pr_debug("---- end ----\n%s:", t->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 c804869..a848802 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -27,6 +27,8 @@ enum { struct test { const char *desc; int (*func)(void); + void (*prepare)(void); + void (*cleanup)(void); }; /* Tests */ @@ -66,6 +68,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); int test_session_topology(void); #if defined(__arm__) || defined(__aarch64__)