mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 04:26:45 +00:00
perf report: Fix sort__sym_cmp to also compare end of symbol
When using a map file from a JIT, due to memory reuse, we can obtain multiple symbols with the same start address but a different length. The symbols__find does check for the end so not doing it in sort__sym_cmp was causing the hist_entry in the annotate part of a report to match to the wrong entry, causing a fatal error. Signed-off-by: Yannick Brosseau <scientist@fb.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: kernel-team@fb.com Link: http://lkml.kernel.org/r/1434584470-17771-1-git-send-email-scientist@fb.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
3e323dc0a8
commit
c05676c062
1 changed files with 3 additions and 5 deletions
|
@ -182,18 +182,16 @@ static int64_t _sort__addr_cmp(u64 left_ip, u64 right_ip)
|
||||||
|
|
||||||
static int64_t _sort__sym_cmp(struct symbol *sym_l, struct symbol *sym_r)
|
static int64_t _sort__sym_cmp(struct symbol *sym_l, struct symbol *sym_r)
|
||||||
{
|
{
|
||||||
u64 ip_l, ip_r;
|
|
||||||
|
|
||||||
if (!sym_l || !sym_r)
|
if (!sym_l || !sym_r)
|
||||||
return cmp_null(sym_l, sym_r);
|
return cmp_null(sym_l, sym_r);
|
||||||
|
|
||||||
if (sym_l == sym_r)
|
if (sym_l == sym_r)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
ip_l = sym_l->start;
|
if (sym_l->start != sym_r->start)
|
||||||
ip_r = sym_r->start;
|
return (int64_t)(sym_r->start - sym_l->start);
|
||||||
|
|
||||||
return (int64_t)(ip_r - ip_l);
|
return (int64_t)(sym_r->end - sym_l->end);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int64_t
|
static int64_t
|
||||||
|
|
Loading…
Reference in a new issue