From: Wang Nan <wangnan0@huawei.com>
To: <acme@redhat.com>
Cc: <linux-kernel@vger.kernel.org>, <pi3orama@163.com>,
<lizefan@huawei.com>, Wang Nan <wangnan0@huawei.com>,
Alexei Starovoitov <ast@plumgrid.com>,
Brendan Gregg <brendan.d.gregg@gmail.com>,
Daniel Borkmann <daniel@iogearbox.net>,
David Ahern <dsahern@gmail.com>, He Kuang <hekuang@huawei.com>,
Jiri Olsa <jolsa@kernel.org>, Kaixu Xia <xiakaixu@huawei.com>,
Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
Namhyung Kim <namhyung@kernel.org>,
Paul Mackerras <paulus@samba.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH 20/22] perf tools: Allow BPF program attach to uprobe events
Date: Thu, 8 Oct 2015 08:29:42 +0000 [thread overview]
Message-ID: <1444292984-13135-21-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1444292984-13135-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>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Ahern <dsahern@gmail.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kaixu Xia <xiakaixu@huawei.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Link: http://lkml.kernel.org/n/ebpf-6yw9eg0ej3l4jnqhinngkw86@git.kernel.org
---
tools/perf/util/bpf-loader.c | 86 ++++++++++++++++++++++++++++++++++++++++----
1 file changed, 80 insertions(+), 6 deletions(-)
diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index af549ea..73ff9a9 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -111,6 +111,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_debug("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_debug("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 = NULL;
@@ -132,13 +210,9 @@ config_bpf_program(struct bpf_program *prog)
pev = &priv->pev;
pr_debug("bpf: config program '%s'\n", config_str);
- err = parse_perf_probe_command(config_str, pev);
- if (err < 0) {
- pr_debug("bpf: '%s' is not a valid config string\n",
- config_str);
- err = -EINVAL;
+ err = parse_config(config_str, pev);
+ if (err)
goto errout;
- }
if (pev->group && strcmp(pev->group, PERF_BPF_PROBE_GROUP)) {
pr_debug("bpf: '%s': group for event is set and not '%s'.\n",
--
1.8.3.4
next prev parent reply other threads:[~2015-10-08 8:38 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-08 8:29 [GIT PULL 00/22] perf tools: filtering events using eBPF programs Wang Nan
2015-10-08 8:29 ` [PATCH 01/22] perf tools: Make perf depend on libbpf Wang Nan
2015-10-08 8:29 ` [PATCH 02/22] perf ebpf: Add the libbpf glue Wang Nan
2015-10-08 8:29 ` [PATCH 03/22] perf tools: Enable passing bpf object file to --event Wang Nan
2015-10-08 8:29 ` [PATCH 04/22] perf record, bpf: Create probe points for BPF programs Wang Nan
2015-10-08 8:29 ` [PATCH 05/22] perf record: Load eBPF object into kernel Wang Nan
2015-10-08 8:29 ` [PATCH 06/22] perf tools: Collect perf_evsel in BPF object files Wang Nan
2015-10-08 8:29 ` [PATCH 07/22] perf tools: Attach eBPF program to perf event Wang Nan
2015-10-08 8:29 ` [PATCH 08/22] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-10-08 8:29 ` [PATCH 09/22] perf tools: Compile scriptlets to BPF objects when passing '.c' to --event Wang Nan
2015-10-08 8:29 ` [PATCH 10/22] perf test: Enforce LLVM test for BPF test Wang Nan
2015-10-08 8:29 ` [PATCH 11/22] perf test: Add 'perf test BPF' Wang Nan
2015-10-08 8:29 ` [PATCH 12/22] perf probe: Reset args and nargs for probe_trace_event when failure Wang Nan
2015-10-08 8:29 ` [PATCH 13/22] bpf tools: Load a program with different instances using preprocessor Wang Nan
2015-10-08 8:29 ` [PATCH 14/22] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-10-08 8:29 ` [PATCH 15/22] perf tools: Compile dwarf-regs.c if CONFIG_BPF_PROLOGUE is on Wang Nan
2015-10-08 8:29 ` [PATCH 16/22] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-10-08 8:29 ` [PATCH 17/22] perf tools: Generate prologue for BPF programs Wang Nan
2015-10-08 8:29 ` [PATCH 18/22] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-10-08 8:29 ` [PATCH 19/22] perf record: Support custom vmlinux path Wang Nan
2015-10-08 8:29 ` Wang Nan [this message]
2015-10-08 8:29 ` [PATCH 21/22] perf test: Enforce LLVM test, add kbuild test Wang Nan
2015-10-08 8:29 ` [PATCH 22/22] perf test: Test BPF prologue Wang Nan
2015-10-08 13:45 ` [GIT PULL 00/22] perf tools: filtering events using eBPF programs 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=1444292984-13135-21-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--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=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