perf report: Deal with maps

In order to deal with [vdso] maps generalize the ip->symbol path
a bit and allow to override some bits with custom functions.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/Documentation/perf_counter/builtin-report.c b/Documentation/perf_counter/builtin-report.c
index eb5424fcbd627a89cc40686a9117a400b694e2d3..9783d1e493c44d3d5cfe887d6b79e7f4bf2a2ea2 100644 (file)
--- a/Documentation/perf_counter/builtin-report.c
+++ b/Documentation/perf_counter/builtin-report.c
@@ -79,6 +79,7 @@ typedef union event_union {
 
 static LIST_HEAD(dsos);
 static struct dso *kernel_dso;
+static struct dso *vdso;
 
 static void dsos__add(struct dso *dso)
 {
@@ -136,6 +137,11 @@ static void dsos__fprintf(FILE *fp)
                dso__fprintf(pos, fp);
 }
 
+static struct symbol *vdso__find_symbol(struct dso *dso, uint64_t ip)
+{
+       return dso__find_symbol(kernel_dso, ip);
+}
+
 static int load_kernel(void)
 {
        int err;
@@ -151,6 +157,14 @@ static int load_kernel(void)
        } else
                dsos__add(kernel_dso);
 
+       vdso = dso__new("[vdso]", 0);
+       if (!vdso)
+               return -1;
+
+       vdso->find_symbol = vdso__find_symbol;
+
+       dsos__add(vdso);
+
        return err;
 }
 
@@ -173,9 +187,20 @@ struct map {
        uint64_t         start;
        uint64_t         end;
        uint64_t         pgoff;
+       uint64_t         (*map_ip)(struct map *, uint64_t);
        struct dso       *dso;
 };
 
+static uint64_t map__map_ip(struct map *map, uint64_t ip)
+{
+       return ip - map->start + map->pgoff;
+}
+
+static uint64_t vdso__map_ip(struct map *map, uint64_t ip)
+{
+       return ip;
+}
+
 static struct map *map__new(struct mmap_event *event)
 {
        struct map *self = malloc(sizeof(*self));
@@ -201,6 +226,11 @@ static struct map *map__new(struct mmap_event *event)
                self->dso = dsos__findnew(filename);
                if (self->dso == NULL)
                        goto out_delete;
+
+               if (self->dso == vdso)
+                       self->map_ip = vdso__map_ip;
+               else
+                       self->map_ip = map__map_ip;
        }
        return self;
 out_delete:
@@ -917,8 +947,8 @@ process_overflow_event(event_t *event, unsigned long offset, unsigned long head)
 
                map = thread__find_map(thread, ip);
                if (map != NULL) {
+                       ip = map->map_ip(map, ip);
                        dso = map->dso;
-                       ip -= map->start + map->pgoff;
                } else {
                        /*
                         * If this is outside of all known maps,
@@ -938,7 +968,10 @@ process_overflow_event(event_t *event, unsigned long offset, unsigned long head)
        }
 
        if (show & show_mask) {
-               struct symbol *sym = dso__find_symbol(dso, ip);
+               struct symbol *sym = NULL;
+
+               if (dso)
+                       sym = dso->find_symbol(dso, ip);
 
                if (hist_entry__add(thread, map, dso, sym, ip, level)) {
                        fprintf(stderr,

diff --git a/Documentation/perf_counter/util/symbol.c b/Documentation/perf_counter/util/symbol.c
index 15d5cf9abfac6d15d0a0cf555adafa8d6883a5ab..a06bbfba8350a45d740c2a0af67f51e9ee29d8d1 100644 (file)
--- a/Documentation/perf_counter/util/symbol.c
+++ b/Documentation/perf_counter/util/symbol.c
@@ -45,6 +45,7 @@ struct dso *dso__new(const char *name, unsigned int sym_priv_size)
                strcpy(self->name, name);
                self->syms = RB_ROOT;
                self->sym_priv_size = sym_priv_size;
+               self->find_symbol = dso__find_symbol;
        }
 
        return self;

diff --git a/Documentation/perf_counter/util/symbol.h b/Documentation/perf_counter/util/symbol.h
index 8dd8522a0a0c9ce56a7ed2373f06073f9078ef80..e23cc31266843ffb4b1474e18695016a4e15da78 100644 (file)
--- a/Documentation/perf_counter/util/symbol.h
+++ b/Documentation/perf_counter/util/symbol.h
@@ -16,6 +16,7 @@ struct dso {
        struct list_head node;
        struct rb_root   syms;
        unsigned int     sym_priv_size;
+       struct symbol    *(*find_symbol)(struct dso *, uint64_t ip);
        char             name[0];
 };