From: Alexei Starovoitov <ast@kernel•org>
To: "David S . Miller" <davem@davemloft•net>
Cc: <daniel@iogearbox•net>, <peterz@infradead•org>, <acme@kernel•org>,
<netdev@vger•kernel.org>, <kernel-team@fb•com>
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 [thread overview]
Message-ID: <20180919223935.999270-4-ast@kernel.org> (raw)
In-Reply-To: <20180919223935.999270-1-ast@kernel.org>
Recognize JITed bpf prog load/unload events.
Add/remove kernel symbols accordingly.
Signed-off-by: Alexei Starovoitov <ast@kernel•org>
---
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 <symbol/kallsyms.h>
#include <linux/mman.h>
+#include <linux/magic.h>
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
next prev parent reply other threads:[~2018-09-20 4:19 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-19 22:39 [PATCH bpf-next 0/3] perf, bpf: reveal invisible bpf programs Alexei Starovoitov
2018-09-19 22:39 ` [PATCH bpf-next 1/3] perf/core: introduce perf_event_mmap_bpf_prog Alexei Starovoitov
2018-09-19 23:30 ` Song Liu
2018-09-20 0:53 ` Alexei Starovoitov
2018-09-19 22:39 ` [PATCH bpf-next 2/3] bpf: emit RECORD_MMAP events for bpf prog load/unload Alexei Starovoitov
2018-09-19 23:44 ` Song Liu
2018-09-20 0:59 ` Alexei Starovoitov
2018-09-20 5:48 ` Song Liu
2018-09-20 8:44 ` Peter Zijlstra
2018-09-20 13:25 ` Arnaldo Carvalho de Melo
2018-09-20 13:56 ` Peter Zijlstra
2018-09-21 3:14 ` Alexei Starovoitov
2018-09-21 12:25 ` Arnaldo Carvalho de Melo
2018-09-21 13:55 ` Peter Zijlstra
2018-09-21 13:59 ` Peter Zijlstra
2018-09-21 22:13 ` Alexei Starovoitov
2018-10-15 23:33 ` Song Liu
2018-10-16 23:43 ` David Ahern
2018-10-17 6:43 ` Song Liu
2018-10-17 12:11 ` Arnaldo Carvalho de Melo
2018-10-17 12:50 ` Arnaldo Carvalho de Melo
2018-10-17 16:06 ` Song Liu
2018-11-02 1:08 ` Song Liu
2018-10-17 15:09 ` David Ahern
2018-10-17 16:18 ` Song Liu
2018-10-17 16:36 ` Alexei Starovoitov
2018-10-17 18:53 ` Arnaldo Carvalho de Melo
2018-10-17 19:08 ` Alexei Starovoitov
2018-10-17 21:31 ` Arnaldo Carvalho de Melo
2018-10-17 22:01 ` Alexei Starovoitov
2018-09-20 13:36 ` Peter Zijlstra
2018-09-19 22:39 ` Alexei Starovoitov [this message]
2018-09-20 13:36 ` [PATCH perf 3/3] tools/perf: recognize and process RECORD_MMAP events for bpf progs Arnaldo Carvalho de Melo
2018-09-20 14:05 ` Arnaldo Carvalho de Melo
2018-09-21 22:57 ` Song Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180919223935.999270-4-ast@kernel.org \
--to=ast@kernel$(echo .)org \
--cc=acme@kernel$(echo .)org \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=kernel-team@fb$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=peterz@infradead$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox