From patchwork Sun Sep 6 07:13:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 53188 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 948BB22B05 for ; Sun, 6 Sep 2015 07:19:23 +0000 (UTC) Received: by lbbti1 with SMTP id ti1sf17394415lbb.3 for ; Sun, 06 Sep 2015 00:19:22 -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=FS31yYFxVDYB3W17lvjmpO+thbLIhVFKdy+NEn65EnE=; b=UURAYASQFMpZaQVlE6KVOnUN0m8df0dsE29DUMzF8Yysv+ujkDGBmssQD7CnwCbjng ygKXRD/6U0+EODiwXiCpWOmk/8/h8AdKXKVOdYWGLT44d2vw7+VLhxqa6GqakdKuCljK 3/34u3VmpB9g30KfOq7MQfofwkgt258bU0nzcASe+kZa/2t17x0kAbuNwp71NLZCEIuD BYaigfHEihAlGdkhGxhHJJwFFF5gCNG/bAHMCnLHVnRTGBUliYQ24REz6ncWbrli9viP L+oZx7aoSF7zrx/ZbxuwnZq8rGnYSO1KcqJ2UU6Ku2qR6Qik0AGE4eteYGGNJuU5ZzzH Odmg== X-Gm-Message-State: ALoCoQk69qPIpDE/j46kN/s+aWx7nDL4BthiFETWa6NJrZ5YrXIFCFqugqueiHijN2ZnO01fkzj6 X-Received: by 10.112.199.5 with SMTP id jg5mr3308435lbc.14.1441523962536; Sun, 06 Sep 2015 00:19:22 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.5.202 with SMTP id u10ls485631lau.23.gmail; Sun, 06 Sep 2015 00:19:22 -0700 (PDT) X-Received: by 10.152.36.67 with SMTP id o3mr11342656laj.11.1441523962351; Sun, 06 Sep 2015 00:19:22 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id bw10si7225108lbc.114.2015.09.06.00.19.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Sep 2015 00:19:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by lamp12 with SMTP id p12so34706882lam.0 for ; Sun, 06 Sep 2015 00:19:22 -0700 (PDT) X-Received: by 10.112.131.98 with SMTP id ol2mr11907324lbb.56.1441523962225; Sun, 06 Sep 2015 00:19:22 -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 yn10csp844822lbb; Sun, 6 Sep 2015 00:19:21 -0700 (PDT) X-Received: by 10.69.26.38 with SMTP id iv6mr30275102pbd.151.1441523961112; Sun, 06 Sep 2015 00:19:21 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n4si13803192pdl.33.2015.09.06.00.19.20; Sun, 06 Sep 2015 00:19:21 -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 S1753164AbbIFHTR (ORCPT + 28 others); Sun, 6 Sep 2015 03:19:17 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:7329 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751551AbbIFHPQ (ORCPT ); Sun, 6 Sep 2015 03:15:16 -0400 Received: from 172.24.1.48 (EHLO SZXEML423-HUB.china.huawei.com) ([172.24.1.48]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CUK94054; Sun, 06 Sep 2015 15:14:16 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by SZXEML423-HUB.china.huawei.com (10.82.67.154) with Microsoft SMTP Server id 14.3.235.1; Sun, 6 Sep 2015 15:14:06 +0800 From: Wang Nan To: , , , CC: , , , , , , , , , , , Subject: [PATCH 13/27] perf tools: Compile scriptlets to BPF objects when passing '.c' to --event Date: Sun, 6 Sep 2015 07:13:29 +0000 Message-ID: <1441523623-152703-14-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1441523623-152703-1-git-send-email-wangnan0@huawei.com> References: <1441523623-152703-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.45 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 provides infrastructure for passing source files to --event directly using: # perf record --event bpf-file.c command This patch does following works: 1) Allow passing '.c' file to '--event'. parse_events_load_bpf() is expanded to allow caller tell it whether the passed file is source file or object. 2) llvm__compile_bpf() is called to compile the '.c' file, the result is saved into memory. Use bpf_object__open_buffer() to load the in-memory object. Introduces a bpf-script-example.c so we can manually test it: # perf record --clang-opt "-DLINUX_VERSION_CODE=0x40200" --event ./bpf-script-example.c sleep 1 Note that '--clang-opt' must put before '--event'. Futher patches will merge it into a testcase so can be tested automatically. Signed-off-by: Wang Nan Signed-off-by: He Kuang Acked-by: 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/1436445342-1402-20-git-send-email-wangnan0@huawei.com [ wangnan: Pass name of source file to bpf_object__open_buffer(). ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/bpf-script-example.c | 44 +++++++++++++++++++++++++++++++++++ tools/perf/util/bpf-loader.c | 25 +++++++++++++++----- tools/perf/util/bpf-loader.h | 10 ++++---- tools/perf/util/parse-events.c | 6 ++--- tools/perf/util/parse-events.h | 3 ++- tools/perf/util/parse-events.l | 3 +++ tools/perf/util/parse-events.y | 15 ++++++++++-- 7 files changed, 90 insertions(+), 16 deletions(-) create mode 100644 tools/perf/tests/bpf-script-example.c diff --git a/tools/perf/tests/bpf-script-example.c b/tools/perf/tests/bpf-script-example.c new file mode 100644 index 0000000..410a70b --- /dev/null +++ b/tools/perf/tests/bpf-script-example.c @@ -0,0 +1,44 @@ +#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 BPF_ANY 0 +#define BPF_MAP_TYPE_ARRAY 2 +#define BPF_FUNC_map_lookup_elem 1 +#define BPF_FUNC_map_update_elem 2 + +static void *(*bpf_map_lookup_elem)(void *map, void *key) = + (void *) BPF_FUNC_map_lookup_elem; +static void *(*bpf_map_update_elem)(void *map, void *key, void *value, int flags) = + (void *) BPF_FUNC_map_update_elem; + +struct bpf_map_def { + unsigned int type; + unsigned int key_size; + unsigned int value_size; + unsigned int max_entries; +}; + +#define SEC(NAME) __attribute__((section(NAME), used)) +struct bpf_map_def SEC("maps") flip_table = { + .type = BPF_MAP_TYPE_ARRAY, + .key_size = sizeof(int), + .value_size = sizeof(int), + .max_entries = 1, +}; + +SEC("func=sys_epoll_pwait") +int bpf_func__sys_epoll_pwait(void *ctx) +{ + int ind =0; + int *flag = bpf_map_lookup_elem(&flip_table, &ind); + int new_flag; + if (!flag) + return 0; + /* flip flag and store back */ + new_flag = !*flag; + bpf_map_update_elem(&flip_table, &ind, &new_flag, BPF_ANY); + return new_flag; +} +char _license[] SEC("license") = "GPL"; +int _version SEC("version") = LINUX_VERSION_CODE; diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c index 3400538..7229f8e 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -11,6 +11,7 @@ #include "bpf-loader.h" #include "probe-event.h" #include "probe-finder.h" +#include "llvm-utils.h" #define DEFINE_PRINT_FN(name, level) \ static int libbpf_##name(const char *fmt, ...) \ @@ -164,16 +165,28 @@ sync_bpf_program_pev(struct bpf_program *prog) return 0; } -int bpf__prepare_load(const char *filename) +int bpf__prepare_load(const char *filename, bool source) { struct bpf_object *obj; + int err; if (!libbpf_initialized) libbpf_set_print(libbpf_warning, libbpf_info, libbpf_debug); - obj = bpf_object__open(filename); + if (source) { + void *obj_buf; + size_t obj_buf_sz; + + err = llvm__compile_bpf(filename, &obj_buf, &obj_buf_sz); + if (err) + return err; + obj = bpf_object__open_buffer(obj_buf, obj_buf_sz, filename); + free(obj_buf); + } else + obj = bpf_object__open(filename); + if (!obj) { pr_debug("bpf: failed to load %s\n", filename); return -EINVAL; @@ -387,12 +400,12 @@ int bpf__foreach_tev(bpf_prog_iter_callback_t func, void *arg) }\ buf[size - 1] = '\0'; -int bpf__strerror_prepare_load(const char *filename, int err, - char *buf, size_t size) +int bpf__strerror_prepare_load(const char *filename, bool source, + int err, char *buf, size_t size) { bpf__strerror_head(err, buf, size); - bpf__strerror_entry(EINVAL, "%s: BPF object file '%s' is invalid", - emsg, filename) + bpf__strerror_entry(EINVAL, "%s: BPF %s file '%s' is invalid", + emsg, source ? "source" : "object", filename); bpf__strerror_end(buf, size); return 0; } diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h index 5bac423..9a2358c 100644 --- a/tools/perf/util/bpf-loader.h +++ b/tools/perf/util/bpf-loader.h @@ -17,9 +17,9 @@ typedef int (*bpf_prog_iter_callback_t)(struct probe_trace_event *tev, int fd, void *arg); #ifdef HAVE_LIBBPF_SUPPORT -int bpf__prepare_load(const char *filename); -int bpf__strerror_prepare_load(const char *filename, int err, - char *buf, size_t size); +int bpf__prepare_load(const char *filename, bool source); +int bpf__strerror_prepare_load(const char *filename, bool source, + int err, char *buf, size_t size); int bpf__probe(void); int bpf__unprobe(void); int bpf__strerror_probe(int err, char *buf, size_t size); @@ -31,7 +31,8 @@ void bpf__clear(void); int bpf__foreach_tev(bpf_prog_iter_callback_t func, void *arg); #else -static inline int bpf__prepare_load(const char *filename __maybe_unused) +static inline int bpf__prepare_load(const char *filename __maybe_unused, + bool source __maybe_unused) { pr_debug("ERROR: eBPF object loading is disabled during compiling.\n"); return -1; @@ -63,6 +64,7 @@ __bpf_strerror(char *buf, size_t size) static inline int bpf__strerror_prepare_load(const char *filename __maybe_unused, + bool source __maybe_unused, int err __maybe_unused, char *buf, size_t size) { diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index d961e90..4976c71 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -484,7 +484,7 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx, int parse_events_load_bpf(struct parse_events_evlist *data, struct list_head *list, - char *bpf_file_name) + char *bpf_file_name, bool source) { int err; char errbuf[BUFSIZ]; @@ -522,9 +522,9 @@ int parse_events_load_bpf(struct parse_events_evlist *data, zfree(&dummy_evsel->name); dummy_evsel->name = strdup(bpf_file_name); - err = bpf__prepare_load(bpf_file_name); + err = bpf__prepare_load(bpf_file_name, source); if (err) { - bpf__strerror_prepare_load(bpf_file_name, err, + bpf__strerror_prepare_load(bpf_file_name, source, err, errbuf, sizeof(errbuf)); list_del_init(&dummy_evsel->node); perf_evsel__delete(dummy_evsel); diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index 3652387..728a424 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -121,7 +121,8 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx, char *sys, char *event); int parse_events_load_bpf(struct parse_events_evlist *data, struct list_head *list, - char *bpf_file_name); + char *bpf_file_name, + bool source); int parse_events_add_numeric(struct parse_events_evlist *data, struct list_head *list, u32 type, u64 config, diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l index 22e8f93..8033890 100644 --- a/tools/perf/util/parse-events.l +++ b/tools/perf/util/parse-events.l @@ -116,6 +116,7 @@ group [^,{}/]*[{][^}]*[}][^,{}/]* event_pmu [^,{}/]+[/][^/]*[/][^,{}/]* event [^,{}/]+ bpf_object .*\.(o|bpf) +bpf_source .*\.c num_dec [0-9]+ num_hex 0x[a-fA-F0-9]+ @@ -161,6 +162,7 @@ modifier_bp [rwx]{1,3} {event_pmu} | {bpf_object} | +{bpf_source} | {event} { BEGIN(INITIAL); REWIND(1); @@ -267,6 +269,7 @@ r{num_raw_hex} { return raw(yyscanner); } {modifier_event} { return str(yyscanner, PE_MODIFIER_EVENT); } {bpf_object} { return str(yyscanner, PE_BPF_OBJECT); } +{bpf_source} { return str(yyscanner, PE_BPF_SOURCE); } {name} { return pmu_str_check(yyscanner); } "/" { BEGIN(config); return '/'; } - { return '-'; } diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 3ee3a32..90d2458 100644 --- a/tools/perf/util/parse-events.y +++ b/tools/perf/util/parse-events.y @@ -42,7 +42,7 @@ static inc_group_count(struct list_head *list, %token PE_VALUE PE_VALUE_SYM_HW PE_VALUE_SYM_SW PE_RAW PE_TERM %token PE_EVENT_NAME %token PE_NAME -%token PE_BPF_OBJECT +%token PE_BPF_OBJECT PE_BPF_SOURCE %token PE_MODIFIER_EVENT PE_MODIFIER_BP %token PE_NAME_CACHE_TYPE PE_NAME_CACHE_OP_RESULT %token PE_PREFIX_MEM PE_PREFIX_RAW PE_PREFIX_GROUP @@ -55,6 +55,7 @@ static inc_group_count(struct list_head *list, %type PE_TERM %type PE_NAME %type PE_BPF_OBJECT +%type PE_BPF_SOURCE %type PE_NAME_CACHE_TYPE %type PE_NAME_CACHE_OP_RESULT %type PE_MODIFIER_EVENT @@ -431,7 +432,17 @@ PE_BPF_OBJECT struct list_head *list; ALLOC_LIST(list); - ABORT_ON(parse_events_load_bpf(data, list, $1)); + ABORT_ON(parse_events_load_bpf(data, list, $1, false)); + $$ = list; +} +| +PE_BPF_SOURCE +{ + struct parse_events_evlist *data = _data; + struct list_head *list; + + ALLOC_LIST(list); + ABORT_ON(parse_events_load_bpf(data, list, $1, true)); $$ = list; }