tools/perf: recognize and process RECORD_MMAP events for bpf progs
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index c4acd200..9eb5f6a 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);
@@ -728,6 +729,7 @@ struct map *machine__findnew_module_map(struct machine *machine, u64 start,
if (map == NULL)
goto out;
+/* map_groups__fixup_overlappings(&machine->kmaps, map, stderr);*/
map_groups__insert(&machine->kmaps, map);
/* Put the map here because map_groups__insert alread got it */
@@ -1460,6 +1462,27 @@ 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;
+
+ map = map_groups__find(&machine->kmaps, event->mmap.start);
+ if (event->mmap.filename[0]) {
+ fprintf(stderr, "adding bpf map->start %lx pgoff %lx %s\n",
+ map->start, map->pgoff,
+ event->mmap.filename);
+ sym = symbol__new(event->mmap.start - map->start + map->pgoff,
+ event->mmap.len, 0, 0,
+ event->mmap.filename);
+ dso__insert_symbol(map->dso, sym);
+ } else {
+ fprintf(stderr, "deleting bpf map->start %lx pgoff %lx\n",
+ map->start, map->pgoff);
+ symbols__erase(&map->dso->symbols, event->mmap.start);
+ dso__reset_find_symbol_cache(map->dso);
+ }
+ }
+
/* 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 d188b75..8683b26 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -353,6 +353,20 @@ 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);
@@ -500,6 +514,9 @@ struct symbol *dso__find_symbol(struct dso *dso, u64 addr)
dso->last_find_result.symbol = symbols__find(&dso->symbols, addr);
}
+ fprintf(stderr, "dso__find_symbol dso %s addr %lx res %s\n",
+ dso->short_name, addr, dso->last_find_result.symbol ?
+ dso->last_find_result.symbol->name : "?");
return dso->last_find_result.symbol;
}
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index f25fae4..92ef319 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);
