perf symbols: Fix inverted logic for showing kallsyms as the source of symbols
[safe/jmp/linux-2.6] / tools / perf / util / symbol.c
index 16ddca2..1270cf8 100644 (file)
 #include "util.h"
 #include "../perf.h"
+#include "session.h"
+#include "sort.h"
 #include "string.h"
 #include "symbol.h"
+#include "thread.h"
 
+#include "debug.h"
+
+#include <asm/bug.h>
 #include <libelf.h>
 #include <gelf.h>
 #include <elf.h>
+#include <limits.h>
+#include <sys/utsname.h>
+
+#ifndef NT_GNU_BUILD_ID
+#define NT_GNU_BUILD_ID 3
+#endif
 
-#ifndef NO_DEMANGLE
-#include <bfd.h>
-#else
-static inline
-char *bfd_demangle(void __used *v, const char __used *c, int __used i)
+enum dso_origin {
+       DSO__ORIG_KERNEL = 0,
+       DSO__ORIG_JAVA_JIT,
+       DSO__ORIG_BUILD_ID_CACHE,
+       DSO__ORIG_FEDORA,
+       DSO__ORIG_UBUNTU,
+       DSO__ORIG_BUILDID,
+       DSO__ORIG_DSO,
+       DSO__ORIG_KMODULE,
+       DSO__ORIG_NOT_FOUND,
+};
+
+static void dsos__add(struct list_head *head, struct dso *dso);
+static struct map *map__new2(u64 start, struct dso *dso, enum map_type type);
+static int dso__load_kernel_sym(struct dso *self, struct map *map,
+                               struct perf_session *session, symbol_filter_t filter);
+static int vmlinux_path__nr_entries;
+static char **vmlinux_path;
+
+struct symbol_conf symbol_conf = {
+       .exclude_other    = true,
+       .use_modules      = true,
+       .try_vmlinux_path = true,
+};
+
+bool dso__loaded(const struct dso *self, enum map_type type)
 {
-       return NULL;
+       return self->loaded & (1 << type);
 }
-#endif
 
-const char *sym_hist_filter;
+bool dso__sorted_by_name(const struct dso *self, enum map_type type)
+{
+       return self->sorted_by_name & (1 << type);
+}
 
-#ifndef DMGL_PARAMS
-#define DMGL_PARAMS      (1 << 0)       /* Include function args */
-#define DMGL_ANSI        (1 << 1)       /* Include const, volatile, etc */
-#endif
+static void dso__set_loaded(struct dso *self, enum map_type type)
+{
+       self->loaded |= (1 << type);
+}
 
-static struct symbol *symbol__new(u64 start, u64 len,
-                                 const char *name, unsigned int priv_size,
-                                 u64 obj_start, int verbose)
+static void dso__set_sorted_by_name(struct dso *self, enum map_type type)
 {
-       size_t namelen = strlen(name) + 1;
-       struct symbol *self = calloc(1, priv_size + sizeof(*self) + namelen);
+       self->sorted_by_name |= (1 << type);
+}
 
-       if (!self)
-               return NULL;
+bool symbol_type__is_a(char symbol_type, enum map_type map_type)
+{
+       switch (map_type) {
+       case MAP__FUNCTION:
+               return symbol_type == 'T' || symbol_type == 'W';
+       case MAP__VARIABLE:
+               return symbol_type == 'D' || symbol_type == 'd';
+       default:
+               return false;
+       }
+}
 
-       if (verbose >= 2)
-               printf("new symbol: %016Lx [%08lx]: %s, hist: %p, obj_start: %p\n",
-                       (u64)start, (unsigned long)len, name, self->hist, (void *)(unsigned long)obj_start);
+static void symbols__fixup_end(struct rb_root *self)
+{
+       struct rb_node *nd, *prevnd = rb_first(self);
+       struct symbol *curr, *prev;
+
+       if (prevnd == NULL)
+               return;
+
+       curr = rb_entry(prevnd, struct symbol, rb_node);
 
-       self->obj_start= obj_start;
-       self->hist = NULL;
-       self->hist_sum = 0;
+       for (nd = rb_next(prevnd); nd; nd = rb_next(nd)) {
+               prev = curr;
+               curr = rb_entry(nd, struct symbol, rb_node);
+
+               if (prev->end == prev->start)
+                       prev->end = curr->start - 1;
+       }
 
-       if (sym_hist_filter && !strcmp(name, sym_hist_filter))
-               self->hist = calloc(sizeof(u64), len);
+       /* Last entry */
+       if (curr->end == curr->start)
+               curr->end = roundup(curr->start, 4096);
+}
 
