mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <ast@plumgrid.com>,
	<brendan.d.gregg@gmail.com>, <daniel@iogearbox.net>,
	<namhyung@kernel.org>, <masami.hiramatsu.pt@hitachi.com>,
	<paulus@samba.org>, <a.p.zijlstra@chello.nl>, <mingo@redhat.com>,
	<jolsa@kernel.org>, <dsahern@gmail.com>
Cc: <linux-kernel@vger.kernel.org>, <lizefan@huawei.com>,
	<hekuang@huawei.com>, <xiakaixu@huawei.com>, <pi3orama@163.com>
Subject: [RFC PATCH v9 30/50] perf record: Compile scriptlets if pass '.c' to --event
Date: Fri, 26 Jun 2015 14:15:35 +0000	[thread overview]
Message-ID: <1435328155-87115-31-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1435328155-87115-1-git-send-email-wangnan0@huawei.com>

This patch enables 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.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
 tools/perf/util/bpf-loader.c   | 17 +++++++++++++++--
 tools/perf/util/bpf-loader.h   |  5 +++--
 tools/perf/util/parse-events.c |  4 ++--
 tools/perf/util/parse-events.h |  2 +-
 tools/perf/util/parse-events.l |  3 +++
 tools/perf/util/parse-events.y | 15 +++++++++++++--
 6 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index 07673fc..6a3ec3a 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -9,6 +9,7 @@
 #include "perf.h"
 #include "debug.h"
 #include "bpf-loader.h"
+#include "llvm-utils.h"
 
 #define DEFINE_PRINT_FN(name, level) \
 static int libbpf_##name(const char *fmt, ...)	\
@@ -28,7 +29,7 @@ DEFINE_PRINT_FN(debug, 1)
 
 static bool libbpf_initialized;
 
-int bpf__prepare_load(const char *filename)
+int bpf__prepare_load(const char *filename, bool source)
 {
 	struct bpf_object *obj;
 
@@ -37,7 +38,19 @@ int bpf__prepare_load(const char *filename)
 				 libbpf_info,
 				 libbpf_debug);
 
