7 files changed, 133 insertions, 27 deletions

diff --git a/tools/perf/util/data_map.c b/tools/perf/util/data_map.c
index c458db9ede6d..00a9c114c8d0 100644
--- a/tools/perf/util/data_map.c
+++ b/tools/perf/util/data_map.c
@@ -70,6 +70,39 @@ process_event(event_t *event, unsigned long offset, unsigned long head)
         }
 }
 
+static int perf_header__read_build_ids(const struct perf_header *self,
+                                       int input, off_t file_size)
+{
+        off_t offset = self->data_offset + self->data_size;
+        struct build_id_event bev;
+        char filename[PATH_MAX];
+        int err = -1;
+
+        if (lseek(input, offset, SEEK_SET) < 0)
+                return -1;
+
+        while (offset < file_size) {
+                struct dso *dso;
+                ssize_t len;
+
+                if (read(input, &bev, sizeof(bev)) != sizeof(bev))
+                        goto out;
+
+                len = bev.header.size - sizeof(bev);
+                if (read(input, filename, len) != len)
+                        goto out;
+
+                dso = dsos__findnew(filename);
+                if (dso != NULL)
+                        dso__set_build_id(dso, &bev.build_id);
+
+                offset += bev.header.size;
+        }
+        err = 0;
+out:
+        return err;
+}
+
 int mmap_dispatch_perf_file(struct perf_header **pheader,
                             const char *input_name,
                             int force,
@@ -130,6 +163,10 @@ int mmap_dispatch_perf_file(struct perf_header **pheader,
                 if (curr_handler->sample_type_check(sample_type) < 0)
                         exit(-1);
 
+        if (perf_header__has_feat(header, HEADER_BUILD_ID) &&
+            perf_header__read_build_ids(header, input, input_stat.st_size))
+                pr_debug("failed to read buildids, continuing...\n");
+
         if (load_kernel(NULL) < 0) {
                 perror("failed to load kernel symbols");
                 return EXIT_FAILURE;
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index 0a443bea68db..34c6fcb82d92 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -61,6 +61,13 @@ struct sample_event{
         u64 array[];
 };
 
+#define BUILD_ID_SIZE 20
+
+struct build_id_event {
+        struct perf_event_header header;
+        u8                       build_id[ALIGN(BUILD_ID_SIZE, sizeof(u64))];
+        char                     filename[];
+};
 
 typedef union event_union {
         struct perf_event_header        header;
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 7d26659b806c..050f543fd965 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -149,6 +149,16 @@ void perf_header__feat_trace_info(struct perf_header *header)
         set_bit(HEADER_TRACE_INFO, header->adds_features);
 }
 
+void perf_header__set_feat(struct perf_header *self, int feat)
+{
+        set_bit(feat, self->adds_features);
+}
+
+bool perf_header__has_feat(const struct perf_header *self, int feat)
+{
+        return test_bit(feat, self->adds_features);
+}
+
 static void do_write(int fd, void *buf, size_t size)
 {
         while (size) {
diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
index 2ea9dfb1236a..2f233c5db7e9 100644
--- a/tools/perf/util/header.h
+++ b/tools/perf/util/header.h
@@ -3,6 +3,7 @@
 
 #include "../../../include/linux/perf_event.h"
 #include <sys/types.h>
+#include <stdbool.h>
 #include "types.h"
 
 #include <linux/bitmap.h>
@@ -15,6 +16,7 @@ struct perf_header_attr {
 };
 
 #define HEADER_TRACE_INFO                       1
+#define HEADER_BUILD_ID                         2
 
 #define HEADER_FEAT_BITS                        256
 
@@ -48,6 +50,8 @@ u64 perf_header__sample_type(struct perf_header *header);
 struct perf_event_attr *
 perf_header__find_attr(u64 id, struct perf_header *header);
 void perf_header__feat_trace_info(struct perf_header *header);
+void perf_header__set_feat(struct perf_header *self, int feat);
+bool perf_header__has_feat(const struct perf_header *self, int feat);
 
 struct perf_header *perf_header__new(void);
 
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 33f868420d73..94ca95073c40 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -84,8 +84,18 @@ map__find_symbol(struct map *self, u64 ip, symbol_filter_t filter)
                 int nr = dso__load(self->dso, self, filter);
 
                 if (nr < 0) {
-                        pr_warning("Failed to open %s, continuing without symbols\n",
-                                   self->dso->long_name);
+                        if (self->dso->has_build_id) {
+                                char sbuild_id[BUILD_ID_SIZE * 2 + 1];
+
+                                build_id__sprintf(self->dso->build_id,
+                                                  sizeof(self->dso->build_id),
+                                                  sbuild_id);
+                                pr_warning("%s with build id %s not found",
+                                           self->dso->long_name, sbuild_id);
+                        } else
+                                pr_warning("Failed to open %s",
+                                           self->dso->long_name);
+                        pr_warning(", continuing without symbols\n");
                         return NULL;
                 } else if (nr == 0) {
                         const char *name = self->dso->long_name;
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;
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index e0d4a583f8dd..f8c1899af483 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -60,10 +60,12 @@ struct dso {
         struct list_head node;
         struct rb_root   syms;
         struct symbol    *(*find_symbol)(struct dso *, u64 ip);
-        unsigned char    adjust_symbols;
-        unsigned char    slen_calculated;
-        bool             loaded;
+        u8               adjust_symbols:1;
+        u8               slen_calculated:1;
+        u8               loaded:1;
+        u8               has_build_id:1;
         unsigned char    origin;
+        u8               build_id[BUILD_ID_SIZE];
         const char       *short_name;
         char             *long_name;
         char             name[0];
@@ -81,8 +83,10 @@ void dsos__fprintf(FILE *fp);
 
 size_t dso__fprintf(struct dso *self, FILE *fp);
 char dso__symtab_origin(const struct dso *self);
+void dso__set_build_id(struct dso *self, void *build_id);
 
 int filename__read_build_id(const char *filename, void *bf, size_t size);
+int build_id__sprintf(u8 *self, int len, char *bf);
 
 int load_kernel(symbol_filter_t filter);