perf script: Fix callchain addresses in db-export
authorChris Phlipot <cphlipot0@gmail.com>
Wed, 11 May 2016 03:26:48 +0000 (20:26 -0700)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 11 May 2016 15:24:58 +0000 (12:24 -0300)
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>
tools/perf/util/db-export.c

index 2ef1f692c35ba8a7070b4b12f7b8187cdd310af4..8ca4186bf31bf8877e867cd9bd2e636bff32952c 100644 (file)
@@ -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);