Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

  * Fix annotation for relocated kernel (Adrian Hunter)

  * Fix demangling of symbols in kernel and kernel modules (Avi Kivity)

  * Fix include for non x86 architectures (Francesco Fusco)

  * Fix ARM64 memory barriers (Peter Zijlstra)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

13 files changed, 162 insertions, 62 deletions

diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildid-cache.c
index cfede86161d8..b22dbb16f877 100644
--- a/tools/perf/builtin-buildid-cache.c
+++ b/tools/perf/builtin-buildid-cache.c
@@ -63,11 +63,35 @@ static int build_id_cache__kcore_dir(char *dir, size_t sz)
         return 0;
 }
 
+static bool same_kallsyms_reloc(const char *from_dir, char *to_dir)
+{
+        char from[PATH_MAX];
+        char to[PATH_MAX];
+        const char *name;
+        u64 addr1 = 0, addr2 = 0;
+        int i;
+
+        scnprintf(from, sizeof(from), "%s/kallsyms", from_dir);
+        scnprintf(to, sizeof(to), "%s/kallsyms", to_dir);
+
+        for (i = 0; (name = ref_reloc_sym_names[i]) != NULL; i++) {
+                addr1 = kallsyms__get_function_start(from, name);
+                if (addr1)
+                        break;
+        }
+
+        if (name)
+                addr2 = kallsyms__get_function_start(to, name);
+
+        return addr1 == addr2;
+}
+
 static int build_id_cache__kcore_existing(const char *from_dir, char *to_dir,
                                           size_t to_dir_sz)
 {
         char from[PATH_MAX];
         char to[PATH_MAX];
+        char to_subdir[PATH_MAX];
         struct dirent *dent;
         int ret = -1;
         DIR *d;
@@ -86,10 +110,11 @@ static int build_id_cache__kcore_existing(const char *from_dir, char *to_dir,
                         continue;
                 scnprintf(to, sizeof(to), "%s/%s/modules", to_dir,
                           dent->d_name);
-                if (!compare_proc_modules(from, to)) {
-                        scnprintf(to, sizeof(to), "%s/%s", to_dir,
-                                  dent->d_name);
-                        strlcpy(to_dir, to, to_dir_sz);
+                scnprintf(to_subdir, sizeof(to_subdir), "%s/%s",
+                          to_dir, dent->d_name);
+                if (!compare_proc_modules(from, to) &&
+                    same_kallsyms_reloc(from_dir, to_subdir)) {
+                        strlcpy(to_dir, to_subdir, to_dir_sz);
                         ret = 0;
                         break;
                 }
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 3c394bf16fa8..af47531b82ec 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -287,10 +287,7 @@ static void perf_event__synthesize_guest_os(struct machine *machine, void *data)
          * have no _text sometimes.
          */
         err = perf_event__synthesize_kernel_mmap(tool, process_synthesized_event,
-                                                 machine, "_text");
-        if (err < 0)
-                err = perf_event__synthesize_kernel_mmap(tool, process_synthesized_event,
-                                                         machine, "_stext");
+                                                 machine);
         if (err < 0)
                 pr_err("Couldn't record guest kernel [%d]'s reference"
                        " relocation symbol.\n", machine->pid);
@@ -457,10 +454,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
         }
 
         err = perf_event__synthesize_kernel_mmap(tool, process_synthesized_event,
-                                                 machine, "_text");
-        if (err < 0)
-                err = perf_event__synthesize_kernel_mmap(tool, process_synthesized_event,
-                                                         machine, "_stext");
+                                                 machine);
         if (err < 0)
                 pr_err("Couldn't record kernel reference relocation symbol\n"
                        "Symbol resolution may be skewed if relocation was used (e.g. kexec).\n"
diff --git a/tools/perf/perf.h b/tools/perf/perf.h
index 7daa806d9050..e84fa26bc1be 100644
--- a/tools/perf/perf.h
+++ b/tools/perf/perf.h
@@ -100,8 +100,8 @@
 
 #ifdef __aarch64__
 #define mb()            asm volatile("dmb ish" ::: "memory")
-#define wmb()           asm volatile("dmb ishld" ::: "memory")
-#define rmb()           asm volatile("dmb ishst" ::: "memory")
+#define wmb()           asm volatile("dmb ishst" ::: "memory")
+#define rmb()           asm volatile("dmb ishld" ::: "memory")
 #define cpu_relax()     asm volatile("yield" ::: "memory")
 #endif
 
diff --git a/tools/perf/tests/vmlinux-kallsyms.c b/tools/perf/tests/vmlinux-kallsyms.c
index 2bd13edcbc17..3d9088003a5b 100644
--- a/tools/perf/tests/vmlinux-kallsyms.c
+++ b/tools/perf/tests/vmlinux-kallsyms.c
@@ -26,7 +26,6 @@ int test__vmlinux_matches_kallsyms(void)
         struct map *kallsyms_map, *vmlinux_map;
         struct machine kallsyms, vmlinux;
         enum map_type type = MAP__FUNCTION;
-        struct ref_reloc_sym ref_reloc_sym = { .name = "_stext", };
         u64 mem_start, mem_end;
 
         /*
@@ -70,14 +69,6 @@ int test__vmlinux_matches_kallsyms(void)
          */
         kallsyms_map = machine__kernel_map(&kallsyms, type);
 
-        sym = map__find_symbol_by_name(kallsyms_map, ref_reloc_sym.name, NULL);
-        if (sym == NULL) {
-                pr_debug("dso__find_symbol_by_name ");
-                goto out;
-        }
-
-        ref_reloc_sym.addr = UM(sym->start);
-
         /*
          * Step 5:
          *
@@ -89,7 +80,6 @@ int test__vmlinux_matches_kallsyms(void)
         }
 
         vmlinux_map = machine__kernel_map(&vmlinux, type);
-        map__kmap(vmlinux_map)->ref_reloc_sym = &ref_reloc_sym;
 
         /*
          * Step 6:
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c
index 1fc1c2f04772..b0f3ca850e9e 100644
--- a/tools/perf/util/event.c
+++ b/tools/perf/util/event.c
@@ -470,23 +470,32 @@ static int find_symbol_cb(void *arg, const char *name, char type,
         return 1;
 }
 
+u64 kallsyms__get_function_start(const char *kallsyms_filename,
+                                 const char *symbol_name)
+{
+        struct process_symbol_args args = { .name = symbol_name, };
+
+        if (kallsyms__parse(kallsyms_filename, &args, find_symbol_cb) <= 0)
+                return 0;
+
+        return args.start;
+}
+
 int perf_event__synthesize_kernel_mmap(struct perf_tool *tool,
                                        perf_event__handler_t process,
-                                       struct machine *machine,
-                                       const char *symbol_name)
+                                       struct machine *machine)