15 files changed, 54 insertions, 80 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 2e2855a685c6..e656e25f1c14 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -51,11 +51,6 @@ struct sym_priv {
         struct sym_ext  *ext;
 };
 
-static struct symbol_conf symbol_conf = {
-        .priv_size        = sizeof(struct sym_priv),
-        .try_vmlinux_path = true,
-};
-
 static const char *sym_hist_filter;
 
 static int symbol_filter(struct map *map __used, struct symbol *sym)
@@ -464,10 +459,10 @@ static struct perf_event_ops event_ops = {
 
 static int __cmd_annotate(void)
 {
-        struct perf_session *session = perf_session__new(input_name, O_RDONLY,
-                                                         force, &symbol_conf);
         int ret;
+        struct perf_session *session;
 
+        session = perf_session__new(input_name, O_RDONLY, force);
         if (session == NULL)
                 return -ENOMEM;
 
@@ -523,7 +518,10 @@ static const struct option options[] = {
 
 int cmd_annotate(int argc, const char **argv, const char *prefix __used)
 {
-        if (symbol__init(&symbol_conf) < 0)
+        symbol_conf.priv_size = sizeof(struct sym_priv);
+        symbol_conf.try_vmlinux_path = true;
+
+        if (symbol__init() < 0)
                 return -1;
 
         argc = parse_options(argc, argv, options, annotate_usage, 0);
diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid-list.c
index 7c36e4b2eccf..e693e6777af5 100644
--- a/tools/perf/builtin-buildid-list.c
+++ b/tools/perf/builtin-buildid-list.c
@@ -54,8 +54,9 @@ static int perf_file_section__process_buildids(struct perf_file_section *self,
 static int __cmd_buildid_list(void)
 {
         int err = -1;
-        struct perf_session *session = perf_session__new(input_name, O_RDONLY,
-                                                         force, NULL);
+        struct perf_session *session;
+
+        session = perf_session__new(input_name, O_RDONLY, force);
         if (session == NULL)
                 return -1;
 
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 0d528018ffb8..67328d106994 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -21,8 +21,6 @@ static char	   const *input_old = "perf.data.old",
 static int         force;
 static bool        show_percent;
 
-struct symbol_conf symbol_conf;
-
 static int perf_session__add_hist_entry(struct perf_session *self,
                                         struct addr_location *al, u64 count)
 {
@@ -226,8 +224,8 @@ static int __cmd_diff(void)
         int ret, i;
         struct perf_session *session[2];
 
-        session[0] = perf_session__new(input_old, O_RDONLY, force, &symbol_conf);
-        session[1] = perf_session__new(input_new, O_RDONLY, force, &symbol_conf);
+        session[0] = perf_session__new(input_old, O_RDONLY, force);
+        session[1] = perf_session__new(input_new, O_RDONLY, force);
         if (session[0] == NULL || session[1] == NULL)
                 return -ENOMEM;
 
@@ -267,7 +265,7 @@ static const struct option options[] = {
 
 int cmd_diff(int argc, const char **argv, const char *prefix __used)
 {
-        if (symbol__init(&symbol_conf) < 0)
+        if (symbol__init() < 0)
                 return -1;
 
         setup_sorting(diff_usage, options);
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index dda60869faad..e078797ab1f1 100644
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -505,8 +505,7 @@ static void sort_result(void)
 static int __cmd_kmem(void)
 {
         int err;
-        struct perf_session *session = perf_session__new(input_name, O_RDONLY,
-                                                         0, NULL);
+        struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0);
         if (session == NULL)
                 return -ENOMEM;
 
@@ -767,7 +766,7 @@ static int __cmd_record(int argc, const char **argv)
 
 int cmd_kmem(int argc, const char **argv, const char *prefix __used)
 {
-        symbol__init(0);
+        symbol__init();
 
         argc = parse_options(argc, argv, kmem_options, kmem_usage, 0);
 
diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 520b064b46d8..7e741f54d798 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -57,7 +57,6 @@ static struct {
         int nr_probe;
         struct probe_point probes[MAX_PROBES];
         struct strlist *dellist;
-        struct symbol_conf conf;
         struct perf_session *psession;
         struct map *kmap;
 } session;
@@ -151,7 +150,7 @@ static const struct option options[] = {
         OPT_BOOLEAN('v', "verbose", &verbose,
                     "be more verbose (show parsed arguments, etc)"),
 #ifndef NO_LIBDWARF
-        OPT_STRING('k', "vmlinux", &session.conf.vmlinux_name,
+        OPT_STRING('k', "vmlinux", &symbol_conf.vmlinux_name,
                    "file", "vmlinux pathname"),
 #endif
         OPT_BOOLEAN('l', "list", &session.list_events,
@@ -224,13 +223,12 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
         }
 
         /* Initialize symbol maps for vmlinux */
-        session.conf.sort_by_name = true;
-        if (session.conf.vmlinux_name == NULL)
-                session.conf.try_vmlinux_path = true;
-        if (symbol__init(&session.conf) < 0)
+        symbol_conf.sort_by_name = true;
+        if (symbol_conf.vmlinux_name == NULL)
+                symbol_conf.try_vmlinux_path = true;
+        if (symbol__init() < 0)
                 die("Failed to init symbol map.");
-        session.psession = perf_session__new(NULL, O_WRONLY, false,
-                                             &session.conf);
+        session.psession = perf_session__new(NULL, O_WRONLY, false);
         if (session.psession == NULL)
                 die("Failed to init perf_session.");
         session.kmap = map_groups__find_by_name(&session.psession->kmaps,
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 66979a5553b8..1da48a8fe9cc 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -451,7 +451,7 @@ static int __cmd_record(int argc, const char **argv)
                 exit(-1);
         }
 
-        session = perf_session__new(output_name, O_WRONLY, force, NULL);
+        session = perf_session__new(output_name, O_WRONLY, force);
         if (session == NULL) {
                 pr_err("Not enough memory for reading perf file header\n");
                 return -1;
@@ -632,7 +632,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)
 {
         int counter;
 
-        symbol__init(0);
+        symbol__init();
 
         argc = parse_options(argc, argv, options, record_usage,
                 PARSE_OPT_STOP_AT_NON_OPTION);
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 40389c0e38c6..c349bdbb9474 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -52,9 +52,6 @@ static int		exclude_other = 1;
 
 static char             callchain_default_opt[] = "fractal,0.5";
 
-static struct symbol_conf       symbol_conf;
-
-
 static size_t
 callchain__fprintf_left_margin(FILE *fp, int left_margin)
 {
@@ -705,7 +702,7 @@ static int __cmd_report(void)
         int ret;
         struct perf_session *session;
 
-        session = perf_session__new(input_name, O_RDONLY, force, &symbol_conf);
+        session = perf_session__new(input_name, O_RDONLY, force);
         if (session == NULL)
                 return -ENOMEM;
 
@@ -864,7 +861,7 @@ static void setup_list(struct strlist **list, const char *list_str,
 
 int cmd_report(int argc, const char **argv, const char *prefix __used)
 {
-        if (symbol__init(&symbol_conf) < 0)
+        if (symbol__init() < 0)
                 return -1;
 
         argc = parse_options(argc, argv, options, report_usage, 0);
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index d67f274adba0..80209df6cfe8 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1675,8 +1675,7 @@ static struct perf_event_ops event_ops = {
 static int read_events(void)
 {
         int err;
-        struct perf_session *session = perf_session__new(input_name, O_RDONLY,
-                                                         0, NULL);
+        struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0);
         if (session == NULL)
                 return -ENOMEM;
 
@@ -1912,7 +1911,7 @@ int cmd_sched(int argc, const char **argv, const char *prefix __used)
         if (!strcmp(argv[0], "trace"))
                 return cmd_trace(argc, argv, prefix);
 
-        symbol__init(0);
+        symbol__init();
         if (!strncmp(argv[0], "rec", 3)) {
                 return __cmd_record(argc, argv);
         } else if (!strncmp(argv[0], "lat", 3)) {
diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index ffd81e87ce69..9c98b7a2b19a 100644
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -1050,8 +1050,7 @@ static struct perf_event_ops event_ops = {
 
 static int __cmd_timechart(void)
 {
-        struct perf_session *session = perf_session__new(input_name, O_RDONLY,
-                                                         0, NULL);
+        struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0);
         int ret;
 
         if (session == NULL)
@@ -1138,7 +1137,7 @@ static const struct option options[] = {
 
 int cmd_timechart(int argc, const char **argv, const char *prefix __used)
 {
-        symbol__init(0);
+        symbol__init();
 
         argc = parse_options(argc, argv, options, timechart_usage,
                         PARSE_OPT_STOP_AT_NON_OPTION);
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
index 296e809c2538..cd89b6d036b7 100644
--- a/tools/perf/builtin-top.c
+++ b/tools/perf/builtin-top.c
@@ -80,7 +80,6 @@ static int			dump_symtab                     =      0;
 static bool                     hide_kernel_symbols             =  false;
 static bool                     hide_user_symbols               =  false;
 static struct winsize           winsize;
-static struct symbol_conf       symbol_conf;
 
 /*
  * Source
@@ -1162,8 +1161,7 @@ static int __cmd_top(void)
          * FIXME: perf_session__new should allow passing a O_MMAP, so that all this
          * mmap reading, etc is encapsulated in it. Use O_WRONLY for now.
          */
-        struct perf_session *session = perf_session__new(NULL, O_WRONLY, false,
-                                                         &symbol_conf);
+        struct perf_session *session = perf_session__new(NULL, O_WRONLY, false);
         if (session == NULL)
                 return -ENOMEM;
 
@@ -1284,7 +1282,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
                                  (nr_counters + 1) * sizeof(unsigned long));
         if (symbol_conf.vmlinux_name == NULL)
                 symbol_conf.try_vmlinux_path = true;
-        if (symbol__init(&symbol_conf) < 0)
+        if (symbol__init() < 0)
                 return -1;
 
         if (delay_secs < 1)
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 7e744f774047..07ad25ca654f 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -579,7 +579,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
                 exit(-1);
         }
 
-        symbol__init(0);
+        symbol__init();
 
         setup_scripting();
 
@@ -588,7 +588,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __used)
 
         setup_pager();
 
-        session = perf_session__new(input_name, O_RDONLY, 0, NULL);
+        session = perf_session__new(input_name, O_RDONLY, 0);
         if (session == NULL)
                 return -ENOMEM;
 
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index ecd54bedfb1c..bceaa09f55a1 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -49,8 +49,7 @@ out_close:
         return -1;
 }
 
-struct perf_session *perf_session__new(const char *filename, int mode,
-                                       bool force, struct symbol_conf *conf)
+struct perf_session *perf_session__new(const char *filename, int mode, bool force)
 {
         size_t len = filename ? strlen(filename) + 1 : 0;
         struct perf_session *self = zalloc(sizeof(*self) + len);
@@ -69,7 +68,7 @@ struct perf_session *perf_session__new(const char *filename, int mode,
         self->cwdlen = 0;
         map_groups__init(&self->kmaps);
 
-        if (perf_session__create_kernel_maps(self, conf) < 0)
+        if (perf_session__create_kernel_maps(self) < 0)
                 goto out_delete;
 
         if (mode == O_RDONLY && perf_session__open(self, force) < 0)
diff --git a/tools/perf/util/session.h b/tools/perf/util/session.h
index bdfc4b8eee7a..faf18a8e0311 100644
--- a/tools/perf/util/session.h
+++ b/tools/perf/util/session.h
@@ -10,7 +10,6 @@
 struct ip_callchain;
 struct thread;
 struct symbol;
-struct symbol_conf;
 
 struct perf_session {
         struct perf_header      header;
@@ -26,7 +25,6 @@ struct perf_session {
         int                     fd;
         int                     cwdlen;
         char                    *cwd;
-        bool                    use_modules;
         bool                    use_callchain;
         char filename[0];
 };
@@ -48,8 +46,7 @@ struct perf_event_ops {
         bool            full_paths;
 };
 
-struct perf_session *perf_session__new(const char *filename, int mode,
-                                       bool force, struct symbol_conf *conf);
+struct perf_session *perf_session__new(const char *filename, int mode, bool force);
 void perf_session__delete(struct perf_session *self);
 
 int perf_session__process_events(struct perf_session *self,
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 185b9eec192b..17ce01269a91 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -33,11 +33,10 @@ 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);
-unsigned int symbol__priv_size;
 static int vmlinux_path__nr_entries;
 static char **vmlinux_path;
 
-static struct symbol_conf symbol_conf__defaults = {
+struct symbol_conf symbol_conf = {
         .use_modules      = true,
         .try_vmlinux_path = true,
 };
@@ -130,13 +129,13 @@ static void map_groups__fixup_end(struct map_groups *self)
 static struct symbol *symbol__new(u64 start, u64 len, const char *name)
 {
         size_t namelen = strlen(name) + 1;
-        struct symbol *self = zalloc(symbol__priv_size +
+        struct symbol *self = zalloc(symbol_conf.priv_size +
                                      sizeof(*self) + namelen);
         if (self == NULL)
                 return NULL;
 
-        if (symbol__priv_size)
-                self = ((void *)self) + symbol__priv_size;
+        if (symbol_conf.priv_size)
+                self = ((void *)self) + symbol_conf.priv_size;
 
         self->start = start;
         self->end   = len ? start + len - 1 : start;
@@ -150,7 +149,7 @@ static struct symbol *symbol__new(u64 start, u64 len, const char *name)
 
 static void symbol__delete(struct symbol *self)
 {
-        free(((void *)self) - symbol__priv_size);
+        free(((void *)self) - symbol_conf.priv_size);
 }
 
 static size_t symbol__fprintf(struct symbol *self, FILE *fp)
@@ -471,7 +470,7 @@ static int dso__split_kallsyms(struct dso *self, struct map *map,
 
                 module = strchr(pos->name, '\t');
                 if (module) {
-                        if (!session->use_modules)
+                        if (!symbol_conf.use_modules)
                                 goto discard_symbol;
 
                         *module++ = '\0';
@@ -1740,34 +1739,27 @@ out_fail:
         return -1;
 }
 
-int symbol__init(struct symbol_conf *conf)
+int symbol__init(void)
 {
-        const struct symbol_conf *pconf = conf ?: &symbol_conf__defaults;
-
         elf_version(EV_CURRENT);
-        symbol__priv_size = pconf->priv_size;
-        if (pconf->sort_by_name)
-                symbol__priv_size += (sizeof(struct symbol_name_rb_node) -
-                                      sizeof(struct symbol));
+        if (symbol_conf.sort_by_name)
+                symbol_conf.priv_size += (sizeof(struct symbol_name_rb_node) -
+                                          sizeof(struct symbol));
 
-        if (pconf->try_vmlinux_path && vmlinux_path__init() < 0)
+        if (symbol_conf.try_vmlinux_path && vmlinux_path__init() < 0)
                 return -1;
 
         return 0;
 }
 
-int perf_session__create_kernel_maps(struct perf_session *self,
-                                     struct symbol_conf *conf)
+int perf_session__create_kernel_maps(struct perf_session *self)
 {
-        const struct symbol_conf *pconf = conf ?: &symbol_conf__defaults;
-
         if (map_groups__create_kernel_maps(&self->kmaps,
-                                           pconf->vmlinux_name) < 0)
+                                           symbol_conf.vmlinux_name) < 0)
                 return -1;
 
-        self->use_modules = pconf->use_modules;
-
-        if (pconf->use_modules && perf_session__create_module_maps(self) < 0)
+        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);
         /*
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 941ef331790e..766294735f93 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -57,11 +57,11 @@ struct symbol_conf {
         const char      *vmlinux_name;
 };
 
-extern unsigned int symbol__priv_size;
+extern struct symbol_conf symbol_conf;
 
 static inline void *symbol__priv(struct symbol *self)
 {
-        return ((void *)self) - symbol__priv_size;
+        return ((void *)self) - symbol_conf.priv_size;
 }
 
 struct addr_location {
@@ -119,9 +119,8 @@ int sysfs__read_build_id(const char *filename, void *bf, size_t size);
 bool dsos__read_build_ids(void);
 int build_id__sprintf(u8 *self, int len, char *bf);
 
-int symbol__init(struct symbol_conf *conf);
-int perf_session__create_kernel_maps(struct perf_session *self,
-                                     struct symbol_conf *conf);
+int symbol__init(void);
+int perf_session__create_kernel_maps(struct perf_session *self);
 
 extern struct list_head dsos__user, dsos__kernel;
 extern struct dso *vdso;