1 files changed, 51 insertions, 46 deletions

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 7821d0e6866f..f06c10f092ba 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -207,8 +207,7 @@ struct dso *dso__new(const char *name)
                 dso__set_short_name(self, 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->symtab_type = SYMTAB__NOT_FOUND;
                 self->loaded = 0;
                 self->sorted_by_name = 0;
                 self->has_build_id = 0;
@@ -681,9 +680,9 @@ int dso__load_kallsyms(struct dso *self, const char *filename,
                 return -1;
 
         if (self->kernel == DSO_TYPE_GUEST_KERNEL)
-                self->origin = DSO__ORIG_GUEST_KERNEL;
+                self->symtab_type = SYMTAB__GUEST_KALLSYMS;
         else
-                self->origin = DSO__ORIG_KERNEL;
+                self->symtab_type = SYMTAB__KALLSYMS;
 
         return dso__split_kallsyms(self, map, filter);
 }
@@ -1197,6 +1196,8 @@ static int dso__load_sym(struct dso *self, struct map *map, const char *name,
                                 if (curr_dso == NULL)
                                         goto out_elf_end;
                                 curr_dso->kernel = self->kernel;
+                                curr_dso->long_name = self->long_name;
+                                curr_dso->long_name_len = self->long_name_len;
                                 curr_map = map__new2(start, curr_dso,
                                                      map->type);
                                 if (curr_map == NULL) {
@@ -1205,7 +1206,7 @@ static int dso__load_sym(struct dso *self, struct map *map, const char *name,
                                 }
                                 curr_map->map_ip = identity__map_ip;
                                 curr_map->unmap_ip = identity__map_ip;
-                                curr_dso->origin = self->origin;
+                                curr_dso->symtab_type = self->symtab_type;
                                 map_groups__insert(kmap->kmaps, curr_map);
                                 dsos__add(&self->node, curr_dso);
                                 dso__set_loaded(curr_dso, map->type);
@@ -1431,21 +1432,21 @@ out:
 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',
-                [DSO__ORIG_GUEST_KERNEL] =  'g',
-                [DSO__ORIG_GUEST_KMODULE] =  'G',
+                [SYMTAB__KALLSYMS]            = 'k',
+                [SYMTAB__JAVA_JIT]            = 'j',
+                [SYMTAB__BUILD_ID_CACHE]      = 'B',
+                [SYMTAB__FEDORA_DEBUGINFO]    = 'f',
+                [SYMTAB__UBUNTU_DEBUGINFO]    = 'u',
+                [SYMTAB__BUILDID_DEBUGINFO]   = 'b',
+                [SYMTAB__SYSTEM_PATH_DSO]     = 'd',
+                [SYMTAB__SYSTEM_PATH_KMODULE] = 'K',
+                [SYMTAB__GUEST_KALLSYMS]      =  'g',
+                [SYMTAB__GUEST_KMODULE]       =  'G',
         };
 
-        if (self == NULL || self->origin == DSO__ORIG_NOT_FOUND)
+        if (self == NULL || self->symtab_type == SYMTAB__NOT_FOUND)
                 return '!';
-        return origin[self->origin];
+        return origin[self->symtab_type];
 }
 
 int dso__load(struct dso *self, struct map *map, symbol_filter_t filter)
@@ -1478,8 +1479,8 @@ int dso__load(struct dso *self, struct map *map, symbol_filter_t filter)
 
         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;
+                self->symtab_type = ret > 0 ? SYMTAB__JAVA_JIT :
+                                              SYMTAB__NOT_FOUND;
                 return ret;
         }
 
@@ -1487,26 +1488,28 @@ int dso__load(struct dso *self, struct map *map, symbol_filter_t filter)
          * On the first pass, only load images if they have a full symtab.
          * Failing that, do a second pass where we accept .dynsym also
          */
