perf symbols: Remove unrelated actions from dso__load_kernel_sym

It should just load kernel symbols, not load the list of
modules. There are more stuff to move to other routines, but
lets do it in several steps.

End goal is to be able to defer symbol table loading till we
find a hit for that map address range. So that the kernel &
modules are handled just like all the other DSOs in the system.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1258757489-5978-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

3 files changed, 24 insertions, 31 deletions

diff --git a/tools/perf/util/data_map.c b/tools/perf/util/data_map.c
index 5543e7d0487d..a444a2645c85 100644
--- a/tools/perf/util/data_map.c
+++ b/tools/perf/util/data_map.c
@@ -171,7 +171,7 @@ int mmap_dispatch_perf_file(struct perf_header **pheader,
                 goto out_delete;
 
         err = -ENOMEM;
-        if (load_kernel(NULL) < 0) {
+        if (load_kernel(NULL, 1) < 0) {
                 pr_err("failed to load kernel symbols\n");
                 goto out_delete;
         }
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 4d75e745288f..3b23c18cd36b 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -1230,7 +1230,7 @@ failure:
         return -1;
 }
 
-static int dsos__load_modules_sym(symbol_filter_t filter)
+int dsos__load_modules_sym(symbol_filter_t filter)
 {
         struct utsname uts;
         char modules_path[PATH_MAX];
@@ -1352,33 +1352,18 @@ static int dso__load_vmlinux(struct dso *self, struct map *map,
         return err;
 }
 
-int dso__load_kernel_sym(struct dso *self, symbol_filter_t filter, int use_modules)
+int dso__load_kernel_sym(struct dso *self, symbol_filter_t filter,
+                         int use_modules)
 {
-        int err = -1;
+        int err;
 
         kernel_map = map__new2(0, self);
         if (kernel_map == NULL)
-                goto out_delete_dso;
+                return -1;
 
         kernel_map->map_ip = kernel_map->unmap_ip = identity__map_ip;
 
-        if (use_modules && dsos__load_modules() < 0) {
-                pr_warning("Failed to load list of modules in use! "
-                           "Continuing...\n");
-                use_modules = 0;
-        }
-
         err = dso__load_vmlinux(self, kernel_map, self->name, filter);
-        if (err > 0 && use_modules) {
-                int syms = dsos__load_modules_sym(filter);
-
-                if (syms < 0)
-                        pr_warning("Failed to read module symbols!"
-                                   " Continuing...\n");
-                else
-                        err += syms;
-        }
-
         if (err <= 0)
                 err = kernel_maps__load_kallsyms(filter, use_modules);
 
@@ -1404,17 +1389,12 @@ int dso__load_kernel_sym(struct dso *self, symbol_filter_t filter, int use_modul
         }
 
         return err;
-
-out_delete_dso:
-        dso__delete(self);
-        return -1;
 }
 
 LIST_HEAD(dsos);
 struct dso      *vdso;
 
 const char      *vmlinux_name = "vmlinux";
-int             modules;
 
 static void dsos__add(struct dso *dso)
 {
@@ -1488,14 +1468,26 @@ struct dso *dsos__load_kernel(void)
         return kernel;
 }
 
-int load_kernel(symbol_filter_t filter)
+int load_kernel(symbol_filter_t filter, bool use_modules)
 {
         struct dso *kernel = dsos__load_kernel();
 
         if (kernel == NULL)
                 return -1;
 
-        return dso__load_kernel_sym(kernel, filter, modules);
+        if (use_modules) {
+                if (dsos__load_modules() < 0)
+                        pr_warning("Failed to load list of modules in use, "
+                                   "continuing...\n");
+                else if (dsos__load_modules_sym(filter) < 0)
+                        pr_warning("Failed to read module symbols, "
+                                   "continuing...\n");
+        }
+
+        if (dso__load_kernel_sym(kernel, filter, use_modules) < 0)
+                pr_warning("Failed to read kernel symbols, continuing...\n");
+
+        return 0;
 }
 
 void symbol__init(unsigned int priv_size)
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index f0593a649c3d..3d9d346d101b 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -78,9 +78,11 @@ void dso__delete(struct dso *self);
 struct symbol *dso__find_symbol(struct dso *self, u64 ip);
 
 int dsos__load_modules(void);
+int dsos__load_modules_sym(symbol_filter_t filter);
 struct dso *dsos__findnew(const char *name);
 int dso__load(struct dso *self, struct map *map, symbol_filter_t filter);
-int dso__load_kernel_sym(struct dso *self, symbol_filter_t filter, int modules);
+int dso__load_kernel_sym(struct dso *self, symbol_filter_t filter,
+                         int use_modules);
 void dsos__fprintf(FILE *fp);
 size_t dsos__fprintf_buildid(FILE *fp);
 
@@ -95,7 +97,7 @@ bool dsos__read_build_ids(void);
 int build_id__sprintf(u8 *self, int len, char *bf);
 
 struct dso *dsos__load_kernel(void);
-int load_kernel(symbol_filter_t filter);
+int load_kernel(symbol_filter_t filter, bool use_modules);
 
 void symbol__init(unsigned int priv_size);
 
@@ -103,5 +105,4 @@ extern struct list_head dsos;
 extern struct map *kernel_map;
 extern struct dso *vdso;
 extern const char *vmlinux_name;
-extern int   modules;
 #endif /* __PERF_SYMBOL */