-	obj = bpf_object__open(filename);
+	if (source) {
+		void *obj_buf;
+		size_t obj_buf_sz;
+		int err;
+
+		err = llvm__compile_bpf(filename, &obj_buf, &obj_buf_sz);
+		if (err)
+			return err;
+		obj = bpf_object__open_buffer(obj_buf, obj_buf_sz);
+		free(obj_buf);
+	} else
+		obj = bpf_object__open(filename);
+
 	if (!obj) {
 		pr_err("bpf: failed to load %s\n", filename);
 		return -EINVAL;
diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h
index 39d8d1a..5566be0 100644
--- a/tools/perf/util/bpf-loader.h
+++ b/tools/perf/util/bpf-loader.h
@@ -9,11 +9,12 @@
 #include "debug.h"
 
 #ifdef HAVE_LIBBPF_SUPPORT
-int bpf__prepare_load(const char *filename);
+int bpf__prepare_load(const char *filename, bool source);
 
 void bpf__clear(void);
 #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_err("ERROR: eBPF object loading is disabled during compiling.\n");
 	return -1;
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 6f7a7b1..aaee24c 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -475,7 +475,7 @@ int parse_events_add_tracepoint(struct list_head *list, int *idx,
 
 int parse_events_load_bpf(struct list_head *list __maybe_unused,
 			  int *idx __maybe_unused,
-			  char *bpf_file_name)
+			  char *bpf_file_name, bool source)
 {
 	/*
 	 * Currently don't link any event to list. BPF object files
@@ -485,7 +485,7 @@ int parse_events_load_bpf(struct list_head *list __maybe_unused,
 	 * problem. After that probe events file by file is possible.
 	 * However, probing cost is still need to be considered.
 	 */
-	return bpf__prepare_load(bpf_file_name);
+	return bpf__prepare_load(bpf_file_name, source);
 }
 
 static int
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 41b962a..5841d4f 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -115,7 +115,7 @@ int parse_events_name(struct list_head *list, char *name);
 int parse_events_add_tracepoint(struct list_head *list, int *idx,
 				char *sys, char *event);
 int parse_events_load_bpf(struct list_head *list, int *idx,
-			  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 4acea38..eb821d4 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);
@@ -265,6 +267,7 @@ r{num_raw_hex}		{ return raw(yyscanner); }
 {modifier_event}	{ return str(yyscanner, PE_MODIFIER_EVENT); }
 {name}			{ return pmu_str_check(yyscanner); }
 {bpf_object}		{ return str(yyscanner, PE_BPF_OBJECT); }
+{bpf_source}		{ return str(yyscanner, PE_BPF_SOURCE); }
 "/"			{ BEGIN(config); return '/'; }
 -			{ return '-'; }
 ,			{ BEGIN(event); return ','; }
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index 481f3cd..eeb9768 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 <num> PE_TERM
 %type <str> PE_NAME
 %type <str> PE_BPF_OBJECT
+%type <str> PE_BPF_SOURCE
 %type <str> PE_NAME_CACHE_TYPE
 %type <str> PE_NAME_CACHE_OP_RESULT
 %type <str> PE_MODIFIER_EVENT
@@ -431,7 +432,17 @@ PE_BPF_OBJECT
 	struct list_head *list;
 
 	ALLOC_LIST(list);
-	ABORT_ON(parse_events_load_bpf(list, &data->idx, $1));
+	ABORT_ON(parse_events_load_bpf(list, &data->idx, $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(list, &data->idx, $1, true));
 	$$ = list;
 }
 
-- 
1.8.3.4


  parent reply	other threads:[~2015-06-26 14:23 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-26 14:15 [RFC PATCH v9 00/50] perf tools: filtering events using eBPF programs Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 01/50] tracing, perf: Implement BPF programs attached to uprobes Wang Nan
2015-06-27 12:10   ` [PATCH] bpf: Use correct #ifdef controller for trace_call_bpf() Wang Nan
2015-06-27 12:36     ` [PATCH v2] " Wang Nan
2015-06-27 12:11   ` [RFC PATCH v9 01/50 -fix] tracing, perf: Implement BPF programs attached to uprobes Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 02/50] tools build: Add feature check for eBPF API Wang Nan
2015-06-29 19:21   ` Arnaldo Carvalho de Melo
2015-06-29 19:41     ` Arnaldo Carvalho de Melo
2015-06-30  2:29       ` Wangnan (F)
2015-06-30 14:34         ` Arnaldo Carvalho de Melo
2015-07-01  1:23           ` Wangnan (F)
2015-06-26 14:15 ` [RFC PATCH v9 03/50] bpf tools: Introduce 'bpf' library to tools Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 04/50] bpf tools: Allow caller to set printing function Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 05/50] bpf tools: Open eBPF object file and do basic validation Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 06/50] bpf tools: Read eBPF object from buffer Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 07/50] bpf tools: Check endianness and make libbpf fail early Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 08/50] bpf tools: Iterate over ELF sections to collect information Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 09/50] bpf tools: Collect version and license from ELF sections Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 10/50] bpf tools: Collect map definitions from 'maps' section Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 11/50] bpf tools: Collect symbol table from SHT_SYMTAB section Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 12/50] bpf tools: Collect eBPF programs from their own sections Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 13/50] bpf tools: Collect relocation sections from SHT_REL sections Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 14/50] bpf tools: Record map accessing instructions for each program Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 15/50] bpf tools: Add bpf.c/h for common bpf operations Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 16/50] bpf tools: Create eBPF maps defined in an object file Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 17/50] bpf tools: Relocate eBPF programs Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 18/50] bpf tools: Introduce bpf_load_program() to bpf.c Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 19/50] bpf tools: Load eBPF programs in object files into kernel Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 20/50] bpf tools: Introduce accessors for struct bpf_program Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 21/50] bpf tools: Introduce accessors for struct bpf_object Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 22/50] bpf tools: Link all bpf objects onto a list Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 23/50] perf tools: Make perf depend on libbpf Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 24/50] perf tools: Introduce llvm config options Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 25/50] perf tools: Call clang to compile C source to object code Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 26/50] perf tests: Add LLVM test for eBPF on-the-fly compiling Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 27/50] perf tools: Auto detecting kernel build directory Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 28/50] perf tools: Auto detecting kernel include options Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 29/50] perf record: Enable passing bpf object file to --event Wang Nan
2015-06-26 14:15 ` Wang Nan [this message]
2015-06-26 14:15 ` [RFC PATCH v9 31/50] perf tools: Parse probe points of eBPF programs during preparation Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 32/50] perf probe: Attach trace_probe_event with perf_probe_event Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 33/50] perf record: Probe at kprobe points Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 34/50] perf record: Load all eBPF object into kernel Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 35/50] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 36/50] perf tools: Attach eBPF program to perf event Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 37/50] perf tools: Suppress probing messages when probing by BPF loading Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 38/50] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 39/50] bpf tools: Load a program with different instance using preprocessor Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 40/50] perf tools: Fix probe-event.h include Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 41/50] perf probe: Reset tev->args and tev->nargs when failure Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 42/50] perf tools: Move linux/filter.h to tools/include Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 43/50] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 44/50] perf tools: Introduce arch_get_reg_info() for x86 Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 45/50] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 46/50] perf tools: Generate prologue for BPF programs Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 47/50] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 48/50] perf record: Support custom vmlinux path Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 49/50] perf probe: Init symbol as kprobe if any event is kprobe Wang Nan
2015-06-27 12:25   ` [RFC PATCH v9 49/50 -fix] " Wang Nan
2015-06-29 14:33     ` Arnaldo Carvalho de Melo
2015-06-30  1:38       ` Wangnan (F)
2015-06-30 14:37         ` Arnaldo Carvalho de Melo
2015-07-01  1:31           ` Wangnan (F)
2015-06-26 14:15 ` [RFC PATCH v9 50/50] perf tools: Support attach BPF program on uprobe events Wang Nan
2015-06-26 22:44 ` [RFC PATCH v9 00/50] perf tools: filtering events using eBPF programs Alexei Starovoitov
2015-06-27  0:14   ` Wangnan (F)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1435328155-87115-31-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=ast@plumgrid.com \
    --cc=brendan.d.gregg@gmail.com \
    --cc=daniel@iogearbox.net \
    --cc=dsahern@gmail.com \
    --cc=hekuang@huawei.com \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=paulus@samba.org \
    --cc=pi3orama@163.com \
    --cc=xiakaixu@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome