perf trace: Look up maps just on the __augmented_syscalls__ BPF object
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 5ca0b7f5004a5f1a35c1cb47894790ad98e34ed1 Gitweb: https://git.kernel.org/tip/5ca0b7f5004a5f1a35c1cb47894790ad98e34ed1 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Mon, 15 Jul 2019 17:03:10 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Mon, 29 Jul 2019 18:34:41 -0300
perf trace: Look up maps just on the __augmented_syscalls__ BPF object
We can conceivably have multiple BPF object files for other purposes, so better look just on the BPF object containing the __augmented_syscalls__ map for all things augmented_syscalls related.
Cc Adrian Hunter <[email protected]>
Cc Brendan Gregg <[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/builtin-trace.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-)
tools/perf/builtin-trace.c +7 -13
@@ -3669,28 +3669,22 @@ static int trace__parse_cgroups(const struct option *opt, const char *str, int ureturn 0 ; } -static struct bpf_map *bpf__find_map_by_name (const char *name) +static struct bpf_map *trace__find_bpf_map_by_name (struct trace *trace,const char *name) { -struct bpf_object *obj, *tmp; - -bpf_object__for_each_safe (obj, tmp) { -struct bpf_map *map =bpf_object__find_map_by_name (obj, name); -if (map) -return map; - - } +if (trace->bpf_obj ==NULL ) +return NULL ; -return NULL ; +return bpf_object__find_map_by_name (trace->bpf_obj, name); }static void trace__set_bpf_map_filtered_pids (struct trace *trace) { - trace->filter_pids.map =bpf__find_map_by_name ("pids_filtered" ); + trace->filter_pids.map =trace__find_bpf_map_by_name (trace,"pids_filtered" ); }static void trace__set_bpf_map_syscalls (struct trace *trace) { - trace->syscalls.map =bpf__find_map_by_name ("syscalls" ); + trace->syscalls.map =trace__find_bpf_map_by_name (trace,"syscalls" ); }static int trace__config (const char *var,const char *value,void *arg)
@@ -3924,7 +3918,7 @@ int cmd_trace(int argc, const char **argv) err =-1 ;if (map_dump_str) { - trace.dump.map =bpf__find_map_by_name (map_dump_str); + trace.dump.map =trace__find_bpf_map_by_name (&trace, map_dump_str);if (trace.dump.map ==NULL ) {pr_err ("ERROR: BPF map \"%s\" not found\n" , map_dump_str); goto out;