Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0b8c25d949e010274c6697c570b772797ebc7c27

Authored by David Ahern
Committed by Arnaldo Carvalho de Melo
1 parent b41f1cec91
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

perf tools: Fix symbol offset computation for some dsos 

For some dsos (e.g., libc, libpthread, kernel modules) the symbol offset
is huge. e.g.,

qemu-kvm 17238/17242 [007] 762235.640311:
    ffffffff816288a1 __schedule+0x451 ([kernel.kallsyms])
    ffffffff81629609 schedule+0x29 ([kernel.kallsyms])
    ffffffffa00a6ded kvm_vcpu_block+0xffffffffa00a106d (/lib/modules/3.11.0-rc1+/kernel/arch/x86/kvm/kvm.ko)
    ffffffffa00bae6b kvm_arch_vcpu_ioctl_run+0xffffffffa00a118b (/lib/modules/3.11.0-rc1+/kernel/arch/x86/kvm/kvm.ko)
    ffffffffa00a4d7a kvm_vcpu_ioctl+0xffffffffa00a141a (/lib/modules/3.11.0-rc1+/kernel/arch/x86/kvm/kvm.ko)
    ffffffff811a7bdb do_vfs_ioctl+0x8b ([kernel.kallsyms])
    ffffffff811a80c1 sys_ioctl+0x91 ([kernel.kallsyms])
    ffffffff81633182 system_call+0x72 ([kernel.kallsyms])
        7f882a97af27 __GI___ioctl+0x7f882a891007 (/lib64/libc-2.14.90.so)
           100000002 [unknown] ([unknown])

It seems to be maps with a non-0 start. Taking that into account the
offsets are correct:

qemu-kvm 17238/17242 [007] 762235.640311:
    ffffffff816288a1 __schedule+0x451 ([kernel.kallsyms])
    ffffffff81629609 schedule+0x29 ([kernel.kallsyms])
    ffffffffa00a6ded kvm_vcpu_block+0x6d (/lib/modules/3.11.0-rc1+/kernel/arch/x86/kvm/kvm.ko)
    ffffffffa00bae6b kvm_arch_vcpu_ioctl_run+0x18b (/lib/modules/3.11.0-rc1+/kernel/arch/x86/kvm/kvm.ko)
    ffffffffa00a4d7a kvm_vcpu_ioctl+0x41a (/lib/modules/3.11.0-rc1+/kernel/arch/x86/kvm/kvm.ko)
    ffffffff811a7bdb do_vfs_ioctl+0x8b ([kernel.kallsyms])
    ffffffff811a80c1 sys_ioctl+0x91 ([kernel.kallsyms])
    ffffffff81633182 system_call+0x72 ([kernel.kallsyms])
        7f882a97af27 __GI___ioctl+0x7 (/lib64/libc-2.14.90.so)
           100000002 [unknown] ([unknown])

Signed-off-by: David Ahern <dsahern@gmail.com>
Link: http://lkml.kernel.org/r/1375026512-45826-1-git-send-email-dsahern@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Showing 2 changed files with 5 additions and 1 deletions Side-by-side Diff

tools/perf/util/session.c
Diff comments   View file @ 0b8c25d
... ... @@ -1513,6 +1513,7 @@
1513 1513 printf(" ");
1514 1514 if (print_symoffset) {
1515 1515 al.addr = node->ip;
  1516 + al.map = node->map;
1516 1517 symbol__fprintf_symname_offs(node->sym, &al, stdout);
1517 1518 } else
1518 1519 symbol__fprintf_symname(node->sym, stdout);
tools/perf/util/symbol.c
Diff comments   View file @ 0b8c25d
... ... @@ -259,7 +259,10 @@
259 259 if (sym && sym->name) {
260 260 length = fprintf(fp, "%s", sym->name);
261 261 if (al) {
262   - offset = al->addr - sym->start;
  262 + if (al->addr < sym->end)
  263 + offset = al->addr - sym->start;
  264 + else
  265 + offset = al->addr - al->map->start - sym->start;
263 266 length += fprintf(fp, "+0x%lx", offset);
264 267 }
265 268 return length;