1 files changed, 26 insertions, 5 deletions

diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index d75349979e65..1e23a5bfb044 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -6,6 +6,7 @@
 #include <inttypes.h>
 
 #include "symbol.h"
+#include "machine.h"
 #include "vdso.h"
 #include <symbol/kallsyms.h>
 #include "debug.h"
@@ -680,6 +681,11 @@ static u64 ref_reloc(struct kmap *kmap)
         return 0;
 }
 
+static bool want_demangle(bool is_kernel_sym)
+{
+        return is_kernel_sym ? symbol_conf.demangle_kernel : symbol_conf.demangle;
+}
+
 int dso__load_sym(struct dso *dso, struct map *map,
                   struct symsrc *syms_ss, struct symsrc *runtime_ss,
                   symbol_filter_t filter, int kmodule)
@@ -712,6 +718,14 @@ int dso__load_sym(struct dso *dso, struct map *map,
                 symbols__delete(&dso->symbols[map->type]);
 
         if (!syms_ss->symtab) {
+                /*
+                 * If the vmlinux is stripped, fail so we will fall back
+                 * to using kallsyms. The vmlinux runtime symbols aren't
+                 * of much use.
+                 */
+                if (dso->kernel)
+                        goto out_elf_end;
+
                 syms_ss->symtab  = syms_ss->dynsym;
                 syms_ss->symshdr = syms_ss->dynshdr;
         }
@@ -736,7 +750,7 @@ int dso__load_sym(struct dso *dso, struct map *map,
         if (symstrs == NULL)
                 goto out_elf_end;
 
-        sec_strndx = elf_getscn(elf, ehdr.e_shstrndx);
+        sec_strndx = elf_getscn(runtime_ss->elf, runtime_ss->ehdr.e_shstrndx);
         if (sec_strndx == NULL)
                 goto out_elf_end;
 
@@ -916,7 +930,11 @@ int dso__load_sym(struct dso *dso, struct map *map,
                                 }
                                 curr_dso->symtab_type = dso->symtab_type;
                                 map_groups__insert(kmap->kmaps, curr_map);
-                                dsos__add(&dso->node, curr_dso);
+                                /*
+                                 * The new DSO should go to the kernel DSOS
+                                 */
+                                dsos__add(&map->groups->machine->kernel_dsos,
+                                          curr_dso);
                                 dso__set_loaded(curr_dso, map->type);
                         } else
                                 curr_dso = curr_map->dso;
@@ -938,9 +956,12 @@ new_symbol:
                  * DWARF DW_compile_unit has this, but we don't always have access
                  * to it...
                  */
-                if (symbol_conf.demangle) {
-                        demangled = bfd_demangle(NULL, elf_name,
-                                                 DMGL_PARAMS | DMGL_ANSI);
+                if (want_demangle(dso->kernel || kmodule)) {
+                        int demangle_flags = DMGL_NO_OPTS;
+                        if (verbose)
+                                demangle_flags = DMGL_PARAMS | DMGL_ANSI;
+
+                        demangled = bfd_demangle(NULL, elf_name, demangle_flags);
                         if (demangled != NULL)
                                 elf_name = demangled;
                 }