From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <ast@plumgrid.com>
Cc: <linux-kernel@vger.kernel.org>, <lizefan@huawei.com>,
<hekuang@huawei.com>, <xiakaixu@huawei.com>, <pi3orama@163.com>
Subject: [PATCH 39/39] perf tools: Support attach BPF program on uprobe events
Date: Thu, 9 Jul 2015 12:35:42 +0000 [thread overview]
Message-ID: <1436445342-1402-40-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1436445342-1402-1-git-send-email-wangnan0@huawei.com>
This patch appends new syntax to BPF object section name to support
probing at uprobe event. Now we can use BPF program like this:
SEC(
"target=/lib64/libc.so.6\n"
"libcwrite=__write"
)
int libcwrite(void *ctx)
{
return 1;
}
Where, in section name of a program, before the main config string,
we can use 'key=value' style options. Now the only option key "target"
is for uprobe probing.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
tools/perf/util/bpf-loader.c | 88 ++++++++++++++++++++++++++++++++++++++++----
1 file changed, 81 insertions(+), 7 deletions(-)
diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index 0a4e9ec..f5b2344 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -75,6 +75,84 @@ bpf_prog_priv__clear(struct bpf_program *prog __maybe_unused,
}
static int
+do_config(const char *key, const char *value,
+ struct perf_probe_event *pev)
+{
+ pr_debug("config bpf program: %s=%s\n", key, value);
+ if (strcmp(key, "target") == 0) {
+ pev->uprobes = true;
+ pev->target = strdup(value);
+ return 0;
+ }
+
+ pr_warning("BPF: WARNING: invalid config option in object: %s=%s\n",
+ key, value);
+ pr_warning("\tHint: Currently only valid option is 'target=<file>'\n");
+ return 0;
+}
+
+static const char *
+parse_config_kvpair(const char *config_str, struct perf_probe_event *pev)
+{
+ char *text = strdup(config_str);
+ char *sep, *line;
+ const char *main_str = NULL;
+ int err = 0;
+
+ if (!text) {
+ pr_err("No enough memory: dup config_str failed\n");
+ return NULL;
+ }
+
+ line = text;
+ while ((sep = strchr(line, '\n'))) {
+ char *equ;
+
+ *sep = '\0';
+ equ = strchr(line, '=');
+ if (!equ) {
+ pr_warning("WARNING: invalid config in BPF object: %s\n",
+ line);
+ pr_warning("\tShould be 'key=value'.\n");
+ goto nextline;
+ }
+ *equ = '\0';
+
+ err = do_config(line, equ + 1, pev);
+ if (err)
+ break;
+nextline:
+ line = sep + 1;
+ }
+
+ if (!err)
+ main_str = config_str + (line - text);
+ free(text);
+
+ return main_str;
+}
+
+static int
+parse_config(const char *config_str, struct perf_probe_event *pev)
+{
+ const char *main_str;
+ int err;
+
+ main_str = parse_config_kvpair(config_str, pev);
+ if (!main_str)
+ return -EINVAL;
+
+ err = parse_perf_probe_command(main_str, pev);
+ if (err < 0) {
+ pr_err("bpf: '%s' is not a valid config string\n",
+ config_str);
+ /* parse failed, don't need clear pev. */
+ return -EINVAL;
+ }
+ return 0;
+}
+
+static int
config_bpf_program(struct bpf_program *prog)
{
struct perf_probe_event *pev = alloc_perf_probe_event();
@@ -93,13 +171,9 @@ config_bpf_program(struct bpf_program *prog)
}
pr_debug("bpf: config program '%s'\n", config_str);
- err = parse_perf_probe_command(config_str, pev);
- if (err < 0) {
- pr_err("bpf: '%s' is not a valid config string\n",
- config_str);
- /* parse failed, don't need clear pev. */
- return -EINVAL;
- }
+ err = parse_config(config_str, pev);
+ if (err)
+ return err;
if (pev->group && strcmp(pev->group, PERF_BPF_PROBE_GROUP)) {
pr_err("bpf: '%s': group for event is set and not '%s'.\n",
--
1.8.3.4
next prev parent reply other threads:[~2015-07-09 12:37 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-09 12:35 [GIT PULL 00/39] perf tools: filtering events using eBPF programs Wang Nan
2015-07-09 12:35 ` [PATCH 01/39] bpf tools: Collect symbol table from SHT_SYMTAB section Wang Nan
2015-07-09 12:35 ` [PATCH 02/39] bpf tools: Collect eBPF programs from their own sections Wang Nan
2015-07-09 15:58 ` Arnaldo Carvalho de Melo
2015-07-10 3:07 ` Wangnan (F)
2015-07-13 19:51 ` Arnaldo Carvalho de Melo
2015-07-14 3:58 ` Wangnan (F)
2015-07-09 12:35 ` [PATCH 03/39] bpf tools: Collect relocation sections from SHT_REL sections Wang Nan
2015-07-09 12:35 ` [PATCH 04/39] bpf tools: Record map accessing instructions for each program Wang Nan
2015-07-09 12:35 ` [PATCH 05/39] bpf tools: Add bpf.c/h for common bpf operations Wang Nan
2015-07-09 12:35 ` [PATCH 06/39] bpf tools: Create eBPF maps defined in an object file Wang Nan
2015-07-13 19:54 ` Arnaldo Carvalho de Melo
2015-07-14 3:59 ` Wangnan (F)
2015-07-09 12:35 ` [PATCH 07/39] bpf tools: Relocate eBPF programs Wang Nan
2015-07-09 12:35 ` [PATCH 08/39] bpf tools: Introduce bpf_load_program() to bpf.c Wang Nan
2015-07-09 12:35 ` [PATCH 09/39] bpf tools: Load eBPF programs in object files into kernel Wang Nan
2015-07-09 12:35 ` [PATCH 10/39] bpf tools: Introduce accessors for struct bpf_program Wang Nan
2015-07-09 12:35 ` [PATCH 11/39] bpf tools: Link all bpf objects onto a list Wang Nan
2015-07-09 12:35 ` [PATCH 12/39] perf tools: Introduce llvm config options Wang Nan
2015-07-21 11:13 ` [PATCH 12/39 update] " Wang Nan
2015-08-08 8:16 ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-09 12:35 ` [PATCH 13/39] perf tools: Call clang to compile C source to object code Wang Nan
2015-07-09 12:35 ` [PATCH 14/39] perf tools: Auto detecting kernel build directory Wang Nan
2015-07-13 21:46 ` Arnaldo Carvalho de Melo
2015-07-14 6:56 ` Wangnan (F)
2015-07-14 7:16 ` Wangnan (F)
2015-07-09 12:35 ` [PATCH 15/39] perf tools: Auto detecting kernel include options Wang Nan
2015-08-08 8:17 ` [tip:perf/core] " tip-bot for Wang Nan
2015-07-09 12:35 ` [PATCH 16/39] perf tests: Add LLVM test for eBPF on-the-fly compiling Wang Nan
2015-07-15 10:54 ` [PATCH updated " Wang Nan
2015-07-22 4:46 ` [PATCH 16/39 RESEND] " Wang Nan
2015-07-09 12:35 ` [PATCH 17/39] perf tools: Make perf depend on libbpf Wang Nan
2015-07-09 12:35 ` [PATCH 18/39] perf record: Enable passing bpf object file to --event Wang Nan
2015-07-09 12:35 ` [PATCH 19/39] perf record: Compile scriptlets if pass '.c' " Wang Nan
2015-07-09 12:35 ` [PATCH 20/39] perf tools: Parse probe points of eBPF programs during preparation Wang Nan
2015-07-09 12:35 ` [PATCH 21/39] perf probe: Attach trace_probe_event with perf_probe_event Wang Nan
2015-07-09 12:35 ` [PATCH 22/39] perf record: Probe at kprobe points Wang Nan
2015-07-09 12:35 ` [PATCH 23/39] perf record: Load all eBPF object into kernel Wang Nan
2015-07-09 12:35 ` [PATCH 24/39] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-07-09 12:35 ` [PATCH 25/39] perf tools: Attach eBPF program to perf event Wang Nan
2015-07-09 12:35 ` [PATCH 26/39] perf tools: Suppress probing messages when probing by BPF loading Wang Nan
2015-07-09 12:35 ` [PATCH 27/39] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-07-09 12:35 ` [PATCH 28/39] bpf tools: Load a program with different instances using preprocessor Wang Nan
2015-07-13 5:44 ` Wangnan (F)
2015-07-09 12:35 ` [PATCH 29/39] perf tools: Fix probe-event.h include Wang Nan
2015-07-09 12:35 ` [PATCH 30/39] perf probe: Reset args and nargs for probe_trace_event when failure Wang Nan
2015-07-09 12:35 ` [PATCH 31/39] perf tools: Move linux/filter.h to tools/include Wang Nan
2015-07-09 12:35 ` [PATCH 32/39] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-07-09 12:35 ` [PATCH 33/39] perf tools: Introduce arch_get_reg_info() for x86 Wang Nan
2015-07-09 12:35 ` [PATCH 34/39] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-07-09 12:35 ` [PATCH 35/39] perf tools: Generate prologue for BPF programs Wang Nan
2015-07-09 12:35 ` [PATCH 36/39] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-07-09 12:35 ` [PATCH 37/39] perf record: Support custom vmlinux path Wang Nan
2015-07-09 12:35 ` [PATCH 38/39] perf probe: Init symbol as kprobe if any event is kprobe Wang Nan
2015-07-09 12:35 ` Wang Nan [this message]
2015-07-14 15:36 ` perf test LLVM was: Re: [GIT PULL 00/39] perf tools: filtering events using eBPF programs Arnaldo Carvalho de Melo
2015-07-15 10:49 ` Wangnan (F)
2015-07-15 11:20 ` Arnaldo Carvalho de Melo
2015-07-17 2:34 ` Wangnan (F)
[not found] ` <CA+JHD93=ZMFP0gB1NqTXGBjTfSyYC-53Uj7r11gQJnKtQRKcDg@mail.gmail.com>
2015-07-21 11:09 ` Wangnan (F)
2015-07-21 11:41 ` Arnaldo Carvalho de Melo
2015-07-22 4:40 ` Wangnan (F)
2015-07-31 15:35 ` perf eBPF patch ordering. was: " Arnaldo Carvalho de Melo
2015-07-31 20:31 ` Arnaldo Carvalho de Melo
2015-08-03 2:37 ` Wangnan (F)
2015-08-03 15:07 ` Arnaldo Carvalho de Melo
2015-08-03 15:19 ` Arnaldo Carvalho de Melo
2015-08-03 15:53 ` pi3orama
2015-08-03 16:11 ` Arnaldo Carvalho de Melo
2015-08-03 19:49 ` Arnaldo Carvalho de Melo
2015-08-04 5:28 ` Wangnan (F)
2015-08-04 10:39 ` Wangnan (F)
2015-08-04 15:55 ` Arnaldo Carvalho de Melo
2015-08-04 16:11 ` Arnaldo Carvalho de Melo
2015-08-04 16:13 ` pi3orama
2015-08-06 1:44 ` Wangnan (F)
2015-08-06 14:46 ` Arnaldo Carvalho de Melo
2015-08-06 15:58 ` Arnaldo Carvalho de Melo
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=1436445342-1402-40-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=acme@kernel.org \
--cc=ast@plumgrid.com \
--cc=hekuang@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--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
all inboxes | Powered by JetHome®