perf evsel: Store backpointer to attached bpf_object
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: af4a0991f40a1e50e5caff0317f152df2c82bdeb Gitweb: https://git.kernel.org/tip/af4a0991f40a1e50e5caff0317f152df2c82bdeb Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 15 Jul 2019 16:22:57 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 29 Jul 2019 18:34:41 -0300
perf evsel: Store backpointer to attached bpf_object
We may want to get to this bpf_object, to search for other BPF programs, etc.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Luis Cláudio Gonçalves <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/bpf-loader.c | 4 ++-- tools/perf/util/bpf-loader.h | 2 +- tools/perf/util/evsel.c | 1 + tools/perf/util/evsel.h | 3 +++ tools/perf/util/parse-events.c | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-)
tools/perf/util/bpf-loader.c +2 -2
@@ -763,7 +763,7 @@ int bpf__foreach_event(struct bpf_object *obj,if (priv->is_tp) { fd =bpf_program__fd (prog); - err = (*func)(priv->sys_name, priv->evt_name, fd, arg); + err = (*func)(priv->sys_name, priv->evt_name, fd, obj, arg);if (err) {pr_debug ("bpf: tracepoint call back failed, stop iterate\n" );return err;
@@ -788,7 +788,7 @@ int bpf__foreach_event(struct bpf_object *obj,return fd; } - err = (*func)(tev->group, tev->event, fd, arg); + err = (*func)(tev->group, tev->event, fd, obj, arg);if (err) {pr_debug ("bpf: call back failed, stop iterate\n" );return err;
tools/perf/util/bpf-loader.h +1 -1
@@ -46,7 +46,7 @@ struct parse_events_term;#define PERF_BPF_PROBE_GROUP "perf_bpf_probe"typedef int (*bpf_prog_iter_callback_t )(const char *group,const char *event, -int fd,void *arg); +int fd,struct bpf_object *obj,void *arg);#ifdef HAVE_LIBBPF_SUPPORT struct bpf_object *bpf__prepare_load (const char *filename,bool source);
tools/perf/util/evsel.c +1 -0
@@ -234,6 +234,7 @@ void perf_evsel__init(struct perf_evsel *evsel, evsel->scale =1.0 ; evsel->max_events =ULONG_MAX ; evsel->evlist =NULL ; + evsel->bpf_obj =NULL ; evsel->bpf_fd =-1 ;INIT_LIST_HEAD (&evsel->node);INIT_LIST_HEAD (&evsel->config_terms);
tools/perf/util/evsel.h +3 -0
@@ -82,6 +82,8 @@ enum perf_tool_event { PERF_TOOL_DURATION_TIME = 1, }; +struct bpf_object ; +/** struct perf_evsel - event selector * * @evlist - evlist this evsel is in, if it is in one.
@@ -152,6 +154,7 @@ struct perf_evsel {char *group_name;bool cmdline_group_boundary;struct list_head config_terms; +struct bpf_object *bpf_obj;int bpf_fd;bool auto_merge_stats;bool merged_stat;
tools/perf/util/parse-events.c +2 -1
@@ -630,7 +630,7 @@ struct __add_bpf_event_param {struct list_head *head_config; }; -static int add_bpf_event (const char *group,const char *event,int fd, +static int add_bpf_event (const char *group,const char *event,int fd,struct bpf_object *obj,void *_param) {LIST_HEAD (new_evsels);
@@ -672,6 +672,7 @@ static int add_bpf_event(const char *group, const char *event, int fd,pr_debug ("adding %s:%s to %p\n" , group, event, pos); pos->bpf_fd = fd; + pos->bpf_obj = obj; }list_splice (&new_evsels, list);return 0 ;