From patchwork Sat Aug 29 04:21:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 52821 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 53AB520503 for ; Sat, 29 Aug 2015 04:24:01 +0000 (UTC) Received: by lbck9 with SMTP id k9sf22526777lbc.0 for ; Fri, 28 Aug 2015 21:24:00 -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=7YZ86oILYQItZvwL0xqk6WqScriMbvAjnmR6jAHHrek=; b=DOZJ2QTKwR/YVAFV6wYXq768pvAEaJSfQOqcEELTjk0oJ9cg6qqgGDOJcnZH5GprYI 6vPqNvpOf/4XDz6sAQm3k8+Qi5W5XIdy3rLhlzPpS/L9X9qZ7ILbe7PRF9fmuwk1fjIB zfkXME+15n+EWgQlfZBseP+3vLrnt2NeXf/n72GCuClUuMDJco5fP5gtrxw+aEbwAX8d WGyRIgzLmAq/Al+coWfLdist9n6QCmlcVygHHnDRlwSA6KxoTaysK8lIdwdN76Qw98Gf IgkT7sy2ivgRX5ROX9SthItRm52Kd/XYRC3HkFyZOUNDl023m8rztdCkUO3C2Wf0+Src I8NA== X-Gm-Message-State: ALoCoQnd90pAwGeHMHQ/Ybmp4nkFKaBC86ppq4dXx7TlFxhmo2EuEfXY/PSohsc6MZMzugXhkXya X-Received: by 10.194.173.3 with SMTP id bg3mr3543298wjc.5.1440822240252; Fri, 28 Aug 2015 21:24:00 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.196 with SMTP id t4ls251623laa.87.gmail; Fri, 28 Aug 2015 21:24:00 -0700 (PDT) X-Received: by 10.112.161.232 with SMTP id xv8mr6200660lbb.123.1440822240069; Fri, 28 Aug 2015 21:24:00 -0700 (PDT) Received: from mail-lb0-f170.google.com (mail-lb0-f170.google.com. [209.85.217.170]) by mx.google.com with ESMTPS id bw10si7656563lbc.114.2015.08.28.21.24.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Aug 2015 21:24:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.170 as permitted sender) client-ip=209.85.217.170; Received: by lbcbn3 with SMTP id bn3so39415950lbc.2 for ; Fri, 28 Aug 2015 21:24:00 -0700 (PDT) X-Received: by 10.112.141.136 with SMTP id ro8mr6233559lbb.88.1440822239895; Fri, 28 Aug 2015 21:23:59 -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 us2csp267471lbb; Fri, 28 Aug 2015 21:23:58 -0700 (PDT) X-Received: by 10.66.254.167 with SMTP id aj7mr20408743pad.39.1440822236880; Fri, 28 Aug 2015 21:23:56 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fl4si13359526pdb.129.2015.08.28.21.23.55; Fri, 28 Aug 2015 21:23:56 -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 S1752594AbbH2EXx (ORCPT + 28 others); Sat, 29 Aug 2015 00:23:53 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:39781 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751850AbbH2EXv (ORCPT ); Sat, 29 Aug 2015 00:23:51 -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 CTY94475; Sat, 29 Aug 2015 12:23:18 +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:08 +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 16/31] perf tools: Infrastructure for compiling scriptlets when passing '.c' to --event Date: Sat, 29 Aug 2015 04:21:50 +0000 Message-ID: <1440822125-52691-17-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.217.170 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 | 8 +++---- tools/perf/util/parse-events.h | 3 ++- tools/perf/util/parse-events.l | 3 +++ tools/perf/util/parse-events.y | 15 ++++++++++-- 7 files changed, 91 insertions(+), 17 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 77eeb99..c2aafe2 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, ...) \ @@ -152,16 +153,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; @@ -361,12 +374,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 323e664..97aed65 100644 --- a/tools/perf/util/bpf-loader.h +++ b/tools/perf/util/bpf-loader.h @@ -18,9 +18,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); @@ -32,7 +32,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; @@ -64,6 +65,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 4343433..08b277b 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -483,8 +483,8 @@ 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) + struct list_head *list __maybe_unused, + char *bpf_file_name, bool source) { int err; char errbuf[BUFSIZ]; @@ -500,9 +500,9 @@ int parse_events_load_bpf(struct parse_events_evlist *data, * problem. After that probe events file by file is possible. * However, probing cost is still need to be considered. */ - 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)); data->error->str = strdup(errbuf); data->error->help = strdup("(add -v to see detail)"); 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; }