-        for (self->origin = DSO__ORIG_BUILD_ID_CACHE, want_symtab = 1;
-             self->origin != DSO__ORIG_NOT_FOUND;
-             self->origin++) {
-                switch (self->origin) {
-                case DSO__ORIG_BUILD_ID_CACHE:
+        want_symtab = 1;
+restart:
+        for (self->symtab_type = SYMTAB__BUILD_ID_CACHE;
+             self->symtab_type != SYMTAB__NOT_FOUND;
+             self->symtab_type++) {
+                switch (self->symtab_type) {
+                case SYMTAB__BUILD_ID_CACHE:
                         /* skip the locally configured cache if a symfs is given */
                         if (symbol_conf.symfs[0] ||
                             (dso__build_id_filename(self, name, size) == NULL)) {
                                 continue;
                         }
                         break;
-                case DSO__ORIG_FEDORA:
+                case SYMTAB__FEDORA_DEBUGINFO:
                         snprintf(name, size, "%s/usr/lib/debug%s.debug",
                                  symbol_conf.symfs, self->long_name);
                         break;
-                case DSO__ORIG_UBUNTU:
+                case SYMTAB__UBUNTU_DEBUGINFO:
                         snprintf(name, size, "%s/usr/lib/debug%s",
                                  symbol_conf.symfs, self->long_name);
                         break;
-                case DSO__ORIG_BUILDID: {
+                case SYMTAB__BUILDID_DEBUGINFO: {
                         char build_id_hex[BUILD_ID_SIZE * 2 + 1];
 
                         if (!self->has_build_id)
@@ -1520,34 +1523,24 @@ int dso__load(struct dso *self, struct map *map, symbol_filter_t filter)
                                  symbol_conf.symfs, build_id_hex, build_id_hex + 2);
                         }
                         break;
-                case DSO__ORIG_DSO:
+                case SYMTAB__SYSTEM_PATH_DSO:
                         snprintf(name, size, "%s%s",
                              symbol_conf.symfs, self->long_name);
                         break;
-                case DSO__ORIG_GUEST_KMODULE:
-                        if (map->groups && map->groups->machine)
-                                root_dir = map->groups->machine->root_dir;
+                case SYMTAB__GUEST_KMODULE:
+                        if (map->groups && machine)
+                                root_dir = machine->root_dir;
                         else
                                 root_dir = "";
                         snprintf(name, size, "%s%s%s", symbol_conf.symfs,
                                  root_dir, self->long_name);
                         break;
 
-                case DSO__ORIG_KMODULE:
+                case SYMTAB__SYSTEM_PATH_KMODULE:
                         snprintf(name, size, "%s%s", symbol_conf.symfs,
                                  self->long_name);
                         break;
-
-                default:
-                        /*
-                         * If we wanted a full symtab but no image had one,
-                         * relax our requirements and repeat the search.
-                         */
-                        if (want_symtab) {
-                                want_symtab = 0;
-                                self->origin = DSO__ORIG_BUILD_ID_CACHE;
-                        } else
-                                continue;
+                default:;
                 }
 
                 /* Name is now the name of the next image to try */
@@ -1574,6 +1567,15 @@ int dso__load(struct dso *self, struct map *map, symbol_filter_t filter)
                 }
         }
 
+        /*
+         * If we wanted a full symtab but no image had one,
+         * relax our requirements and repeat the search.
+         */
+        if (ret <= 0 && want_symtab) {
+                want_symtab = 0;
+                goto restart;
+        }
+
         free(name);
         if (ret < 0 && strstr(self->name, " (deleted)") != NULL)
                 return 0;
@@ -1758,9 +1760,9 @@ struct map *machine__new_module(struct machine *self, u64 start,
                 return NULL;
 
         if (machine__is_host(self))
-                dso->origin = DSO__ORIG_KMODULE;
+                dso->symtab_type = SYMTAB__SYSTEM_PATH_KMODULE;
         else
-                dso->origin = DSO__ORIG_GUEST_KMODULE;
+                dso->symtab_type = SYMTAB__GUEST_KMODULE;
         map_groups__insert(&self->kmaps, map);
         return map;
 }
@@ -1836,12 +1838,13 @@ int dso__load_vmlinux(struct dso *self, struct map *map,
         int err = -1, fd;
         char symfs_vmlinux[PATH_MAX];
 
-        snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s/%s",
+        snprintf(symfs_vmlinux, sizeof(symfs_vmlinux), "%s%s",
                  symbol_conf.symfs, vmlinux);
         fd = open(symfs_vmlinux, O_RDONLY);
         if (fd < 0)
                 return -1;
 
+        dso__set_long_name(self, (char *)vmlinux);
         dso__set_loaded(self, map->type);
         err = dso__load_sym(self, map, symfs_vmlinux, fd, filter, 0, 0);
         close(fd);
@@ -2403,6 +2406,8 @@ int symbol__init(void)
         if (symbol_conf.initialized)
                 return 0;
 
+        symbol_conf.priv_size = ALIGN(symbol_conf.priv_size, sizeof(u64));
+
         elf_version(EV_CURRENT);
         if (symbol_conf.sort_by_name)
                 symbol_conf.priv_size += (sizeof(struct symbol_name_rb_node) -