perf tests: Adjust the vmlinux symtab matches kallsyms test again

The kallsyms maps now may map to kcore and the symbol values now may be
file offsets.  For comparison with vmlinux the virtual memory address is
needed which is obtained by unmapping the symbol value.

The "vmlinux symtab matches kallsyms" is adjusted accordingly.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1375875537-4509-9-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 7 insertions, 5 deletions

diff --git a/tools/perf/tests/vmlinux-kallsyms.c b/tools/perf/tests/vmlinux-kallsyms.c
index e2e14984c3a0..2bd13edcbc17 100644
--- a/tools/perf/tests/vmlinux-kallsyms.c
+++ b/tools/perf/tests/vmlinux-kallsyms.c
@@ -16,6 +16,8 @@ static int vmlinux_matches_kallsyms_filter(struct map *map __maybe_unused,
         return 0;
 }
 
+#define UM(x) kallsyms_map->unmap_ip(kallsyms_map, (x))
+
 int test__vmlinux_matches_kallsyms(void)
 {
         int err = -1;
@@ -74,7 +76,7 @@ int test__vmlinux_matches_kallsyms(void)
                 goto out;
         }
 
-        ref_reloc_sym.addr = sym->start;
+        ref_reloc_sym.addr = UM(sym->start);
 
         /*
          * Step 5:
@@ -131,7 +133,7 @@ int test__vmlinux_matches_kallsyms(void)
                                                          mem_start, NULL, NULL);
                 pair = first_pair;
 
-                if (pair && pair->start == mem_start) {
+                if (pair && UM(pair->start) == mem_start) {
 next_pair:
                         if (strcmp(sym->name, pair->name) == 0) {
                                 /*
@@ -143,11 +145,11 @@ next_pair:
                                  * off the real size. More than that and we
                                  * _really_ have a problem.
                                  */
-                                s64 skew = mem_end - pair->end;
+                                s64 skew = mem_end - UM(pair->end);
                                 if (llabs(skew) >= page_size)
                                         pr_debug("%#" PRIx64 ": diff end addr for %s v: %#" PRIx64 " k: %#" PRIx64 "\n",
                                                  mem_start, sym->name, mem_end,
-                                                 pair->end);
+                                                 UM(pair->end));
 
                                 /*
                                  * Do not count this as a failure, because we
@@ -165,7 +167,7 @@ detour:
                                 if (nnd) {
                                         struct symbol *next = rb_entry(nnd, struct symbol, rb_node);
 
-                                        if (next->start == mem_start) {
+                                        if (UM(next->start) == mem_start) {
                                                 pair = next;
                                                 goto next_pair;
                                         }