Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1399885

[tip:perf/core] perf script: Fix callchain addresses in db-export

Show all headers | View raw

Commit-ID:  7a2544c004a6c576b1e307f30925b165affe6a22
Gitweb:     http://git.kernel.org/tip/7a2544c004a6c576b1e307f30925b165affe6a22
Author:     Chris Phlipot <cphlipot0@gmail.com>
AuthorDate: Tue, 10 May 2016 20:26:48 -0700
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 11 May 2016 12:24:58 -0300

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>
---
 tools/perf/util/db-export.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/tools/perf/util/db-export.c b/tools/perf/util/db-export.c
index 2ef1f69..8ca4186 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);
 

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/4] perf script: fix duplicate symbols in db-export Chris Phlipot <cphlipot0@gmail.com> - 2016-05-11 05:30 +0200
  [PATCH v2 2/4] perf script: fix symbol insertion behavior in db-export Chris Phlipot <cphlipot0@gmail.com> - 2016-05-11 05:30 +0200
    [tip:perf/core] perf script: Fix symbol insertion behavior in  db-export tip-bot for Chris Phlipot <tipbot@zytor.com> - 2016-05-12 12:30 +0200
  [PATCH v2 4/4] perf script: fix export of callchains with recursion in db-export Chris Phlipot <cphlipot0@gmail.com> - 2016-05-11 05:30 +0200
    [tip:perf/core] perf script: Fix export of callchains with  recursion in db-export tip-bot for Chris Phlipot <tipbot@zytor.com> - 2016-05-12 12:30 +0200
  [PATCH v2 3/4] perf script: fix callchain addresses in db-export Chris Phlipot <cphlipot0@gmail.com> - 2016-05-11 05:30 +0200
    [tip:perf/core] perf script: Fix callchain addresses in db-export tip-bot for Chris Phlipot <tipbot@zytor.com> - 2016-05-12 12:30 +0200
  [PATCH v2 1/4] perf symbols: add dso__insert_symbol function Chris Phlipot <cphlipot0@gmail.com> - 2016-05-11 05:30 +0200
    [tip:perf/core] perf symbols: Add dso__insert_symbol function tip-bot for Chris Phlipot <tipbot@zytor.com> - 2016-05-12 12:30 +0200

csiph-web