aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Nan <wangnan0@huawei.com>2015-10-14 08:41:18 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-10-29 16:16:22 -0400
commit1f45b1d49073541947193bd7dac9e904142576aa (patch)
tree4e3b5fde5f432b6e7d079ec9a9835064069634df
parent50f1e6d0431d3343cb506037c43ce623bd15581f (diff)
perf bpf: Attach eBPF filter to perf event
This is the final patch which makes basic BPF filter work. After applying this patch, users are allowed to use BPF filter like: # perf record --event ./hello_world.o ls A bpf_fd field is appended to 'struct evsel', and setup during the callback function add_bpf_event() for each 'probe_trace_event'. PERF_EVENT_IOC_SET_BPF ioctl is used to attach eBPF program to a newly created perf event. The file descriptor of the eBPF program is passed to perf record using previous patches, and stored into evsel->bpf_fd. It is possible that different perf event are created for one kprobe events for different CPUs. In this case, when trying to call the ioctl, EEXIST will be return. This patch doesn't treat it as an error. Committer note: The bpf proggie used so far: __attribute__((section("fork=_do_fork"), used)) int fork(void *ctx) { return 0; } char _license[] __attribute__((section("license"), used)) = "GPL"; int _version __attribute__((section("version"), used)) = 0x40300; failed to produce any samples, even with forks happening and it being running in system wide mode. That is because now the filter is being associated, and the code above always returns zero, meaning that all forks will be probed but filtered away ;-/ Change it to 'return 1;' instead and after that: # trace --no-syscalls --event /tmp/foo.o 0.000 perf_bpf_probe:fork:(ffffffff8109be30)) 2.333 perf_bpf_probe:fork:(ffffffff8109be30)) 3.725 perf_bpf_probe:fork:(ffffffff8109be30)) 4.550 perf_bpf_probe:fork:(ffffffff8109be30)) ^C# And it works with all tools, including 'perf trace'. Signed-off-by: Wang Nan <wangnan0@huawei.com> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.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: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Zefan Li <lizefan@huawei.com> Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1444826502-49291-8-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/util/evsel.c17
-rw-r--r--tools/perf/util/evsel.h1
-rw-r--r--tools/perf/util/parse-events.c6
3 files changed, 24 insertions, 0 deletions
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 3ac4ee9c6a6e..397fb4ed3c97 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -208,6 +208,7 @@ void perf_evsel__init(struct perf_evsel *evsel,
208 evsel->unit = ""; 208 evsel->unit = "";
209 evsel->scale = 1.0; 209 evsel->scale = 1.0;
210 evsel->evlist = NULL; 210 evsel->evlist = NULL;
211 evsel->bpf_fd = -1;
211 INIT_LIST_HEAD(&evsel->node); 212 INIT_LIST_HEAD(&evsel->node);
212 INIT_LIST_HEAD(&evsel->config_terms); 213 INIT_LIST_HEAD(&evsel->config_terms);
213 perf_evsel__object.init(evsel); 214 perf_evsel__object.init(evsel);
@@ -1356,6 +1357,22 @@ retry_open:
1356 err); 1357 err);
1357 goto try_fallback; 1358 goto try_fallback;
1358 } 1359 }
1360
1361 if (evsel->bpf_fd >= 0) {
1362 int evt_fd = FD(evsel, cpu, thread);
1363 int bpf_fd = evsel->bpf_fd;
1364
1365 err = ioctl(evt_fd,
1366 PERF_EVENT_IOC_SET_BPF,
1367 bpf_fd);
1368 if (err && errno != EEXIST) {
1369 pr_err("failed to attach bpf fd %d: %s\n",
1370 bpf_fd, strerror(errno));
1371 err = -EINVAL;
1372 goto out_close;
1373 }
1374 }
1375
1359 set_rlimit = NO_CHANGE; 1376 set_rlimit = NO_CHANGE;
1360 1377
1361 /* 1378 /*
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 1e8ff1906f71..0e49bd742c63 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -123,6 +123,7 @@ struct perf_evsel {
123 char *group_name; 123 char *group_name;
124 bool cmdline_group_boundary; 124 bool cmdline_group_boundary;
125 struct list_head config_terms; 125 struct list_head config_terms;
126 int bpf_fd;
126}; 127};
127 128
128union u64_swap { 129union u64_swap {
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index d97b03710331..cee8c619ec7e 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -542,6 +542,7 @@ static int add_bpf_event(struct probe_trace_event *tev, int fd,
542 struct __add_bpf_event_param *param = _param; 542 struct __add_bpf_event_param *param = _param;
543 struct parse_events_evlist *evlist = param->data; 543 struct parse_events_evlist *evlist = param->data;
544 struct list_head *list = param->list; 544 struct list_head *list = param->list;
545 struct perf_evsel *pos;
545 int err; 546 int err;
546 547
547 pr_debug("add bpf event %s:%s and attach bpf program %d\n", 548 pr_debug("add bpf event %s:%s and attach bpf program %d\n",
@@ -562,6 +563,11 @@ static int add_bpf_event(struct probe_trace_event *tev, int fd,
562 } 563 }
563 pr_debug("adding %s:%s\n", tev->group, tev->event); 564 pr_debug("adding %s:%s\n", tev->group, tev->event);
564 565
566 list_for_each_entry(pos, &new_evsels, node) {
567 pr_debug("adding %s:%s to %p\n",
568 tev->group, tev->event, pos);
569 pos->bpf_fd = fd;
570 }
565 list_splice(&new_evsels, list); 571 list_splice(&new_evsels, list);
566 return 0; 572 return 0;
567} 573}