Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Anton Blanchard and committed by
Arnaldo Carvalho de Melo
50de1a0c 71ac899b

+2 -1
+2 -1
tools/perf/util/symbol-elf.c
··· 837 837 sec = syms_ss->symtab; 838 838 shdr = syms_ss->symshdr; 839 839 840 - if (elf_section_by_name(elf, &ehdr, &tshdr, ".text", NULL)) 840 + if (elf_section_by_name(runtime_ss->elf, &runtime_ss->ehdr, &tshdr, 841 + ".text", NULL)) 841 842 dso->text_offset = tshdr.sh_addr - tshdr.sh_offset; 842 843 843 844 if (runtime_ss->opdsec)