lkml.org 
[lkml]   [2016]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/urgent] perf symbols: Fix annotation of objects with debuginfo files
    Commit-ID:  50de1a0c54cdbc69a6dbcbc323f53daf95a4050e
    Gitweb: http://git.kernel.org/tip/50de1a0c54cdbc69a6dbcbc323f53daf95a4050e
    Author: Anton Blanchard <anton@samba.org>
    AuthorDate: Sat, 13 Aug 2016 11:55:33 +1000
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Mon, 15 Aug 2016 16:49:57 -0300

    perf symbols: Fix annotation of objects with debuginfo files

    Commit 73cdf0c6ea9c ("perf symbols: Record text offset in dso
    to calculate objdump address") started storing the offset of
    the text section for all DSOs:

    if (elf_section_by_name(elf, &ehdr, &tshdr, ".text", NULL))
    dso->text_offset = tshdr.sh_addr - tshdr.sh_offset;

    Unfortunately this breaks debuginfo files, because we need to calculate
    the offset of the text section in the associated executable file. As a
    result perf annotate returns junk for all debuginfo files.

    Fix this by using runtime_ss->elf which should point at the executable
    when parsing a debuginfo file.

    Signed-off-by: Anton Blanchard <anton@samba.org>
    Reviewed-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
    Tested-by: Wang Nan <wangnan0@huawei.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
    Cc: stable@vger.kernel.org # v4.6+
    Fixes: 73cdf0c6ea9c ("perf symbols: Record text offset in dso to calculate objdump address")
    Link: http://lkml.kernel.org/r/20160813115533.6de17912@kryten
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/symbol-elf.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
    index a34321e..a811c13 100644
    --- a/tools/perf/util/symbol-elf.c
    +++ b/tools/perf/util/symbol-elf.c
    @@ -837,7 +837,8 @@ int dso__load_sym(struct dso *dso, struct map *map,
    sec = syms_ss->symtab;
    shdr = syms_ss->symshdr;

    - if (elf_section_by_name(elf, &ehdr, &tshdr, ".text", NULL))
    + if (elf_section_by_name(runtime_ss->elf, &runtime_ss->ehdr, &tshdr,
    + ".text", NULL))
    dso->text_offset = tshdr.sh_addr - tshdr.sh_offset;

    if (runtime_ss->opdsec)
    \
     
     \ /
      Last update: 2016-09-17 09:57    [W:2.670 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site