-       if (priv_size) {
-               memset(self, 0, priv_size);
-               self = ((void *)self) + priv_size;
+static void __map_groups__fixup_end(struct map_groups *self, enum map_type type)
+{
+       struct map *prev, *curr;
+       struct rb_node *nd, *prevnd = rb_first(&self->maps[type]);
+
+       if (prevnd == NULL)
+               return;
+
+       curr = rb_entry(prevnd, struct map, rb_node);
+
+       for (nd = rb_next(prevnd); nd; nd = rb_next(nd)) {
+               prev = curr;
+               curr = rb_entry(nd, struct map, rb_node);
+               prev->end = curr->start - 1;
        }
+
+       /*
+        * We still haven't the actual symbols, so guess the
+        * last map final address.
+        */
+       curr->end = ~0UL;
+}
+
+static void map_groups__fixup_end(struct map_groups *self)
+{
+       int i;
+       for (i = 0; i < MAP__NR_TYPES; ++i)
+               __map_groups__fixup_end(self, i);
+}
+
+static struct symbol *symbol__new(u64 start, u64 len, const char *name)
+{
+       size_t namelen = strlen(name) + 1;
+       struct symbol *self = zalloc(symbol_conf.priv_size +
+                                    sizeof(*self) + namelen);
+       if (self == NULL)
+               return NULL;
+
+       if (symbol_conf.priv_size)
+               self = ((void *)self) + symbol_conf.priv_size;
+
        self->start = start;
        self->end   = len ? start + len - 1 : start;
+
+       pr_debug3("%s: %s %#Lx-%#Lx\n", __func__, name, start, self->end);
+
        memcpy(self->name, name, namelen);
 
        return self;
 }
 
-static void symbol__delete(struct symbol *self, unsigned int priv_size)
+static void symbol__delete(struct symbol *self)
 {
-       free(((void *)self) - priv_size);
+       free(((void *)self) - symbol_conf.priv_size);
 }
 
 static size_t symbol__fprintf(struct symbol *self, FILE *fp)
 {
-       if (!self->module)
-               return fprintf(fp, " %llx-%llx %s\n",
+       return fprintf(fp, " %llx-%llx %s\n",
                       self->start, self->end, self->name);
-       else
-               return fprintf(fp, " %llx-%llx %s \t[%s]\n",
-                      self->start, self->end, self->name, self->module->name);
 }
 
-struct dso *dso__new(const char *name, unsigned int sym_priv_size)
+void dso__set_long_name(struct dso *self, char *name)
+{
+       if (name == NULL)
+               return;
+       self->long_name = name;
+       self->long_name_len = strlen(name);
+}
+
+static void dso__set_basename(struct dso *self)
 {
-       struct dso *self = malloc(sizeof(*self) + strlen(name) + 1);
+       self->short_name = basename(self->long_name);
+}
+
+struct dso *dso__new(const char *name)
+{
+       struct dso *self = zalloc(sizeof(*self) + strlen(name) + 1);
 
        if (self != NULL) {
+               int i;
                strcpy(self->name, name);
-               self->syms = RB_ROOT;
-               self->sym_priv_size = sym_priv_size;
-               self->find_symbol = dso__find_symbol;
+               dso__set_long_name(self, self->name);
+               self->short_name = self->name;
+               for (i = 0; i < MAP__NR_TYPES; ++i)
+                       self->symbols[i] = self->symbol_names[i] = RB_ROOT;
                self->slen_calculated = 0;
+               self->origin = DSO__ORIG_NOT_FOUND;
+               self->loaded = 0;
+               self->sorted_by_name = 0;
+               self->has_build_id = 0;
        }
 
        return self;
 }
 
-static void dso__delete_symbols(struct dso *self)
+static void symbols__delete(struct rb_root *self)
 {
        struct symbol *pos;
-       struct rb_node *next = rb_first(&self->syms);
+       struct rb_node *next = rb_first(self);
 
        while (next) {
                pos = rb_entry(next, struct symbol, rb_node);
                next = rb_next(&pos->rb_node);
-               rb_erase(&pos->rb_node, &self->syms);
-               symbol__delete(pos, self->sym_priv_size);
+               rb_erase(&pos->rb_node, self);
+               symbol__delete(pos);
        }
 }
 
 void dso__delete(struct dso *self)
 {
-       dso__delete_symbols(self);
+       int i;
+       for (i = 0; i < MAP__NR_TYPES; ++i)
+               symbols__delete(&self->symbols[i]);
+       if (self->long_name != self->name)
+               free(self->long_name);
        free(self);
 }
 
-static void dso__insert_symbol(struct dso *self, struct symbol *sym)
+void dso__set_build_id(struct dso *self, void *build_id)
 {
-       struct rb_node **p = &self->syms.rb_node;
+       memcpy(self->build_id, build_id, sizeof(self->build_id));
+       self->has_build_id = 1;
+}
+
+static void symbols__insert(struct rb_root *self, struct symbol *sym)
+{
+       struct rb_node **p = &self->rb_node;
        struct rb_node *parent = NULL;
        const u64 ip = sym->start;
        struct symbol *s;
@@ -121,17 +240,17 @@ static void dso__insert_symbol(struct dso *self, struct symbol *sym)
                        p = &(*p)->rb_right;
        }
        rb_link_node(&sym->rb_node, parent, p);
-       rb_insert_color(&sym->rb_node, &self->syms);
+       rb_insert_color(&sym->rb_node, self);
 }
 
-struct symbol *dso__find_symbol(struct dso *self, u64 ip)
+static struct symbol *symbols__find(struct rb_root *self, u64 ip)
 {
        struct rb_node *n;
 
        if (self == NULL)
                return NULL;
 
-       n = self->syms.rb_node;
+       n = self->rb_node;
 
        while (n) {
                struct symbol *s = rb_entry(n, struct symbol, rb_node);
@@ -147,12 +266,116 @@ struct symbol *dso__find_symbol(struct dso *self, u64 ip)
        return NULL;
 }
 
-size_t dso__fprintf(struct dso *self, FILE *fp)
+struct symbol_name_rb_node {
+       struct rb_node  rb_node;
+       struct symbol   sym;
+};
+
+static void symbols__insert_by_name(struct rb_root *self, struct symbol *sym)
 {
-       size_t ret = fprintf(fp, "dso: %s\n", self->name);
+       struct rb_node **p = &self->rb_node;
+       struct rb_node *parent = NULL;
+       struct symbol_name_rb_node *symn = ((void *)sym) - sizeof(*parent), *s;
 
+       while (*p != NULL) {
+               parent = *p;
+               s = rb_entry(parent, struct symbol_name_rb_node, rb_node);
+               if (strcmp(sym->name, s->sym.name) < 0)
+                       p = &(*p)->rb_left;
+               else
+                       p = &(*p)->rb_right;
+       }
+       rb_link_node(&symn->rb_node, parent, p);
+       rb_insert_color(&symn->rb_node, self);
+}
+
+static void symbols__sort_by_name(struct rb_root *self, struct rb_root *source)
+{
        struct rb_node *nd;
-       for (nd = rb_first(&self->syms); nd; nd = rb_next(nd)) {
+
+       for (nd = rb_first(source); nd; nd = rb_next(nd)) {
+               struct symbol *pos = rb_entry(nd, struct symbol, rb_node);
+               symbols__insert_by_name(self, pos);
+       }
+}
+
+static struct symbol *symbols__find_by_name(struct rb_root *self, const char *name)
+{
+       struct rb_node *n;
+
+       if (self == NULL)
+               return NULL;
+
+       n = self->rb_node;
+
+       while (n) {
+               struct symbol_name_rb_node *s;
+               int cmp;
+
+               s = rb_entry(n, struct symbol_name_rb_node, rb_node);
+               cmp = strcmp(name, s->sym.name);
+
+               if (cmp < 0)
+                       n = n->rb_left;
+               else if (cmp > 0)
+                       n = n->rb_right;
+               else
+                       return &s->sym;
+       }
+
+       return NULL;
+}
+
+struct symbol *dso__find_symbol(struct dso *self,
+                               enum map_type type, u64 addr)
+{
+       return symbols__find(&self->symbols[type], addr);
+}
+
+struct symbol *dso__find_symbol_by_name(struct dso *self, enum map_type type,
+                                       const char *name)
+{
+       return symbols__find_by_name(&self->symbol_names[type], name);
+}
+
+void dso__sort_by_name(struct dso *self, enum map_type type)
+{
+       dso__set_sorted_by_name(self, type);
+       return symbols__sort_by_name(&self->symbol_names[type],
+                                    &self->symbols[type]);
+}
+
+int build_id__sprintf(const u8 *self, int len, char *bf)
+{
+       char *bid = bf;
+       const 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_buildid(struct dso *self, FILE *fp)
+{
+       char sbuild_id[BUILD_ID_SIZE * 2 + 1];
+
+       build_id__sprintf(self->build_id, sizeof(self->build_id), sbuild_id);
+       return fprintf(fp, "%s", sbuild_id);
+}
+
+size_t dso__fprintf(struct dso *self, enum map_type type, FILE *fp)
+{
+       struct rb_node *nd;
+       size_t ret = fprintf(fp, "dso: %s (", self->short_name);
+
+       ret += dso__fprintf_buildid(self, fp);
+       ret += fprintf(fp, ")\n");
+       for (nd = rb_first(&self->symbols[type]); nd; nd = rb_next(nd)) {
                struct symbol *pos = rb_entry(nd, struct symbol, rb_node);
                ret += symbol__fprintf(pos, fp);
        }
@@ -160,22 +383,23 @@ size_t dso__fprintf(struct dso *self, FILE *fp)
        return ret;
 }
 
-static int dso__load_kallsyms(struct dso *self, symbol_filter_t filter, int verbose)
+int kallsyms__parse(const char *filename, void *arg,
+                   int (*process_symbol)(void *arg, const char *name,
+                                                    char type, u64 start))
 {
-       struct rb_node *nd, *prevnd;
        char *line = NULL;
        size_t n;
-       FILE *file = fopen("/proc/kallsyms", "r");
-       int count = 0;
+       int err = 0;
+       FILE *file = fopen(filename, "r");
 
        if (file == NULL)
                goto out_failure;
 
        while (!feof(file)) {
                u64 start;
-               struct symbol *sym;
                int line_len, len;
                char symbol_type;
+               char *symbol_name;
 
                line_len = getline(&line, &n, file);
                if (line_len < 0)
@@ -193,64 +417,168 @@ static int dso__load_kallsyms(struct dso *self, symbol_filter_t filter, int verb
                        continue;
 
                symbol_type = toupper(line[len]);
-               /*
-                * We're interested only in code ('T'ext)
-                */
-               if (symbol_type != 'T' && symbol_type != 'W')
-                       continue;
-               /*
-                * Well fix up the end later, when we have all sorted.
-                */
-               sym = symbol__new(start, 0xdead, line + len + 2,
-                                 self->sym_priv_size, 0, verbose);
-
-               if (sym == NULL)
-                       goto out_delete_line;
+               symbol_name = line + len + 2;
 
-               if (filter && filter(self, sym))
-                       symbol__delete(sym, self->sym_priv_size);
-               else {
-                       dso__insert_symbol(self, sym);
-                       count++;
-               }
+               err = process_symbol(arg, symbol_name, symbol_type, start);
+               if (err)
+                       break;
        }
 
+       free(line);
+       fclose(file);
+       return err;
+
+out_failure:
+       return -1;
+}
+
+struct process_kallsyms_args {
+       struct map *map;
+       struct dso *dso;
+};
+
+static int map__process_kallsym_symbol(void *arg, const char *name,
+                                      char type, u64 start)
+{
+       struct symbol *sym;
+       struct process_kallsyms_args *a = arg;
+       struct rb_root *root = &a->dso->symbols[a->map->type];
+
+       if (!symbol_type__is_a(type, a->map->type))
+               return 0;
+
        /*
-        * Now that we have all sorted out, just set the ->end of all
-        * symbols
+        * Will fix up the end later, when we have all symbols sorted.
         */
-       prevnd = rb_first(&self->syms);
+       sym = symbol__new(start, 0, name);
 
-       if (prevnd == NULL)
-               goto out_delete_line;
+       if (sym == NULL)
+               return -ENOMEM;
+       /*
+        * We will pass the symbols to the filter later, in
+        * map__split_kallsyms, when we have split the maps per module
+        */
+       symbols__insert(root, sym);
+       return 0;
+}
 
-       for (nd = rb_next(prevnd); nd; nd = rb_next(nd)) {
-               struct symbol *prev = rb_entry(prevnd, struct symbol, rb_node),
-                             *curr = rb_entry(nd, struct symbol, rb_node);
+/*
+ * Loads the function entries in /proc/kallsyms into kernel_map->dso,
+ * so that we can in the next step set the symbol ->end address and then
+ * call kernel_maps__split_kallsyms.
+ */
+static int dso__load_all_kallsyms(struct dso *self, const char *filename,
+                                 struct map *map)
+{
+       struct process_kallsyms_args args = { .map = map, .dso = self, };
+       return kallsyms__parse(filename, &args, map__process_kallsym_symbol);
+}
 
-               prev->end = curr->start - 1;
-               prevnd = nd;
-       }
+/*
+ * Split the symbols into maps, making sure there are no overlaps, i.e. the
+ * kernel range is broken in several maps, named [kernel].N, as we don't have
+ * the original ELF section names vmlinux have.
+ */
+static int dso__split_kallsyms(struct dso *self, struct map *map,
+                              struct perf_session *session, symbol_filter_t filter)
+{
+       struct map *curr_map = map;
+       struct symbol *pos;
+       int count = 0;
+       struct rb_root *root = &self->symbols[map->type];
+       struct rb_node *next = rb_first(root);
+       int kernel_range = 0;
 
-       free(line);
-       fclose(file);
+       while (next) {
+               char *module;
+
+               pos = rb_entry(next, struct symbol, rb_node);
+               next = rb_next(&pos->rb_node);
+
+               module = strchr(pos->name, '\t');
+               if (module) {
+                       if (!symbol_conf.use_modules)
+                               goto discard_symbol;
+
+                       *module++ = '\0';
+
+                       if (strcmp(curr_map->dso->short_name, module)) {
+                               curr_map = map_groups__find_by_name(&session->kmaps, map->type, module);
+                               if (curr_map == NULL) {
+                                       pr_debug("/proc/{kallsyms,modules} "
+                                                "inconsistency while looking "
+                                                "for \"%s\" module!\n", module);
+                                       return -1;
+                               }
+
+                               if (curr_map->dso->loaded)
+                                       goto discard_symbol;
+                       }
+                       /*
+                        * So that we look just like we get from .ko files,
+                        * i.e. not prelinked, relative to map->start.
+                        */
+                       pos->start = curr_map->map_ip(curr_map, pos->start);
+                       pos->end   = curr_map->map_ip(curr_map, pos->end);
+               } else if (curr_map != map) {
+                       char dso_name[PATH_MAX];
+                       struct dso *dso;
+
+                       snprintf(dso_name, sizeof(dso_name), "[kernel].%d",
+                                kernel_range++);
+
+                       dso = dso__new(dso_name);
+                       if (dso == NULL)
+                               return -1;
+
+                       curr_map = map__new2(pos->start, dso, map->type);
+                       if (map == NULL) {
+                               dso__delete(dso);
+                               return -1;
+                       }
+
+                       curr_map->map_ip = curr_map->unmap_ip = identity__map_ip;
+                       map_groups__insert(&session->kmaps, curr_map);
+                       ++kernel_range;
+               }
+
+               if (filter && filter(curr_map, pos)) {
+discard_symbol:                rb_erase(&pos->rb_node, root);
+                       symbol__delete(pos);
+               } else {
+                       if (curr_map != map) {
+                               rb_erase(&pos->rb_node, root);
+                               symbols__insert(&curr_map->dso->symbols[curr_map->type], pos);
+                       }
+                       count++;
+               }
+       }
 
        return count;
+}
 
-out_delete_line:
-       free(line);
-out_failure:
-       return -1;
+
+static int dso__load_kallsyms(struct dso *self, const char *filename, struct map *map,
+                             struct perf_session *session, symbol_filter_t filter)
+{
+       if (dso__load_all_kallsyms(self, filename, map) < 0)
+               return -1;
+
+       symbols__fixup_end(&self->symbols[map->type]);
+       self->origin = DSO__ORIG_KERNEL;
+
+       return dso__split_kallsyms(self, map, session, filter);
 }
 
-static int dso__load_perf_map(struct dso *self, symbol_filter_t filter, int verbose)
+static int dso__load_perf_map(struct dso *self, struct map *map,
+                             symbol_filter_t filter)
 {
        char *line = NULL;
        size_t n;
        FILE *file;
        int nr_syms = 0;
 
-       file = fopen(self->name, "r");
+       file = fopen(self->long_name, "r");
        if (file == NULL)
                goto out_failure;
 
@@ -280,16 +608,15 @@ static int dso__load_perf_map(struct dso *self, symbol_filter_t filter, int verb
                if (len + 2 >= line_len)
                        continue;
 
-               sym = symbol__new(start, size, line + len,
-                                 self->sym_priv_size, start, verbose);
+               sym = symbol__new(start, size, line + len);
 
                if (sym == NULL)
                        goto out_delete_line;
 
-               if (filter && filter(self, sym))
-                       symbol__delete(sym, self->sym_priv_size);
+               if (filter && filter(map, sym))
+                       symbol__delete(sym);
                else {
-                       dso__insert_symbol(self, sym);
+                       symbols__insert(&self->symbols[map->type], sym);
                        nr_syms++;
                }
        }
@@ -309,13 +636,13 @@ out_failure:
  * elf_symtab__for_each_symbol - iterate thru all the symbols
  *
  * @self: struct elf_symtab instance to iterate
- * @index: uint32_t index
+ * @idx: uint32_t idx
  * @sym: GElf_Sym iterator
  */
-#define elf_symtab__for_each_symbol(syms, nr_syms, index, sym) \
-       for (index = 0, gelf_getsym(syms, index, &sym);\
-            index < nr_syms; \
-            index++, gelf_getsym(syms, index, &sym))
+#define elf_symtab__for_each_symbol(syms, nr_syms, idx, sym) \
+       for (idx = 0, gelf_getsym(syms, idx, &sym);\
+            idx < nr_syms; \
+            idx++, gelf_getsym(syms, idx, &sym))
 
 static inline uint8_t elf_sym__type(const GElf_Sym *sym)
 {
@@ -326,8 +653,14 @@ static inline int elf_sym__is_function(const GElf_Sym *sym)
 {
        return elf_sym__type(sym) == STT_FUNC &&
               sym->st_name != 0 &&
-              sym->st_shndx != SHN_UNDEF &&
-              sym->st_size != 0;
+              sym->st_shndx != SHN_UNDEF;
+}
+
+static inline bool elf_sym__is_object(const GElf_Sym *sym)
+{
+       return elf_sym__type(sym) == STT_OBJECT &&
+               sym->st_name != 0 &&
+               sym->st_shndx != SHN_UNDEF;
 }
 
 static inline int elf_sym__is_label(const GElf_Sym *sym)
@@ -350,6 +683,12 @@ static inline int elf_sec__is_text(const GElf_Shdr *shdr,
        return strstr(elf_sec__name(shdr, secstrs), "text") != NULL;
 }
 
+static inline bool elf_sec__is_data(const GElf_Shdr *shdr,
+                                   const Elf_Data *secstrs)
+{
+       return strstr(elf_sec__name(shdr, secstrs), "data") != NULL;
+}
+
 static inline const char *elf_sym__name(const GElf_Sym *sym,
                                        const Elf_Data *symstrs)
 {
@@ -358,7 +697,7 @@ static inline const char *elf_sym__name(const GElf_Sym *sym,
 
 static Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep,
                                    GElf_Shdr *shp, const char *name,
-                                   size_t *index)
+                                   size_t *idx)
 {
        Elf_Scn *sec = NULL;
        size_t cnt = 1;
@@ -369,8 +708,8 @@ static Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep,
                gelf_getshdr(sec, shp);
                str = elf_strptr(elf, ep->e_shstrndx, shp->sh_name);
                if (!strcmp(name, str)) {
-                       if (index)
-                               *index = cnt;
+                       if (idx)
+                               *idx = cnt;
                        break;
                }
                ++cnt;
@@ -396,7 +735,8 @@ static Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep,
  * And always look at the original dso, not at debuginfo packages, that
  * have the PLT data stripped out (shdr_rel_plt.sh_type == SHT_NOBITS).
  */
-static int dso__synthesize_plt_symbols(struct  dso *self, int verbose)
+static int dso__synthesize_plt_symbols(struct  dso *self, struct map *map,
+                                      symbol_filter_t filter)
 {
        uint32_t nr_rel_entries, idx;
        GElf_Sym sym;
@@ -412,11 +752,11 @@ static int dso__synthesize_plt_symbols(struct  dso *self, int verbose)
        Elf *elf;
        int nr = 0, symidx, fd, err = 0;
 
-       fd = open(self->name, O_RDONLY);
+       fd = open(self->long_name, O_RDONLY);
        if (fd < 0)
                goto out;
 
-       elf = elf_begin(fd, ELF_C_READ_MMAP, NULL);
+       elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL);
        if (elf == NULL)
                goto out_close;
 
@@ -446,7 +786,7 @@ static int dso__synthesize_plt_symbols(struct  dso *self, int verbose)
                goto out_elf_end;
 
        /*
-        * Fetch the relocation section to find the indexes to the GOT
+        * Fetch the relocation section to find the idxes to the GOT
         * and the symbols in the .dynsym they refer to.
         */
        reldata = elf_getdata(scn_plt_rel, NULL);
@@ -480,12 +820,16 @@ static int dso__synthesize_plt_symbols(struct  dso *self, int verbose)
                                 "%s@plt", elf_sym__name(&sym, symstrs));
 
                        f = symbol__new(plt_offset, shdr_plt.sh_entsize,
-                                       sympltname, self->sym_priv_size, 0, verbose);
+                                       sympltname);
                        if (!f)
                                goto out_elf_end;
 
-                       dso__insert_symbol(self, f);
-                       ++nr;
+                       if (filter && filter(map, f))
+                               symbol__delete(f);
+                       else {
+                               symbols__insert(&self->symbols[map->type], f);
+                               ++nr;
+                       }
                }
        } else if (shdr_rel_plt.sh_type == SHT_REL) {
                GElf_Rel pos_mem, *pos;
@@ -498,12 +842,16 @@ static int dso__synthesize_plt_symbols(struct  dso *self, int verbose)
                                 "%s@plt", elf_sym__name(&sym, symstrs));
 
                        f = symbol__new(plt_offset, shdr_plt.sh_entsize,
-                                       sympltname, self->sym_priv_size, 0, verbose);
+                                       sympltname);
                        if (!f)
                                goto out_elf_end;
 
-                       dso__insert_symbol(self, f);
-                       ++nr;
+                       if (filter && filter(map, f))
+                               symbol__delete(f);
+                       else {
+                               symbols__insert(&self->symbols[map->type], f);
+                               ++nr;
+                       }
                }
        }
 
@@ -516,37 +864,62 @@ out_close:
        if (err == 0)
                return nr;
 out:
-       fprintf(stderr, "%s: problems reading %s PLT info.\n",
-               __func__, self->name);
+       pr_warning("%s: problems reading %s PLT info.\n",
+                  __func__, self->long_name);
        return 0;
 }
 
