perf symbols: Use the buildids if present

With this change 'perf record' will intercept PERF_RECORD_MMAP
calls, creating a linked list of DSOs, then when the session
finishes, it will traverse this list and read the buildids,
stashing them at the end of the file and will set up a new
feature bit in the header bitmask.

'perf report' will then notice this feature and populate the
'dsos' list and set the build ids.

When reading the symtabs it will refuse to load from a file that
doesn't have the same build id. This improves the
reliability of the profiler output, as symbols and profiling
data is more guaranteed to match.

Example:

 [root@doppio ~]# perf report | head
 /home/acme/bin/perf with build id b1ea544ac3746e7538972548a09aadecc5753868 not found, continuing without symbols
  # Samples: 2621434559
  #
  # Overhead          Command                  Shared Object  Symbol
  # ........  ...............  .............................  ......
  #
       7.91%             init  [kernel]        [k] read_hpet
       7.64%             init  [kernel]        [k] mwait_idle_with_hints
       7.60%          swapper  [kernel]        [k] read_hpet
       7.60%          swapper  [kernel]        [k] mwait_idle_with_hints
       3.65%             init  [kernel]        [k] 0xffffffffa02339d9
[root@doppio ~]#

In this case the 'perf' binary was an older one, vanished,
so its symbols probably wouldn't match or would cause subtly
different (and misleading) output.

Next patches will support the kernel as well, reading the build
id notes for it and the modules from /sys.

Another patch should also introduce a new plumbing command:

'perf list-buildids'

that will then be used in porcelain that is distro specific to
fetch -debuginfo packages where such buildids are present. This
will in turn allow for one to run 'perf record' in one machine
and 'perf report' in another.

Future work on having the buildid sent directly from the kernel
in the PERF_RECORD_MMAP event is needed to close races, as the
DSO can be changed during a 'perf record' session, but this
patch at least helps with non-corner cases and current/older
kernels.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Frank Ch. Eigler <fche@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Jim Keniston <jkenisto@us.ibm.com>
Cc: K. Prasad <prasad@linux.vnet.ibm.com>
Cc: Masami Hiramatsu <mhiramat@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Roland McGrath <roland@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <1257367843-26224-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 56 insertions, 22 deletions

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index e7c7cdb851c2..a2e95ce1f223 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -121,7 +121,8 @@ struct dso *dso__new(const char *name)
                 self->find_symbol = dso__find_symbol;
                 self->slen_calculated = 0;
                 self->origin = DSO__ORIG_NOT_FOUND;
-                self->loaded = false;
+                self->loaded = 0;
+                self->has_build_id = 0;
         }
 
         return self;
@@ -148,6 +149,12 @@ void dso__delete(struct dso *self)
         free(self);
 }
 
+void dso__set_build_id(struct dso *self, void *build_id)
+{
+        memcpy(self->build_id, build_id, sizeof(self->build_id));
+        self->has_build_id = 1;
+}
+
 static void dso__insert_symbol(struct dso *self, struct symbol *sym)
 {
         struct rb_node **p = &self->syms.rb_node;
@@ -190,11 +197,30 @@ struct symbol *dso__find_symbol(struct dso *self, u64 ip)
         return NULL;
 }
 
