Commit 8d0591f6 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar

perf symbols: Don't try to load kallsyms if doesn't match the record build-id

Now a perf.data file collected on a x86_64 fedora 12 machine
gets properly parsed on a Debian testing PARISC64 machine with
32-bit userland:

  acme@parisc:~/git/linux-2.6-tip$ perf report 2> /dev/null | head -15
  # Samples: 293085637
  #
  # Overhead          Command                      Shared Object  Symbol
  # ........  ...............  .................................  ......
  #
      35.11%             find  [kernel.kallsyms]                  [k] 0xffffffff81002b5a
      18.25%             perf  [kernel.kallsyms]                  [k] 0xffffffff8102235f
       9.07%             find  find                               [.] 0x0000000000fb0e
       5.80%          swapper  [kernel.kallsyms]                  [k] 0xffffffff8102235f
       3.29%             perf  libc-2.10.2.so                     [.] __GI_strcmp
       2.70%             find  libc-2.10.2.so                     [.] __GI_memmove
       2.33%             init  [kernel.kallsyms]                  [k] 0xffffffff810091b9
       2.03%             find  libc-2.10.2.so                     [.] _int_malloc
       1.67%             find  libc-2.10.2.so                     [.] _IO_vfprintf_internal
       1.65%             sshd  libcrypto.so.0.9.8k                [.] 0x00000000105440
  acme@parisc:~/git/linux-2.6-tip$
Signed-off-by: default avatarArnaldo 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: <1263501006-14185-2-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 1b75962e
...@@ -1608,11 +1608,11 @@ static int dso__load_kernel_sym(struct dso *self, struct map *map, ...@@ -1608,11 +1608,11 @@ static int dso__load_kernel_sym(struct dso *self, struct map *map,
u8 kallsyms_build_id[BUILD_ID_SIZE]; u8 kallsyms_build_id[BUILD_ID_SIZE];
if (sysfs__read_build_id("/sys/kernel/notes", kallsyms_build_id, if (sysfs__read_build_id("/sys/kernel/notes", kallsyms_build_id,
sizeof(kallsyms_build_id)) == 0) sizeof(kallsyms_build_id)) == 0) {
is_kallsyms = dso__build_id_equal(self, kallsyms_build_id);
is_kallsyms = dso__build_id_equal(self, kallsyms_build_id); if (is_kallsyms)
if (is_kallsyms) goto do_kallsyms;
goto do_kallsyms; }
goto do_vmlinux; goto do_vmlinux;
} }
...@@ -1623,6 +1623,9 @@ static int dso__load_kernel_sym(struct dso *self, struct map *map, ...@@ -1623,6 +1623,9 @@ static int dso__load_kernel_sym(struct dso *self, struct map *map,
do_vmlinux: do_vmlinux:
err = dso__load_vmlinux(self, map, session, self->long_name, filter); err = dso__load_vmlinux(self, map, session, self->long_name, filter);
if (err <= 0) { if (err <= 0) {
if (self->has_build_id)
return -1;
pr_info("The file %s cannot be used, " pr_info("The file %s cannot be used, "
"trying to use /proc/kallsyms...", self->long_name); "trying to use /proc/kallsyms...", self->long_name);
do_kallsyms: do_kallsyms:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment