From: Wang Nan <wangnan0@huawei.com>
To: <ast@plumgrid.com>, <davem@davemloft.net>, <acme@kernel.org>,
<mingo@redhat.com>, <a.p.zijlstra@chello.nl>,
<masami.hiramatsu.pt@hitachi.com>, <jolsa@kernel.org>
Cc: <lizefan@kernel.org>, <linux-kernel@vger.kernel.org>,
<pi3orama@163.com>, <hekuang@huawei.com>
Subject: [RFC PATCH 22/22] perf bpf: attaches eBPF program to perf fd.
Date: Thu, 30 Apr 2015 10:52:45 +0000 [thread overview]
Message-ID: <1430391165-30267-23-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1430391165-30267-1-git-send-email-wangnan0@huawei.com>
This patch does the final work whcih makes eBPF program actually work.
It introduces bpf_attach(), which first retrive id field of previous
created k(ret)probe events, then use PERF_EVENT_IOC_SET_BPF to attach
eBPF program to the events.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
tools/perf/util/bpf-loader.c | 82 ++++++++++++++++++++++++++++++++++++++++++++
tools/perf/util/bpf-loader.h | 2 ++
2 files changed, 84 insertions(+)
diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index 186a3d0..c646ca4 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -15,6 +15,7 @@
#include "bpf-loader.h"
#include "probe-event.h"
#include "probe-finder.h" // for MAX_PROBES
+#include "trace-event.h"
#include <linux/list.h>
#include <linux/types.h>
@@ -326,6 +327,8 @@ bpf_perf_prog_free(struct bpf_perf_prog *prog)
}
if (prog->prog_fd >= 0)
close(prog->prog_fd);
+ if (prog->perf_fd >= 0)
+ close(prog->perf_fd);
free(prog);
}
@@ -375,6 +378,8 @@ bpf_perf_prog_alloc(struct bpf_obj *obj __maybe_unused,
prog->insns_cnt * sizeof(struct bpf_insn));
prog->idx = idx;
prog->prog_fd = -1;
+ prog->event_id = -1;
+ prog->perf_fd = -1;
return prog;
out:
bpf_perf_prog_free(prog);
@@ -964,6 +969,81 @@ static int bpf_probe(void)
return err < 0 ? err : 0;
}
+static int bpf_perf_prog_attach(struct bpf_perf_prog *prog)
+{
+ struct event_format* format;
+ struct perf_event_attr attr;
+ int fd, err;
+
+ format = trace_event__tp_format(prog->pev->group,
+ prog->pev->event);
+ if (!format) {
+ pr_err("bpf: attach: failed to get format of %s/%s\n",
+ prog->pev->group, prog->pev->event);
+ return -EINVAL;
+ }
+
+ pr_debug("bpf: attach %s/%s: id=%d\n",
+ prog->pev->group,
+ prog->pev->event,
+ format->id);
+ prog->event_id = format->id;
+
+ pevent_free_format(format);
+
+ memset(&attr, '\0', sizeof(attr));
+
+ attr.type = PERF_TYPE_TRACEPOINT;
+ attr.sample_type = PERF_SAMPLE_RAW;
+ attr.sample_period = 1;
+ attr.wakeup_events = 1;
+ attr.config = prog->event_id;
+
+ fd = sys_perf_event_open(&attr, -1, 0, -1, 0);
+ if (fd < 0) {
+ pr_err("bpf: open event %d failed\n", prog->event_id);
+ return -errno;
+ }
+ prog->perf_fd = fd;
+
+ err = ioctl(fd, PERF_EVENT_IOC_ENABLE, 0);
+ if (err) {
+ pr_err("bpf attach: enable failed: %s\n",
+ strerror(errno));
+ return -errno;
+ }
+
+ err = ioctl(fd, PERF_EVENT_IOC_SET_BPF, prog->prog_fd);
+ if (err) {
+ pr_err("bpf attach: set bpf: %s\n", strerror(errno));
+ return -errno;
+ }
+ pr_debug("bpf: attach %s to event %d\n", prog->name,
+ prog->event_id);
+
+ return 0;
+}
+
+static int bpf_attach(void)
+{
+ struct bpf_obj *obj;
+ int err;
+
+ list_for_each_entry(obj, &bpf_obj_list, list) {
+ struct bpf_perf_prog *prog;
+
+ list_for_each_entry(prog, &obj->progs_list, list) {
+ err = bpf_perf_prog_attach(prog);
+ if (err) {
+ pr_err("bpf: attach: faied to attach %s\n",
+ prog->name);
+ return err;
+ }
+ }
+ }
+ return 0;
+}
+
int bpf__run(void)
{
int err;
@@ -971,6 +1051,8 @@ int bpf__run(void)
pr_debug("bpf: probing\n");
if ((err = bpf_probe()))
return err;
+ if ((err = bpf_attach()))
+ return err;
pr_info("BPF is running. Use Ctrl-c to stop.\n");
while(1)
diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h
index dfdc3ca..baa4404 100644
--- a/tools/perf/util/bpf-loader.h
+++ b/tools/perf/util/bpf-loader.h
@@ -32,6 +32,8 @@ struct bpf_perf_prog {
/* fd of loaded eBPF program */
int prog_fd;
+ int event_id;
+ int perf_fd;
};
struct bpf_obj {
--
1.8.3.4
next prev parent reply other threads:[~2015-04-30 10:58 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-30 10:52 [RFC PATCH 00/22] perf tools: introduce 'perf bpf' command to load eBPF programs Wang Nan
2015-04-30 10:52 ` [RFC PATCH 01/22] perf: probe: avoid segfault if passed with '' Wang Nan
2015-05-05 14:09 ` Masami Hiramatsu
2015-05-05 15:26 ` Arnaldo Carvalho de Melo
2015-05-05 16:33 ` Masami Hiramatsu
2015-04-30 10:52 ` [RFC PATCH 02/22] perf: bpf: prepare: add __aligned_u64 to types.h Wang Nan
2015-04-30 10:52 ` [RFC PATCH 03/22] perf: add bpf common operations Wang Nan
2015-04-30 10:52 ` [RFC PATCH 04/22] perf tools: Add new 'perf bpf' command Wang Nan
2015-05-11 6:28 ` Namhyung Kim
2015-04-30 10:52 ` [RFC PATCH 05/22] perf bpf: open eBPF object file and do basic validation Wang Nan
2015-04-30 10:52 ` [RFC PATCH 06/22] perf bpf: check swap according to EHDR Wang Nan
2015-04-30 10:52 ` [RFC PATCH 07/22] perf bpf: iterater over elf sections to collect information Wang Nan
2015-04-30 10:52 ` [RFC PATCH 08/22] perf bpf: collect version and license from ELF Wang Nan
2015-04-30 10:52 ` [RFC PATCH 09/22] perf bpf: collect map definitions Wang Nan
2015-05-11 6:32 ` Namhyung Kim
2015-04-30 10:52 ` [RFC PATCH 10/22] perf bpf: collect config section in object Wang Nan
2015-04-30 10:52 ` [RFC PATCH 11/22] perf bpf: collect symbol table in object files Wang Nan
2015-04-30 10:52 ` [RFC PATCH 12/22] perf bpf: collect bpf programs from " Wang Nan
2015-04-30 10:52 ` [RFC PATCH 13/22] perf bpf: collects relocation sections from object file Wang Nan
2015-04-30 10:52 ` [RFC PATCH 14/22] perf bpf: config eBPF programs based on their names Wang Nan
2015-04-30 10:52 ` [RFC PATCH 15/22] perf bpf: config eBPF programs using config section Wang Nan
2015-04-30 10:52 ` [RFC PATCH 16/22] perf bpf: create maps needed by object file Wang Nan
2015-04-30 10:52 ` [RFC PATCH 17/22] perf bpf: relocation programs Wang Nan
2015-04-30 10:52 ` [RFC PATCH 18/22] perf bpf: load eBPF programs into kernel Wang Nan
2015-04-30 10:52 ` [RFC PATCH 19/22] perf bpf: dump eBPF program before loading Wang Nan
2015-04-30 10:52 ` [RFC PATCH 20/22] perf bpf: clean elf memory after loading Wang Nan
2015-04-30 10:52 ` [RFC PATCH 21/22] perf bpf: probe at kprobe points Wang Nan
2015-05-05 16:34 ` Masami Hiramatsu
2015-05-06 2:36 ` Wang Nan
2015-04-30 10:52 ` Wang Nan [this message]
2015-05-01 4:37 ` [RFC PATCH 00/22] perf tools: introduce 'perf bpf' command to load eBPF programs Alexei Starovoitov
2015-05-01 11:06 ` Peter Zijlstra
2015-05-01 11:49 ` Ingo Molnar
2015-05-01 16:56 ` Alexei Starovoitov
2015-05-01 17:06 ` Ingo Molnar
2015-05-05 15:39 ` Arnaldo Carvalho de Melo
2015-05-02 7:19 ` Wang Nan
2015-05-05 3:02 ` Alexei Starovoitov
2015-05-05 4:41 ` Wang Nan
2015-05-05 5:49 ` Alexei Starovoitov
2015-05-05 6:14 ` Wang Nan
2015-05-06 4:46 ` Wang Nan
2015-05-06 4:56 ` Alexei Starovoitov
2015-05-06 5:00 ` Wang Nan
2015-05-01 7:16 ` Ingo Molnar
2015-05-05 21:52 ` Brendan Gregg
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=1430391165-30267-23-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=davem@davemloft.net \
--cc=hekuang@huawei.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@kernel.org \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@redhat.com \
--cc=pi3orama@163.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®