-size_t dso__fprintf(struct dso *self, FILE *fp)
+int build_id__sprintf(u8 *self, int len, char *bf)
 {
-        size_t ret = fprintf(fp, "dso: %s\n", self->short_name);
+        char *bid = bf;
+        u8 *raw = self;
+        int i;
 
+        for (i = 0; i < len; ++i) {
+                sprintf(bid, "%02x", *raw);
+                ++raw;
+                bid += 2;
+        }
+
+        return raw - self;
+}
+
+size_t dso__fprintf(struct dso *self, FILE *fp)
+{
+        char sbuild_id[BUILD_ID_SIZE * 2 + 1];
         struct rb_node *nd;
+        size_t ret;
+
+        build_id__sprintf(self->build_id, sizeof(self->build_id), sbuild_id);
+        ret = fprintf(fp, "dso: %s (%s)\n", self->short_name, sbuild_id);
+
         for (nd = rb_first(&self->syms); nd; nd = rb_next(nd)) {
                 struct symbol *pos = rb_entry(nd, struct symbol, rb_node);
                 ret += symbol__fprintf(pos, fp);
@@ -825,8 +851,6 @@ out_close:
         return err;
 }
 
-#define BUILD_ID_SIZE 20
-
 int filename__read_build_id(const char *filename, void *bf, size_t size)
 {
         int fd, err = -1;
@@ -845,7 +869,7 @@ int filename__read_build_id(const char *filename, void *bf, size_t size)
 
         elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL);
         if (elf == NULL) {
-                pr_err("%s: cannot read %s ELF file.\n", __func__, filename);
+                pr_debug2("%s: cannot read %s ELF file.\n", __func__, filename);
                 goto out_close;
         }
 
@@ -874,9 +898,9 @@ out:
 
 static char *dso__read_build_id(struct dso *self)
 {
-        int i, len;
-        char *build_id = NULL, *bid;
-        unsigned char rawbf[BUILD_ID_SIZE], *raw;
+        int len;
+        char *build_id = NULL;
+        unsigned char rawbf[BUILD_ID_SIZE];
 
         len = filename__read_build_id(self->long_name, rawbf, sizeof(rawbf));
         if (len < 0)
@@ -885,15 +909,8 @@ static char *dso__read_build_id(struct dso *self)
         build_id = malloc(len * 2 + 1);
         if (build_id == NULL)
                 goto out;
-        bid = build_id;
 
-        raw = rawbf;
-        for (i = 0; i < len; ++i) {
-                sprintf(bid, "%02x", *raw);
-                ++raw;
-                bid += 2;
-        }
-        pr_debug2("%s(%s): %s\n", __func__, self->long_name, build_id);
+        build_id__sprintf(rawbf, len, build_id);
 out:
         return build_id;
 }
@@ -922,7 +939,7 @@ int dso__load(struct dso *self, struct map *map, symbol_filter_t filter)
         int ret = -1;
         int fd;
 
-        self->loaded = true;
+        self->loaded = 1;
 
         if (!name)
                 return -1;
@@ -940,6 +957,8 @@ int dso__load(struct dso *self, struct map *map, symbol_filter_t filter)
 
 more:
         do {
+                int berr = 0;
+
                 self->origin++;
                 switch (self->origin) {
                 case DSO__ORIG_FEDORA:
@@ -956,8 +975,7 @@ more:
                                 snprintf(name, size,
                                          "/usr/lib/debug/.build-id/%.2s/%s.debug",
                                         build_id, build_id + 2);
-                                free(build_id);
-                                break;
+                                goto compare_build_id;
                         }
                         self->origin++;
                         /* Fall thru */
@@ -969,6 +987,22 @@ more:
                         goto out;
                 }
 
+                if (self->has_build_id) {
+                        bool match;
+                        build_id = malloc(BUILD_ID_SIZE);
+                        if (build_id == NULL)
+                                goto more;
+                        berr = filename__read_build_id(name, build_id,
+                                                       BUILD_ID_SIZE);
+compare_build_id:
+                        match = berr > 0 && memcmp(build_id, self->build_id,
+                                                   sizeof(self->build_id)) == 0;
+                        free(build_id);
+                        build_id = NULL;
+                        if (!match)
+                                goto more;
+                }
+
                 fd = open(name, O_RDONLY);
         } while (fd < 0);
 
@@ -1034,7 +1068,7 @@ static int dso__load_module_sym(struct dso *self, struct map *map,
 {
         int err = 0, fd = open(self->long_name, O_RDONLY);
 
-        self->loaded = true;
+        self->loaded = 1;
 
         if (fd < 0) {
                 pr_err("%s: cannot open %s\n", __func__, self->long_name);
@@ -1225,7 +1259,7 @@ static int dso__load_vmlinux(struct dso *self, struct map *map,
 {
         int err, fd = open(vmlinux, O_RDONLY);
 
-        self->loaded = true;
+        self->loaded = 1;
 
         if (fd < 0)
                 return -1;