-static int dso__load_sym(struct dso *self, int fd, const char *name,
-                        symbol_filter_t filter, int verbose, struct module *mod)
+static bool elf_sym__is_a(GElf_Sym *self, enum map_type type)
 {
+       switch (type) {
+       case MAP__FUNCTION:
+               return elf_sym__is_function(self);
+       case MAP__VARIABLE:
+               return elf_sym__is_object(self);
+       default:
+               return false;
+       }
+}
+
+static bool elf_sec__is_a(GElf_Shdr *self, Elf_Data *secstrs, enum map_type type)
+{
+       switch (type) {
+       case MAP__FUNCTION:
+               return elf_sec__is_text(self, secstrs);
+       case MAP__VARIABLE:
+               return elf_sec__is_data(self, secstrs);
+       default:
+               return false;
+       }
+}
+
+static int dso__load_sym(struct dso *self, struct map *map,
+                        struct perf_session *session, const char *name, int fd,
+                        symbol_filter_t filter, int kernel, int kmodule)
+{
+       struct map *curr_map = map;
+       struct dso *curr_dso = self;
+       size_t dso_name_len = strlen(self->short_name);
        Elf_Data *symstrs, *secstrs;
        uint32_t nr_syms;
        int err = -1;
-       uint32_t index;
+       uint32_t idx;
        GElf_Ehdr ehdr;
        GElf_Shdr shdr;
        Elf_Data *syms;
        GElf_Sym sym;
        Elf_Scn *sec, *sec_strndx;
        Elf *elf;
-       int nr = 0, kernel = !strcmp("[kernel]", self->name);
+       int nr = 0;
 
-       elf = elf_begin(fd, ELF_C_READ_MMAP, NULL);
+       elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL);
        if (elf == NULL) {
-               if (verbose)
-                       fprintf(stderr, "%s: cannot read %s ELF file.\n",
-                               __func__, name);
+               pr_err("%s: cannot read %s ELF file.\n", __func__, name);
                goto out_close;
        }
 
        if (gelf_getehdr(elf, &ehdr) == NULL) {
-               if (verbose)
-                       fprintf(stderr, "%s: cannot get elf header.\n", __func__);
+               pr_err("%s: cannot get elf header.\n", __func__);
                goto out_elf_end;
        }
 
