perf machine: Use machine__kernel_map() thoroughly

In places where we were using its open coded equivalent.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-khkdugcdoqy3tkszm3jdxgbe@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c
index 23b1faaaa4cc5f83c263ffbc9a0f14733c0dcae2..b122c4e0818ec9cc390e22d4f2509d026d33f194 100644 (file)
--- a/tools/perf/builtin-kmem.c
+++ b/tools/perf/builtin-kmem.c
@@ -329,7 +329,7 @@ static int build_alloc_func_list(void)
                return -EINVAL;
        }
 
-       kernel_map = machine->vmlinux_maps[MAP__FUNCTION];
+       kernel_map = machine__kernel_map(machine, MAP__FUNCTION)
        if (map__load(kernel_map, NULL) < 0) {
                pr_err("cannot load kernel map\n");
                return -ENOENT;

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 37c9f51258873f5ec94046994dc7af43d3b494bd..7962605b357652cecc12dd7c583ae3a37e627127 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -387,7 +387,7 @@ static int perf_evlist__tty_browse_hists(struct perf_evlist *evlist,
 
 static void report__warn_kptr_restrict(const struct report *rep)
 {
-       struct map *kernel_map = rep->session->machines.host.vmlinux_maps[MAP__FUNCTION];
+       struct map *kernel_map = machine__kernel_map(&rep->session->machines.host, MAP__FUNCTION);
        struct kmap *kernel_kmap = kernel_map ? map__kmap(kernel_map) : NULL;
 
        if (kernel_map == NULL ||

diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c
index 2d21183bd661fa0687441bfe304fe6ea0e272386..47017a8aa6851fffb25430ddf594f9988de0a6e5 100644 (file)
--- a/tools/perf/tests/code-reading.c
+++ b/tools/perf/tests/code-reading.c
@@ -473,7 +473,7 @@ static int do_test_code_reading(bool try_kcore)
                symbol_conf.kallsyms_name = "/proc/kallsyms";
 
        /* Load kernel map */
-       map = machine->vmlinux_maps[MAP__FUNCTION];
+       map = machine__kernel_map(machine, MAP__FUNCTION);
        ret = map__load(map, NULL);
        if (ret < 0) {
                pr_debug("map__load failed\n");

diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index b1bb348ec3b6bb31c73ab3b13bdd412bde751c41..281ab7f874469e7277cd69e745788203fe323940 100644 (file)
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -649,12 +649,12 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
        size_t size;
        const char *mmap_name;
        char name_buff[PATH_MAX];
-       struct map *map;
+       struct map *map = machine__kernel_map(machine, MAP__FUNCTION);
        struct kmap *kmap;
        int err;
        union perf_event *event;
 
-       if (machine->vmlinux_maps[0] == NULL)
+       if (map == NULL)
                return -1;
 
        /*
@@ -680,7 +680,6 @@ int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
                event->header.misc = PERF_RECORD_MISC_GUEST_KERNEL;
        }
 
-       map = machine->vmlinux_maps[MAP__FUNCTION];
        kmap = map__kmap(map);
        size = snprintf(event->mmap.filename, sizeof(event->mmap.filename),
                        "%s%s", mmap_name, kmap->ref_reloc_sym->name) + 1;
@@ -1008,7 +1007,7 @@ int perf_event__preprocess_sample(const union perf_event *event,
         * it now.
         */
        if (cpumode == PERF_RECORD_MISC_KERNEL &&
-           machine->vmlinux_maps[MAP__FUNCTION] == NULL)
+           machine__kernel_map(machine, MAP__FUNCTION) == NULL)
                machine__create_kernel_maps(machine);
 
        thread__find_addr_map(thread, cpumode, MAP__FUNCTION, sample->ip, al);

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index fd1efeafb3438fea8f92ad2cf83a989c17fc08a3..d71b7dcf45791ccf4e44dde671d46c2d4a1e42a2 100644 (file)
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -625,7 +625,7 @@ size_t machine__fprintf_vmlinux_path(struct machine *machine, FILE *fp)
 {
        int i;
        size_t printed = 0;
-       struct dso *kdso = machine->vmlinux_maps[MAP__FUNCTION]->dso;
+       struct dso *kdso = machine__kernel_map(machine, MAP__FUNCTION)->dso;
 
        if (kdso->has_build_id) {
                char filename[PATH_MAX];
@@ -741,6 +741,7 @@ int __machine__create_kernel_maps(struct machine *machine, struct dso *kernel)
 
        for (type = 0; type < MAP__NR_TYPES; ++type) {
                struct kmap *kmap;
+               struct map *map;
 
                machine->vmlinux_maps[type] = map__new2(start, kernel, type);
                if (machine->vmlinux_maps[type] == NULL)
@@ -749,13 +750,13 @@ int __machine__create_kernel_maps(struct machine *machine, struct dso *kernel)
                machine->vmlinux_maps[type]->map_ip =
                        machine->vmlinux_maps[type]->unmap_ip =
                                identity__map_ip;
-               kmap = map__kmap(machine->vmlinux_maps[type]);
+               map = machine__kernel_map(machine, type);
+               kmap = map__kmap(map);
                if (!kmap)
                        return -1;
 
                kmap->kmaps = &machine->kmaps;
-               map_groups__insert(&machine->kmaps,
-                                  machine->vmlinux_maps[type]);
+               map_groups__insert(&machine->kmaps, map);
        }
 
        return 0;
@@ -767,13 +768,13 @@ void machine__destroy_kernel_maps(struct machine *machine)
 
        for (type = 0; type < MAP__NR_TYPES; ++type) {
                struct kmap *kmap;
+               struct map *map = machine__kernel_map(machine, type);
 
-               if (machine->vmlinux_maps[type] == NULL)
+               if (map == NULL)
                        continue;
 
-               kmap = map__kmap(machine->vmlinux_maps[type]);
-               map_groups__remove(&machine->kmaps,
-                                  machine->vmlinux_maps[type]);
+               kmap = map__kmap(map);
+               map_groups__remove(&machine->kmaps, map);
                if (kmap && kmap->ref_reloc_sym) {
                        /*
                         * ref_reloc_sym is shared among all maps, so free just
@@ -867,7 +868,7 @@ int machines__create_kernel_maps(struct machines *machines, pid_t pid)
 int machine__load_kallsyms(struct machine *machine, const char *filename,
                           enum map_type type, symbol_filter_t filter)
 {
-       struct map *map = machine->vmlinux_maps[type];
+       struct map *map = machine__kernel_map(machine, MAP__FUNCTION);
        int ret = dso__load_kallsyms(map->dso, filename, map, filter);
 
        if (ret > 0) {
@@ -886,7 +887,7 @@ int machine__load_kallsyms(struct machine *machine, const char *filename,
 int machine__load_vmlinux_path(struct machine *machine, enum map_type type,
                               symbol_filter_t filter)
 {
-       struct map *map = machine->vmlinux_maps[type];
+       struct map *map = machine__kernel_map(machine, MAP__FUNCTION);
        int ret = dso__load_vmlinux_path(map->dso, map, filter);
 
        if (ret > 0)
@@ -1244,7 +1245,7 @@ static int machine__process_kernel_mmap_event(struct machine *machine,
                        /*
                         * preload dso of guest kernel and modules
                         */
-                       dso__load(kernel, machine->vmlinux_maps[MAP__FUNCTION],
+                       dso__load(kernel, machine__kernel_map(machine, MAP__FUNCTION),
                                  NULL);
                }
        }

diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 622c2c9a1e65f7d287fbe1cddad76e9f2e6e8343..2a9d859d30b9e28995309a2647d3eabba7c3bff5 100644 (file)
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -235,7 +235,7 @@ struct map *map__new2(u64 start, struct dso *dso, enum map_type type)
  */
 bool __map__is_kernel(const struct map *map)
 {
-       return map->groups->machine->vmlinux_maps[map->type] == map;
+       return machine__kernel_map(map->groups->machine, map->type) == map;
 }
 
 static void map__exit(struct map *map)

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 7fb0533ab18cc123c9401d69e8636d28eb22a05f..a0b3f3c886f0377863a43af5a6d3f8b58fef4bb3 100644 (file)
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -126,11 +126,12 @@ static struct ref_reloc_sym *kernel_get_ref_reloc_sym(void)
 {
        /* kmap->ref_reloc_sym should be set if host_machine is initialized */
        struct kmap *kmap;
+       struct map *map = machine__kernel_map(host_machine, MAP__FUNCTION);
 
-       if (map__load(host_machine->vmlinux_maps[MAP__FUNCTION], NULL) < 0)
+       if (map__load(map, NULL) < 0)
                return NULL;
 
-       kmap = map__kmap(host_machine->vmlinux_maps[MAP__FUNCTION]);
+       kmap = map__kmap(map);
        if (!kmap)
                return NULL;
        return kmap->ref_reloc_sym;
@@ -281,7 +282,7 @@ static int kernel_get_module_dso(const char *module, struct dso **pdso)
                return -ENOENT;
        }
 
-       map = host_machine->vmlinux_maps[MAP__FUNCTION];
+       map = machine__kernel_map(host_machine, MAP__FUNCTION);
        dso = map->dso;
 
        vmlinux_name = symbol_conf.vmlinux_name;