From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexei Starovoitov Subject: [PATCH perf 3/3] tools/perf: recognize and process RECORD_MMAP events for bpf progs Date: Wed, 19 Sep 2018 15:39:35 -0700 Message-ID: <20180919223935.999270-4-ast@kernel.org> References: <20180919223935.999270-1-ast@kernel.org> Mime-Version: 1.0 Content-Type: text/plain Cc: , , , , To: "David S . Miller" Return-path: Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:47060 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725790AbeITETv (ORCPT ); Thu, 20 Sep 2018 00:19:51 -0400 Received: from pps.filterd (m0001303.ppops.net [127.0.0.1]) by m0001303.ppops.net (8.16.0.22/8.16.0.22) with SMTP id w8JMW1rA021291 for ; Wed, 19 Sep 2018 15:39:45 -0700 Received: from mail.thefacebook.com ([199.201.64.23]) by m0001303.ppops.net with ESMTP id 2mkvck0nv8-2 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Wed, 19 Sep 2018 15:39:45 -0700 In-Reply-To: <20180919223935.999270-1-ast@kernel.org> Sender: netdev-owner@vger.kernel.org List-ID: Recognize JITed bpf prog load/unload events. Add/remove kernel symbols accordingly. Signed-off-by: Alexei Starovoitov --- tools/perf/util/machine.c | 27 +++++++++++++++++++++++++++ tools/perf/util/symbol.c | 13 +++++++++++++ tools/perf/util/symbol.h | 1 + 3 files changed, 41 insertions(+) diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index c4acd2001db0..ae4f8a0fdc7e 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -25,6 +25,7 @@ #include "sane_ctype.h" #include #include +#include static void __machine__remove_thread(struct machine *machine, struct thread *th, bool lock); @@ -1460,6 +1461,32 @@ static int machine__process_kernel_mmap_event(struct machine *machine, enum dso_kernel_type kernel_type; bool is_kernel_mmap; + /* process JITed bpf programs load/unload events */ + if (event->mmap.pid == ~0u && event->mmap.tid == BPF_FS_MAGIC) { + struct symbol *sym; + u64 ip; + + map = map_groups__find(&machine->kmaps, event->mmap.start); + if (!map) { + pr_err("No kernel map for IP %lx\n", event->mmap.start); + goto out_problem; + } + ip = event->mmap.start - map->start + map->pgoff; + if (event->mmap.filename[0]) { + sym = symbol__new(ip, event->mmap.len, 0, 0, + event->mmap.filename); + dso__insert_symbol(map->dso, sym); + } else { + if (symbols__erase(&map->dso->symbols, ip)) { + pr_err("No bpf prog at IP %lx/%lx\n", + event->mmap.start, ip); + goto out_problem; + } + dso__reset_find_symbol_cache(map->dso); + } + return 0; + } + /* If we have maps from kcore then we do not need or want any others */ if (machine__uses_kcore(machine)) return 0; diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c index d188b7588152..0653f313661d 100644 --- a/tools/perf/util/symbol.c +++ b/tools/perf/util/symbol.c @@ -353,6 +353,19 @@ static struct symbol *symbols__find(struct rb_root *symbols, u64 ip) return NULL; } +int symbols__erase(struct rb_root *symbols, u64 ip) +{ + struct symbol *s; + + s = symbols__find(symbols, ip); + if (!s) + return -ENOENT; + + rb_erase(&s->rb_node, symbols); + symbol__delete(s); + return 0; +} + static struct symbol *symbols__first(struct rb_root *symbols) { struct rb_node *n = rb_first(symbols); diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h index f25fae4b5743..92ef31953d9a 100644 --- a/tools/perf/util/symbol.h +++ b/tools/perf/util/symbol.h @@ -310,6 +310,7 @@ char *dso__demangle_sym(struct dso *dso, int kmodule, const char *elf_name); void __symbols__insert(struct rb_root *symbols, struct symbol *sym, bool kernel); void symbols__insert(struct rb_root *symbols, struct symbol *sym); +int symbols__erase(struct rb_root *symbols, u64 ip); void symbols__fixup_duplicate(struct rb_root *symbols); void symbols__fixup_end(struct rb_root *symbols); void map_groups__fixup_end(struct map_groups *mg); -- 2.17.1