@@ -587,16 +960,18 @@ static int dso__load_sym(struct dso *self, int fd, const char *name,
                                                     NULL) != NULL);
        } else self->adjust_symbols = 0;
 
-       elf_symtab__for_each_symbol(syms, nr_syms, index, sym) {
+       elf_symtab__for_each_symbol(syms, nr_syms, idx, sym) {
                struct symbol *f;
-               const char *name;
-               char *demangled;
-               u64 obj_start;
-               struct section *section = NULL;
+               const char *elf_name = elf_sym__name(&sym, symstrs);
+               char *demangled = NULL;
                int is_label = elf_sym__is_label(&sym);
                const char *section_name;
 
-               if (!is_label && !elf_sym__is_function(&sym))
+               if (kernel && session->ref_reloc_sym.name != NULL &&
+                   strcmp(elf_name, session->ref_reloc_sym.name) == 0)
+                       perf_session__reloc_vmlinux_maps(session, sym.st_value);
+
+               if (!is_label && !elf_sym__is_a(&sym, map->type))
                        continue;
 
                sec = elf_getscn(elf, sym.st_shndx);
@@ -605,55 +980,87 @@ static int dso__load_sym(struct dso *self, int fd, const char *name,
 
                gelf_getshdr(sec, &shdr);
 
-               if (is_label && !elf_sec__is_text(&shdr, secstrs))
+               if (is_label && !elf_sec__is_a(&shdr, secstrs, map->type))
                        continue;
 
                section_name = elf_sec__name(&shdr, secstrs);
-               obj_start = sym.st_value;
 
-               if (self->adjust_symbols) {
-                       if (verbose >= 2)
-                               printf("adjusting symbol: st_value: %Lx sh_addr: %Lx sh_offset: %Lx\n",
-                                       (u64)sym.st_value, (u64)shdr.sh_addr, (u64)shdr.sh_offset);
+               if (kernel || kmodule) {
+                       char dso_name[PATH_MAX];
 
-                       sym.st_value -= shdr.sh_addr - shdr.sh_offset;
-               }
+                       if (strcmp(section_name,
+                                  curr_dso->short_name + dso_name_len) == 0)
+                               goto new_symbol;
 
-               if (mod) {
-                       section = mod->sections->find_section(mod->sections, section_name);
-                       if (section)
-                               sym.st_value += section->vma;
-                       else {
-                               fprintf(stderr, "dso__load_sym() module %s lookup of %s failed\n",
-                                       mod->name, section_name);
-                               goto out_elf_end;
+                       if (strcmp(section_name, ".text") == 0) {
+                               curr_map = map;
+                               curr_dso = self;
+                               goto new_symbol;
                        }
+
+                       snprintf(dso_name, sizeof(dso_name),
+                                "%s%s", self->short_name, section_name);
+
+                       curr_map = map_groups__find_by_name(&session->kmaps, map->type, dso_name);
+                       if (curr_map == NULL) {
+                               u64 start = sym.st_value;
+
+                               if (kmodule)
+                                       start += map->start + shdr.sh_offset;
+
+                               curr_dso = dso__new(dso_name);
+                               if (curr_dso == NULL)
+                                       goto out_elf_end;
+                               curr_map = map__new2(start, curr_dso,
+                                                    MAP__FUNCTION);
+                               if (curr_map == NULL) {
+                                       dso__delete(curr_dso);
+                                       goto out_elf_end;
+                               }
+                               curr_map->map_ip = identity__map_ip;
+                               curr_map->unmap_ip = identity__map_ip;
+                               curr_dso->origin = DSO__ORIG_KERNEL;
+                               map_groups__insert(&session->kmaps, curr_map);
+                               dsos__add(&dsos__kernel, curr_dso);
+                       } else
+                               curr_dso = curr_map->dso;
+
+                       goto new_symbol;
+               }
+
+               if (curr_dso->adjust_symbols) {
+                       pr_debug2("adjusting symbol: st_value: %Lx sh_addr: "
+                                 "%Lx sh_offset: %Lx\n", (u64)sym.st_value,
+                                 (u64)shdr.sh_addr, (u64)shdr.sh_offset);
+                       sym.st_value -= shdr.sh_addr - shdr.sh_offset;
                }
                /*
                 * We need to figure out if the object was created from C++ sources
                 * DWARF DW_compile_unit has this, but we don't always have access
                 * to it...
                 */
-               name = elf_sym__name(&sym, symstrs);
-               demangled = bfd_demangle(NULL, name, DMGL_PARAMS | DMGL_ANSI);
+               demangled = bfd_demangle(NULL, elf_name, DMGL_PARAMS | DMGL_ANSI);
                if (demangled != NULL)
-                       name = demangled;
-
-               f = symbol__new(sym.st_value, sym.st_size, name,
-                               self->sym_priv_size, obj_start, verbose);
+                       elf_name = demangled;
+new_symbol:
+               f = symbol__new(sym.st_value, sym.st_size, elf_name);
                free(demangled);
                if (!f)
                        goto out_elf_end;
 
-               if (filter && filter(self, f))
-                       symbol__delete(f, self->sym_priv_size);
+               if (filter && filter(curr_map, f))
+                       symbol__delete(f);
                else {
-                       f->module = mod;
-                       dso__insert_symbol(self, f);
+                       symbols__insert(&curr_dso->symbols[curr_map->type], f);
                        nr++;
                }
        }
 
+       /*
+        * For misannotated, zeroed, ASM function sizes.
+        */
+       if (nr > 0)
+               symbols__fixup_end(&self->symbols[map->type]);
        err = nr;
 out_elf_end:
        elf_end(elf);
@@ -661,114 +1068,259 @@ out_close:
        return err;
 }
 
-#define BUILD_ID_SIZE 128
+static bool dso__build_id_equal(const struct dso *self, u8 *build_id)
+{
+       return memcmp(self->build_id, build_id, sizeof(self->build_id)) == 0;
+}
 
-static char *dso__read_build_id(struct dso *self, int verbose)
+static bool __dsos__read_build_ids(struct list_head *head)
 {
-       int i;
+       bool have_build_id = false;
+       struct dso *pos;
+
+       list_for_each_entry(pos, head, node)
+               if (filename__read_build_id(pos->long_name, pos->build_id,
+                                           sizeof(pos->build_id)) > 0) {
+                       have_build_id     = true;
+                       pos->has_build_id = true;
+               }
+
+       return have_build_id;
+}
+
+bool dsos__read_build_ids(void)
+{
+       bool kbuildids = __dsos__read_build_ids(&dsos__kernel),
+            ubuildids = __dsos__read_build_ids(&dsos__user);
+       return kbuildids || ubuildids;
+}
+
+/*
+ * Align offset to 4 bytes as needed for note name and descriptor data.
+ */
+#define NOTE_ALIGN(n) (((n) + 3) & -4U)
+
+int filename__read_build_id(const char *filename, void *bf, size_t size)
+{
+       int fd, err = -1;
        GElf_Ehdr ehdr;
        GElf_Shdr shdr;
-       Elf_Data *build_id_data;
+       Elf_Data *data;
        Elf_Scn *sec;
-       char *build_id = NULL, *bid;
-       unsigned char *raw;
+       Elf_Kind ek;
+       void *ptr;
        Elf *elf;
-       int fd = open(self->name, O_RDONLY);
 
+       if (size < BUILD_ID_SIZE)
+               goto out;
+
+       fd = open(filename, O_RDONLY);
        if (fd < 0)
                goto out;
 
-       elf = elf_begin(fd, ELF_C_READ_MMAP, NULL);
+       elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL);
        if (elf == NULL) {
-               if (verbose)
-                       fprintf(stderr, "%s: cannot read %s ELF file.\n",
-                               __func__, self->name);
+               pr_debug2("%s: cannot read %s ELF file.\n", __func__, filename);
                goto out_close;
        }
 
+       ek = elf_kind(elf);
+       if (ek != ELF_K_ELF)
+               goto out_elf_end;
+
        if (gelf_getehdr(elf, &ehdr) == NULL) {
-               if (verbose)
-                       fprintf(stderr, "%s: cannot get elf header.\n", __func__);
+               pr_err("%s: cannot get elf header.\n", __func__);
                goto out_elf_end;
        }
 
-       sec = elf_section_by_name(elf, &ehdr, &shdr, ".note.gnu.build-id", NULL);
-       if (sec == NULL)
-               goto out_elf_end;
+       sec = elf_section_by_name(elf, &ehdr, &shdr,
+                                 ".note.gnu.build-id", NULL);
+       if (sec == NULL) {
+               sec = elf_section_by_name(elf, &ehdr, &shdr,
+                                         ".notes", NULL);
+               if (sec == NULL)
+                       goto out_elf_end;
+       }
 
-       build_id_data = elf_getdata(sec, NULL);
-       if (build_id_data == NULL)
+       data = elf_getdata(sec, NULL);
+       if (data == NULL)
                goto out_elf_end;
-       build_id = malloc(BUILD_ID_SIZE);
-       if (build_id == NULL)
-               goto out_elf_end;
-       raw = build_id_data->d_buf + 16;
-       bid = build_id;
 
-       for (i = 0; i < 20; ++i) {
-               sprintf(bid, "%02x", *raw);
-               ++raw;
-               bid += 2;
+       ptr = data->d_buf;
+       while (ptr < (data->d_buf + data->d_size)) {
+               GElf_Nhdr *nhdr = ptr;
+               int namesz = NOTE_ALIGN(nhdr->n_namesz),
+                   descsz = NOTE_ALIGN(nhdr->n_descsz);
+               const char *name;
+
+               ptr += sizeof(*nhdr);
+               name = ptr;
+               ptr += namesz;
+               if (nhdr->n_type == NT_GNU_BUILD_ID &&
+                   nhdr->n_namesz == sizeof("GNU")) {
+                       if (memcmp(name, "GNU", sizeof("GNU")) == 0) {
+                               memcpy(bf, ptr, BUILD_ID_SIZE);
+                               err = BUILD_ID_SIZE;
+                               break;
+                       }
+               }
+               ptr += descsz;
        }
-       if (verbose)
-               printf("%s(%s): %s\n", __func__, self->name, build_id);
 out_elf_end:
        elf_end(elf);
 out_close:
        close(fd);
 out:
-       return build_id;
+       return err;
+}
+
+int sysfs__read_build_id(const char *filename, void *build_id, size_t size)
+{
+       int fd, err = -1;
+
+       if (size < BUILD_ID_SIZE)
+               goto out;
+
+       fd = open(filename, O_RDONLY);
+       if (fd < 0)
+               goto out;
+
+       while (1) {
+               char bf[BUFSIZ];
+               GElf_Nhdr nhdr;
+               int namesz, descsz;
+
+               if (read(fd, &nhdr, sizeof(nhdr)) != sizeof(nhdr))
+                       break;
+
+               namesz = NOTE_ALIGN(nhdr.n_namesz);
+               descsz = NOTE_ALIGN(nhdr.n_descsz);
+               if (nhdr.n_type == NT_GNU_BUILD_ID &&
+                   nhdr.n_namesz == sizeof("GNU")) {
+                       if (read(fd, bf, namesz) != namesz)
+                               break;
+                       if (memcmp(bf, "GNU", sizeof("GNU")) == 0) {
+                               if (read(fd, build_id,
+                                   BUILD_ID_SIZE) == BUILD_ID_SIZE) {
+                                       err = 0;
+                                       break;
+                               }
+                       } else if (read(fd, bf, descsz) != descsz)
+                               break;
+               } else {
+                       int n = namesz + descsz;
+                       if (read(fd, bf, n) != n)
+                               break;
+               }
+       }
+       close(fd);
+out:
+       return err;
+}
+
+char dso__symtab_origin(const struct dso *self)
+{
+       static const char origin[] = {
+               [DSO__ORIG_KERNEL] =   'k',
+               [DSO__ORIG_JAVA_JIT] = 'j',
+               [DSO__ORIG_BUILD_ID_CACHE] = 'B',
+               [DSO__ORIG_FEDORA] =   'f',
+               [DSO__ORIG_UBUNTU] =   'u',
+               [DSO__ORIG_BUILDID] =  'b',
+               [DSO__ORIG_DSO] =      'd',
+               [DSO__ORIG_KMODULE] =  'K',
+       };
+
+       if (self == NULL || self->origin == DSO__ORIG_NOT_FOUND)
+               return '!';
+       return origin[self->origin];
 }
 
-int dso__load(struct dso *self, symbol_filter_t filter, int verbose)
+int dso__load(struct dso *self, struct map *map, struct perf_session *session,
+             symbol_filter_t filter)
 {
        int size = PATH_MAX;
-       char *name = malloc(size), *build_id = NULL;
-       int variant = 0;
+       char *name;
+       u8 build_id[BUILD_ID_SIZE];
+       char build_id_hex[BUILD_ID_SIZE * 2 + 1];
        int ret = -1;
        int fd;
 
+       dso__set_loaded(self, map->type);
+
+       if (self->kernel)
+               return dso__load_kernel_sym(self, map, session, filter);
+
+       name = malloc(size);
        if (!name)
                return -1;
 
        self->adjust_symbols = 0;
 
-       if (strncmp(self->name, "/tmp/perf-", 10) == 0)
-               return dso__load_perf_map(self, filter, verbose);
+       if (strncmp(self->name, "/tmp/perf-", 10) == 0) {
+               ret = dso__load_perf_map(self, map, filter);
+               self->origin = ret > 0 ? DSO__ORIG_JAVA_JIT :
+                                        DSO__ORIG_NOT_FOUND;
+               return ret;
+       }
+
+       self->origin = DSO__ORIG_BUILD_ID_CACHE;
 
+       if (self->has_build_id) {
+               build_id__sprintf(self->build_id, sizeof(self->build_id),
+                                 build_id_hex);
+               snprintf(name, size, "%s/%s/.build-id/%.2s/%s",
+                        getenv("HOME"), DEBUG_CACHE_DIR,
+                        build_id_hex, build_id_hex + 2);
+               goto open_file;
+       }
 more:
        do {
-               switch (variant) {
-               case 0: /* Fedora */
-                       snprintf(name, size, "/usr/lib/debug%s.debug", self->name);
+               self->origin++;
+               switch (self->origin) {
+               case DSO__ORIG_FEDORA:
+                       snprintf(name, size, "/usr/lib/debug%s.debug",
+                                self->long_name);
                        break;
-               case 1: /* Ubuntu */
-                       snprintf(name, size, "/usr/lib/debug%s", self->name);
+               case DSO__ORIG_UBUNTU:
+                       snprintf(name, size, "/usr/lib/debug%s",
+                                self->long_name);
                        break;
-               case 2:
-                       build_id = dso__read_build_id(self, verbose);
-                       if (build_id != NULL) {
+               case DSO__ORIG_BUILDID:
+                       if (filename__read_build_id(self->long_name, build_id,
+                                                   sizeof(build_id))) {
+                               build_id__sprintf(build_id, sizeof(build_id),
+                                                 build_id_hex);
                                snprintf(name, size,
                                         "/usr/lib/debug/.build-id/%.2s/%s.debug",
-                                       build_id, build_id + 2);
-                               free(build_id);
+                                       build_id_hex, build_id_hex + 2);
+                               if (self->has_build_id)
+                                       goto compare_build_id;
                                break;
                        }
-                       variant++;
+                       self->origin++;
                        /* Fall thru */
-               case 3: /* Sane people */
-                       snprintf(name, size, "%s", self->name);
+               case DSO__ORIG_DSO:
+                       snprintf(name, size, "%s", self->long_name);
                        break;
 
                default:
                        goto out;
                }
-               variant++;
 
+               if (self->has_build_id) {
+                       if (filename__read_build_id(name, build_id,
+                                                   sizeof(build_id)) < 0)
+                               goto more;
+compare_build_id:
+                       if (!dso__build_id_equal(self, build_id))
+                               goto more;
+               }
+open_file:
                fd = open(name, O_RDONLY);
        } while (fd < 0);
 
-       ret = dso__load_sym(self, fd, name, filter, verbose, NULL);
+       ret = dso__load_sym(self, map, NULL, name, fd, filter, 0, 0);
        close(fd);
 
        /*
@@ -778,131 +1330,606 @@ more:
                goto more;
 
        if (ret > 0) {
-               int nr_plt = dso__synthesize_plt_symbols(self, verbose);
+               int nr_plt = dso__synthesize_plt_symbols(self, map, filter);
                if (nr_plt > 0)
                        ret += nr_plt;
        }
 out:
        free(name);
+       if (ret < 0 && strstr(self->name, " (deleted)") != NULL)
+               return 0;
        return ret;
 }
 
-static int dso__load_module(struct dso *self, struct mod_dso *mods, const char *name,
-                            symbol_filter_t filter, int verbose)
+struct map *map_groups__find_by_name(struct map_groups *self,
+                                    enum map_type type, const char *name)
+{
+       struct rb_node *nd;
+
+       for (nd = rb_first(&self->maps[type]); nd; nd = rb_next(nd)) {
+               struct map *map = rb_entry(nd, struct map, rb_node);
+
+               if (map->dso && strcmp(map->dso->short_name, name) == 0)
+                       return map;
+       }
+
+       return NULL;
+}
+
+static int dso__kernel_module_get_build_id(struct dso *self)
+{
+       char filename[PATH_MAX];
+       /*
+        * kernel module short names are of the form "[module]" and
+        * we need just "module" here.
+        */
+       const char *name = self->short_name + 1;
+
+       snprintf(filename, sizeof(filename),
+                "/sys/module/%.*s/notes/.note.gnu.build-id",
+                (int)strlen(name - 1), name);
+
+       if (sysfs__read_build_id(filename, self->build_id,
+                                sizeof(self->build_id)) == 0)
+               self->has_build_id = true;
+
+       return 0;
+}
+
+static int perf_session__set_modules_path_dir(struct perf_session *self, char *dirname)
+{
+       struct dirent *dent;
+       DIR *dir = opendir(dirname);
+
+       if (!dir) {
+               pr_debug("%s: cannot open %s dir\n", __func__, dirname);
+               return -1;
+       }
+
+       while ((dent = readdir(dir)) != NULL) {
+               char path[PATH_MAX];
+
+               if (dent->d_type == DT_DIR) {
+                       if (!strcmp(dent->d_name, ".") ||
+                           !strcmp(dent->d_name, ".."))
+                               continue;
+
+                       snprintf(path, sizeof(path), "%s/%s",
+                                dirname, dent->d_name);
+                       if (perf_session__set_modules_path_dir(self, path) < 0)
+                               goto failure;
+               } else {
+                       char *dot = strrchr(dent->d_name, '.'),
+                            dso_name[PATH_MAX];
+                       struct map *map;
+                       char *long_name;
+
+                       if (dot == NULL || strcmp(dot, ".ko"))
+                               continue;
+                       snprintf(dso_name, sizeof(dso_name), "[%.*s]",
+                                (int)(dot - dent->d_name), dent->d_name);
+
+                       strxfrchar(dso_name, '-', '_');
+                       map = map_groups__find_by_name(&self->kmaps, MAP__FUNCTION, dso_name);
+                       if (map == NULL)
+                               continue;
+
+                       snprintf(path, sizeof(path), "%s/%s",
+                                dirname, dent->d_name);
+
+                       long_name = strdup(path);
+                       if (long_name == NULL)
+                               goto failure;
+                       dso__set_long_name(map->dso, long_name);
+                       dso__kernel_module_get_build_id(map->dso);
+               }
+       }
+
+       return 0;
+failure:
+       closedir(dir);
+       return -1;
+}
+
+static int perf_session__set_modules_path(struct perf_session *self)
+{
+       struct utsname uts;
+       char modules_path[PATH_MAX];
+
+       if (uname(&uts) < 0)
+               return -1;
+
+       snprintf(modules_path, sizeof(modules_path), "/lib/modules/%s/kernel",
+                uts.release);
+
+       return perf_session__set_modules_path_dir(self, modules_path);
+}
+
+/*
+ * Constructor variant for modules (where we know from /proc/modules where
+ * they are loaded) and for vmlinux, where only after we load all the
+ * symbols we'll know where it starts and ends.
+ */
+static struct map *map__new2(u64 start, struct dso *dso, enum map_type type)
+{
+       struct map *self = malloc(sizeof(*self));
+
+       if (self != NULL) {
+               /*
+                * ->end will be filled after we load all the symbols
+                */
+               map__init(self, type, start, 0, 0, dso);
+       }
+
+       return self;
+}
+
+struct map *perf_session__new_module_map(struct perf_session *self, u64 start,
+                                        const char *filename)
+{
+       struct map *map;
+       struct dso *dso = __dsos__findnew(&dsos__kernel, filename);
+
+       if (dso == NULL)
+               return NULL;
+
+       map = map__new2(start, dso, MAP__FUNCTION);
+       if (map == NULL)
+               return NULL;
+
+       dso->origin = DSO__ORIG_KMODULE;
+       map_groups__insert(&self->kmaps, map);
+       return map;
+}
+
+static int perf_session__create_module_maps(struct perf_session *self)
+{
+       char *line = NULL;
+       size_t n;
+       FILE *file = fopen("/proc/modules", "r");
+       struct map *map;
+
+       if (file == NULL)
+               return -1;
+
+       while (!feof(file)) {
+               char name[PATH_MAX];
+               u64 start;
+               char *sep;
+               int line_len;
+
+               line_len = getline(&line, &n, file);
+               if (line_len < 0)
+                       break;
+
+               if (!line)
+                       goto out_failure;
+
+               line[--line_len] = '\0'; /* \n */
+
+               sep = strrchr(line, 'x');
+               if (sep == NULL)
+                       continue;
+
+               hex2u64(sep + 1, &start);
+
+               sep = strchr(line, ' ');
+               if (sep == NULL)
+                       continue;
+
+               *sep = '\0';
+
+               snprintf(name, sizeof(name), "[%s]", line);
+               map = perf_session__new_module_map(self, start, name);
+               if (map == NULL)
+                       goto out_delete_line;
+               dso__kernel_module_get_build_id(map->dso);
+       }
+
+       free(line);
+       fclose(file);
+
+       return perf_session__set_modules_path(self);
+
+out_delete_line:
+       free(line);
+out_failure:
+       return -1;
+}
+
+static int dso__load_vmlinux(struct dso *self, struct map *map,
+                            struct perf_session *session,
+                            const char *vmlinux, symbol_filter_t filter)
 {
-       struct module *mod = mod_dso__find_module(mods, name);
-       int err = 0, fd;
+       int err = -1, fd;
 
-       if (mod == NULL || !mod->active)
-               return err;
+       if (self->has_build_id) {
+               u8 build_id[BUILD_ID_SIZE];
 
-       fd = open(mod->path, O_RDONLY);
+               if (filename__read_build_id(vmlinux, build_id,
+                                           sizeof(build_id)) < 0) {
+                       pr_debug("No build_id in %s, ignoring it\n", vmlinux);
+                       return -1;
+               }
+               if (!dso__build_id_equal(self, build_id)) {
+                       char expected_build_id[BUILD_ID_SIZE * 2 + 1],
+                            vmlinux_build_id[BUILD_ID_SIZE * 2 + 1];
+
+                       build_id__sprintf(self->build_id,
+                                         sizeof(self->build_id),
+                                         expected_build_id);
+                       build_id__sprintf(build_id, sizeof(build_id),
+                                         vmlinux_build_id);
+                       pr_debug("build_id in %s is %s while expected is %s, "
+                                "ignoring it\n", vmlinux, vmlinux_build_id,
+                                expected_build_id);
+                       return -1;
+               }
+       }
 
+       fd = open(vmlinux, O_RDONLY);
        if (fd < 0)
-               return err;
+               return -1;
 
-       err = dso__load_sym(self, fd, name, filter, verbose, mod);
+       dso__set_loaded(self, map->type);
+       err = dso__load_sym(self, map, session, vmlinux, fd, filter, 1, 0);
        close(fd);
 
        return err;
 }
 
-int dso__load_modules(struct dso *self, symbol_filter_t filter, int verbose)
+static int dso__load_kernel_sym(struct dso *self, struct map *map,
+                               struct perf_session *session, symbol_filter_t filter)
 {
-       struct mod_dso *mods = mod_dso__new_dso("modules");
-       struct module *pos;
-       struct rb_node *next;
        int err;
+       const char *kallsyms_filename = NULL;
+       char *kallsyms_allocated_filename = NULL;
+       /*
+        * Step 1: if the user specified a vmlinux filename, use it and only
+        * it, reporting errors to the user if it cannot be used.
+        *
+        * For instance, try to analyse an ARM perf.data file _without_ a
+        * build-id, or if the user specifies the wrong path to the right
+        * vmlinux file, obviously we can't fallback to another vmlinux (a
+        * x86_86 one, on the machine where analysis is being performed, say),
+        * or worse, /proc/kallsyms.
+        *
+        * If the specified file _has_ a build-id and there is a build-id
+        * section in the perf.data file, we will still do the expected
+        * validation in dso__load_vmlinux and will bail out if they don't
+        * match.
+        */
+       if (symbol_conf.vmlinux_name != NULL) {
+               err = dso__load_vmlinux(self, map, session,
+                                       symbol_conf.vmlinux_name, filter);
+               goto out_try_fixup;
+       }
 
-       err = mod_dso__load_modules(mods);
-
-       if (err <= 0)
-               return err;
+       if (vmlinux_path != NULL) {
+               int i;
+               pr_debug("Looking at the vmlinux_path (%d entries long)\n",
+                        vmlinux_path__nr_entries);
+               for (i = 0; i < vmlinux_path__nr_entries; ++i) {
+                       err = dso__load_vmlinux(self, map, session,
+                                               vmlinux_path[i], filter);
+                       if (err > 0) {
+                               pr_debug("Using %s for symbols\n",
+                                        vmlinux_path[i]);
+                               dso__set_long_name(self,
+                                                  strdup(vmlinux_path[i]));
+                               goto out_fixup;
+                       }
+               }
+       }
 
        /*
-        * Iterate over modules, and load active symbols.
+        * Say the kernel DSO was created when processing the build-id header table,
+        * we have a build-id, so check if it is the same as the running kernel,
+        * using it if it is.
         */
-       next = rb_first(&mods->mods);
-       while (next) {
-               pos = rb_entry(next, struct module, rb_node);
-               err = dso__load_module(self, mods, pos->name, filter, verbose);
+       if (self->has_build_id) {
+               u8 kallsyms_build_id[BUILD_ID_SIZE];
+               char sbuild_id[BUILD_ID_SIZE * 2 + 1];
+
+               if (sysfs__read_build_id("/sys/kernel/notes", kallsyms_build_id,
+                                        sizeof(kallsyms_build_id)) == 0) {
+                       if (dso__build_id_equal(self, kallsyms_build_id)) {
+                               kallsyms_filename = "/proc/kallsyms";
+                               goto do_kallsyms;
+                       }
+               }
+               /*
+                * Now look if we have it on the build-id cache in
+                * $HOME/.debug/[kernel.kallsyms].
+                */
+               build_id__sprintf(self->build_id, sizeof(self->build_id),
+                                 sbuild_id);
 
-               if (err < 0)
-                       break;
+               if (asprintf(&kallsyms_allocated_filename,
+                            "%s/.debug/[kernel.kallsyms]/%s",
+                            getenv("HOME"), sbuild_id) == -1)
+                       return -1;
 
-               next = rb_next(&pos->rb_node);
+               if (access(kallsyms_filename, F_OK)) {
+                       free(kallsyms_allocated_filename);
+                       return -1;
+               }
+
+               kallsyms_filename = kallsyms_allocated_filename;
+       } else {
+               /*
+                * Last resort, if we don't have a build-id and couldn't find
+                * any vmlinux file, try the running kernel kallsyms table.
+                */
+               kallsyms_filename = "/proc/kallsyms";
        }
 
-       if (err < 0) {
-               mod_dso__delete_modules(mods);
-               mod_dso__delete_self(mods);
+do_kallsyms:
+       err = dso__load_kallsyms(self, kallsyms_filename, map, session, filter);
+       free(kallsyms_allocated_filename);
+
+out_try_fixup:
+       if (err > 0) {
+out_fixup:
+               if (kallsyms_filename != NULL)
+                       dso__set_long_name(self, strdup("[kernel.kallsyms]"));
+               map__fixup_start(map);
+               map__fixup_end(map);
        }
 
        return err;
 }
 
-static inline void dso__fill_symbol_holes(struct dso *self)
+LIST_HEAD(dsos__user);
+LIST_HEAD(dsos__kernel);
+struct dso *vdso;
+
+static void dsos__add(struct list_head *head, struct dso *dso)
 {
-       struct symbol *prev = NULL;
-       struct rb_node *nd;
+       list_add_tail(&dso->node, head);
+}
 
-       for (nd = rb_last(&self->syms); nd; nd = rb_prev(nd)) {
-               struct symbol *pos = rb_entry(nd, struct symbol, rb_node);
+static struct dso *dsos__find(struct list_head *head, const char *name)
+{
+       struct dso *pos;
 
-               if (prev) {
-                       u64 hole = 0;
-                       int alias = pos->start == prev->start;
+       list_for_each_entry(pos, head, node)
+               if (strcmp(pos->long_name, name) == 0)
+                       return pos;
+       return NULL;
+}
 
-                       if (!alias)
-                               hole = prev->start - pos->end - 1;
+struct dso *__dsos__findnew(struct list_head *head, const char *name)
+{
+       struct dso *dso = dsos__find(head, name);
 
-                       if (hole || alias) {
-                               if (alias)
-                                       pos->end = prev->end;
-                               else if (hole)
-                                       pos->end = prev->start - 1;
-                       }
+       if (!dso) {
+               dso = dso__new(name);
+               if (dso != NULL) {
+                       dsos__add(head, dso);
+                       dso__set_basename(dso);
                }
-               prev = pos;
        }
+
+       return dso;
 }
 
-static int dso__load_vmlinux(struct dso *self, const char *vmlinux,
-                            symbol_filter_t filter, int verbose)
+static void __dsos__fprintf(struct list_head *head, FILE *fp)
 {
-       int err, fd = open(vmlinux, O_RDONLY);
+       struct dso *pos;
 
-       if (fd < 0)
-               return -1;
+       list_for_each_entry(pos, head, node) {
+               int i;
+               for (i = 0; i < MAP__NR_TYPES; ++i)
+                       dso__fprintf(pos, i, fp);
+       }
+}
 
-       err = dso__load_sym(self, fd, vmlinux, filter, verbose, NULL);
+void dsos__fprintf(FILE *fp)
+{
+       __dsos__fprintf(&dsos__kernel, fp);
+       __dsos__fprintf(&dsos__user, fp);
+}
 
-       if (err > 0)
-               dso__fill_symbol_holes(self);
+static size_t __dsos__fprintf_buildid(struct list_head *head, FILE *fp,
+                                     bool with_hits)
+{
+       struct dso *pos;
+       size_t ret = 0;
 
-       close(fd);
+       list_for_each_entry(pos, head, node) {
+               if (with_hits && !pos->hit)
+                       continue;
+               ret += dso__fprintf_buildid(pos, fp);
+               ret += fprintf(fp, " %s\n", pos->long_name);
+       }
+       return ret;
+}
 
-       return err;
+size_t dsos__fprintf_buildid(FILE *fp, bool with_hits)
+{
+       return (__dsos__fprintf_buildid(&dsos__kernel, fp, with_hits) +
+               __dsos__fprintf_buildid(&dsos__user, fp, with_hits));
 }
 
-int dso__load_kernel(struct dso *self, const char *vmlinux,
-                    symbol_filter_t filter, int verbose, int modules)
+static struct dso *dsos__create_kernel(const char *vmlinux)
 {
-       int err = -1;
+       struct dso *kernel = dso__new(vmlinux ?: "[kernel.kallsyms]");
+
+       if (kernel == NULL)
+               return NULL;
+
+       kernel->short_name = "[kernel]";
+       kernel->kernel     = 1;
+
+       vdso = dso__new("[vdso]");
+       if (vdso == NULL)
+               goto out_delete_kernel_dso;
+       dso__set_loaded(vdso, MAP__FUNCTION);
 
-       if (vmlinux) {
-               err = dso__load_vmlinux(self, vmlinux, filter, verbose);
-               if (err > 0 && modules)
-                       err = dso__load_modules(self, filter, verbose);
+       if (sysfs__read_build_id("/sys/kernel/notes", kernel->build_id,
+                                sizeof(kernel->build_id)) == 0)
+               kernel->has_build_id = true;
+
+       dsos__add(&dsos__kernel, kernel);
+       dsos__add(&dsos__user, vdso);
+
+       return kernel;
+
+out_delete_kernel_dso:
+       dso__delete(kernel);
+       return NULL;
+}
+
+int __map_groups__create_kernel_maps(struct map_groups *self,
+                                    struct map *vmlinux_maps[MAP__NR_TYPES],
+                                    struct dso *kernel)
+{
+       enum map_type type;
+
+       for (type = 0; type < MAP__NR_TYPES; ++type) {
+               vmlinux_maps[type] = map__new2(0, kernel, type);
+               if (vmlinux_maps[type] == NULL)
+                       return -1;
+
+               vmlinux_maps[type]->map_ip =
+                       vmlinux_maps[type]->unmap_ip = identity__map_ip;
+               map_groups__insert(self, vmlinux_maps[type]);
        }
 
-       if (err <= 0)
-               err = dso__load_kallsyms(self, filter, verbose);
+       return 0;
+}
 
-       return err;
+static int map_groups__create_kernel_maps(struct map_groups *self,
+                                         struct map *vmlinux_maps[MAP__NR_TYPES],
+                                         const char *vmlinux)
+{
+       struct dso *kernel = dsos__create_kernel(vmlinux);
+
+       if (kernel == NULL)
+               return -1;
+
+       return __map_groups__create_kernel_maps(self, vmlinux_maps, kernel);
 }
 
-void symbol__init(void)
+static void vmlinux_path__exit(void)
+{
+       while (--vmlinux_path__nr_entries >= 0) {
+               free(vmlinux_path[vmlinux_path__nr_entries]);
+               vmlinux_path[vmlinux_path__nr_entries] = NULL;
+       }
+
+       free(vmlinux_path);
+       vmlinux_path = NULL;
+}
+
+static int vmlinux_path__init(void)
+{
+       struct utsname uts;
+       char bf[PATH_MAX];
+
+       if (uname(&uts) < 0)
+               return -1;
+
+       vmlinux_path = malloc(sizeof(char *) * 5);
+       if (vmlinux_path == NULL)
+               return -1;
+
+       vmlinux_path[vmlinux_path__nr_entries] = strdup("vmlinux");
+       if (vmlinux_path[vmlinux_path__nr_entries] == NULL)
+               goto out_fail;
+       ++vmlinux_path__nr_entries;
+       vmlinux_path[vmlinux_path__nr_entries] = strdup("/boot/vmlinux");
+       if (vmlinux_path[vmlinux_path__nr_entries] == NULL)
+               goto out_fail;
+       ++vmlinux_path__nr_entries;
+       snprintf(bf, sizeof(bf), "/boot/vmlinux-%s", uts.release);
+       vmlinux_path[vmlinux_path__nr_entries] = strdup(bf);
+       if (vmlinux_path[vmlinux_path__nr_entries] == NULL)
+               goto out_fail;
+       ++vmlinux_path__nr_entries;
+       snprintf(bf, sizeof(bf), "/lib/modules/%s/build/vmlinux", uts.release);
+       vmlinux_path[vmlinux_path__nr_entries] = strdup(bf);
+       if (vmlinux_path[vmlinux_path__nr_entries] == NULL)
+               goto out_fail;
+       ++vmlinux_path__nr_entries;
+       snprintf(bf, sizeof(bf), "/usr/lib/debug/lib/modules/%s/vmlinux",
+                uts.release);
+       vmlinux_path[vmlinux_path__nr_entries] = strdup(bf);
+       if (vmlinux_path[vmlinux_path__nr_entries] == NULL)
+               goto out_fail;
+       ++vmlinux_path__nr_entries;
+
+       return 0;
+
+out_fail:
+       vmlinux_path__exit();
+       return -1;
+}
+
+static int setup_list(struct strlist **list, const char *list_str,
+                     const char *list_name)
+{
+       if (list_str == NULL)
+               return 0;
+
+       *list = strlist__new(true, list_str);
+       if (!*list) {
+               pr_err("problems parsing %s list\n", list_name);
+               return -1;
+       }
+       return 0;
+}
+
+int symbol__init(void)
 {
        elf_version(EV_CURRENT);
+       if (symbol_conf.sort_by_name)
+               symbol_conf.priv_size += (sizeof(struct symbol_name_rb_node) -
+                                         sizeof(struct symbol));
+
+       if (symbol_conf.try_vmlinux_path && vmlinux_path__init() < 0)
+               return -1;
+
+       if (symbol_conf.field_sep && *symbol_conf.field_sep == '.') {
+               pr_err("'.' is the only non valid --field-separator argument\n");
+               return -1;
+       }
+
+       if (setup_list(&symbol_conf.dso_list,
+                      symbol_conf.dso_list_str, "dso") < 0)
+               return -1;
+
+       if (setup_list(&symbol_conf.comm_list,
+                      symbol_conf.comm_list_str, "comm") < 0)
+               goto out_free_dso_list;
+
+       if (setup_list(&symbol_conf.sym_list,
+                      symbol_conf.sym_list_str, "symbol") < 0)
+               goto out_free_comm_list;
+
+       return 0;
+
+out_free_dso_list:
+       strlist__delete(symbol_conf.dso_list);
+out_free_comm_list:
+       strlist__delete(symbol_conf.comm_list);
+       return -1;
+}
+
+int perf_session__create_kernel_maps(struct perf_session *self)
+{
+       if (map_groups__create_kernel_maps(&self->kmaps, self->vmlinux_maps,
+                                          symbol_conf.vmlinux_name) < 0)
+               return -1;
+
+       if (symbol_conf.use_modules &&
+           perf_session__create_module_maps(self) < 0)
+               pr_debug("Failed to load list of modules for session %s, "
+                        "continuing...\n", self->filename);
+       /*
+        * Now that we have all the maps created, just set the ->end of them:
+        */
+       map_groups__fixup_end(&self->kmaps);
+       return 0;
 }