perf bpf: Rename bpf__foreach_tev() to bpf__foreach_event()
Following commit will allow BPF script attach to tracepoints. bpf__foreach_tev() will iterate over all events, not only kprobes. Rename it to bpf__foreach_event(). Since only group and event are used by caller, there's no need to pass full 'struct probe_trace_event' to bpf_prog_iter_callback_t. Pass only these two strings. After this patch bpf_prog_iter_callback_t natually support tracepoints. Signed-off-by: Wang Nan <wangnan0@huawei.com> Cc: Alexei Starovoitov <ast@kernel.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Zefan Li <lizefan@huawei.com> Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1468406646-21642-5-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:

committed by
Arnaldo Carvalho de Melo

parent
8c619d6a33
commit
cd102d70fe
@@ -584,7 +584,7 @@ struct __add_bpf_event_param {
|
||||
struct list_head *head_config;
|
||||
};
|
||||
|
||||
static int add_bpf_event(struct probe_trace_event *tev, int fd,
|
||||
static int add_bpf_event(const char *group, const char *event, int fd,
|
||||
void *_param)
|
||||
{
|
||||
LIST_HEAD(new_evsels);
|
||||
@@ -595,27 +595,27 @@ static int add_bpf_event(struct probe_trace_event *tev, int fd,
|
||||
int err;
|
||||
|
||||
pr_debug("add bpf event %s:%s and attach bpf program %d\n",
|
||||
tev->group, tev->event, fd);
|
||||
group, event, fd);
|
||||
|
||||
err = parse_events_add_tracepoint(&new_evsels, &evlist->idx, tev->group,
|
||||
tev->event, evlist->error,
|
||||
err = parse_events_add_tracepoint(&new_evsels, &evlist->idx, group,
|
||||
event, evlist->error,
|
||||
param->head_config);
|
||||
if (err) {
|
||||
struct perf_evsel *evsel, *tmp;
|
||||
|
||||
pr_debug("Failed to add BPF event %s:%s\n",
|
||||
tev->group, tev->event);
|
||||
group, event);
|
||||
list_for_each_entry_safe(evsel, tmp, &new_evsels, node) {
|
||||
list_del(&evsel->node);
|
||||
perf_evsel__delete(evsel);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
pr_debug("adding %s:%s\n", tev->group, tev->event);
|
||||
pr_debug("adding %s:%s\n", group, event);
|
||||
|
||||
list_for_each_entry(pos, &new_evsels, node) {
|
||||
pr_debug("adding %s:%s to %p\n",
|
||||
tev->group, tev->event, pos);
|
||||
group, event, pos);
|
||||
pos->bpf_fd = fd;
|
||||
}
|
||||
list_splice(&new_evsels, list);
|
||||
@@ -661,7 +661,7 @@ int parse_events_load_bpf_obj(struct parse_events_evlist *data,
|
||||
goto errout;
|
||||
}
|
||||
|
||||
err = bpf__foreach_tev(obj, add_bpf_event, ¶m);
|
||||
err = bpf__foreach_event(obj, add_bpf_event, ¶m);
|
||||
if (err) {
|
||||
snprintf(errbuf, sizeof(errbuf),
|
||||
"Attach events in BPF object failed");
|
||||
|
Reference in New Issue
Block a user