summaryrefslogtreecommitdiff
path: root/tools/perf
diff options
context:
space:
mode:
authorChris Phlipot <cphlipot0@gmail.com>2016-05-10 20:26:48 -0700
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-05-11 12:24:58 -0300
commit7a2544c004a6c576b1e307f30925b165affe6a22 (patch)
tree445bc6a4d39a1b305bafe1d5293be3a544f8a99a /tools/perf
parentbd0a51dd2794f1d17d4e7a34ad66db845cef3e5a (diff)
downloadlinux-7a2544c004a6c576b1e307f30925b165affe6a22.tar.gz
perf script: Fix callchain addresses in db-export
Remove the call to map_ip() to adjust al.addr, because it has already been called when assembling the callchain, in: thread__resolve_callchain_sample(perf_sample) add_callchain_ip(ip = perf_sample->callchain->ips[j]) thread__find_addr_location(addr = ip) thread__find_addr_map(addr) { al->addr = addr if (al->map) al->addr = al->map->map_ip(al->map, al->addr); } Calling it a second time can result in incorrect addresses being used. This can have effects such as duplicate symbols being created and exported. Signed-off-by: Chris Phlipot <cphlipot0@gmail.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1462937209-6032-4-git-send-email-cphlipot0@gmail.com [ Show the callchain where it is done, to help reviewing this change down the line ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r--tools/perf/util/db-export.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/tools/perf/util/db-export.c b/tools/perf/util/db-export.c
index 2ef1f692c35b..8ca4186bf31b 100644
--- a/tools/perf/util/db-export.c
+++ b/tools/perf/util/db-export.c
@@ -324,10 +324,7 @@ static struct call_path *call_path_from_sample(struct db_export *dbe,
al.sym = node->sym;
al.map = node->map;
al.machine = machine;
- if (al.map)
- al.addr = al.map->map_ip(al.map, node->ip);
- else
- al.addr = node->ip;
+ al.addr = node->ip;
db_ids_from_al(dbe, &al, &dso_db_id, &sym_db_id, &offset);