From: Milian Wolff <milian.wolff@kdab.com>
To: acme@kernel.org, jolsa@kernel.org, yao.jin@linux.intel.com,
namhyung@kernel.org
Cc: Linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Milian Wolff <milian.wolff@kdab.com>,
Sandipan Das <sandipan@linux.ibm.com>
Subject: [PATCH 2/3] perf report: use the offset address to find inline frames
Date: Wed, 26 Sep 2018 15:52:06 +0200 [thread overview]
Message-ID: <20180926135207.30263-2-milian.wolff@kdab.com> (raw)
In-Reply-To: <20180926135207.30263-1-milian.wolff@kdab.com>
To correctly find inlined frames, we have to use the file offset
instead of the virtual memory address. This was already fixed for
displaying srcline information while displaying in commit
2a9d5050dc84fa20 ("perf script: Show correct offsets for DWARF-based
unwinding"). We just need to use the same corrected address also when
trying to find inline frames.
This is another follow-up to commit 19610184693c ("perf script: Show
virtual addresses instead of offsets").
Signed-off-by: Milian Wolff <milian.wolff@kdab.com>
Cc: Sandipan Das <sandipan@linux.ibm.com>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
---
tools/perf/util/machine.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 0cb4f8bf3ca7..73a651f10a0f 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -2317,9 +2317,6 @@ static int unwind_entry(struct unwind_entry *entry, void *arg)
if (symbol_conf.hide_unresolved && entry->sym == NULL)
return 0;
- if (append_inlines(cursor, entry->map, entry->sym, entry->ip) == 0)
- return 0;
-
/*
* Convert entry->ip from a virtual address to an offset in
* its corresponding binary.
@@ -2327,6 +2324,9 @@ static int unwind_entry(struct unwind_entry *entry, void *arg)
if (entry->map)
addr = map__map_ip(entry->map, entry->ip);
+ if (append_inlines(cursor, entry->map, entry->sym, addr) == 0)
+ return 0;
+
srcline = callchain_srcline(entry->map, entry->sym, addr);
return callchain_cursor_append(cursor, entry->ip,
entry->map, entry->sym,
--
2.19.0
next prev parent reply other threads:[~2018-09-26 13:58 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-26 13:52 [PATCH 1/3] perf report: don't try to map ip to invalid map Milian Wolff
2018-09-26 13:52 ` Milian Wolff [this message]
2018-09-27 16:00 ` [PATCH 2/3] perf report: use the offset address to find inline frames Jiri Olsa
2018-09-27 19:12 ` Arnaldo Carvalho de Melo
2018-10-02 7:39 ` [PATCH] perf record: use unmapped IP for inline callchain cursors Milian Wolff
2018-10-02 15:32 ` Arnaldo Carvalho de Melo
2018-10-03 3:35 ` Ravi Bangoria
2018-10-05 13:48 ` Arnaldo Carvalho de Melo
2018-10-08 18:49 ` Milian Wolff
2018-10-05 14:11 ` Arnaldo Carvalho de Melo
2018-10-05 16:21 ` [tip:perf/urgent] perf record: Use " tip-bot for Milian Wolff
2018-09-26 13:52 ` [PATCH 3/3] perf report: don't crash on invalid inline debug information Milian Wolff
2018-09-27 19:10 ` Arnaldo Carvalho de Melo
2018-10-11 18:23 ` Milian Wolff
2018-10-11 19:39 ` Arnaldo Carvalho de Melo
2018-10-15 20:51 ` Milian Wolff
2018-10-16 17:49 ` Arnaldo Carvalho de Melo
2018-10-16 17:52 ` Arnaldo Carvalho de Melo
2018-10-16 19:00 ` Milian Wolff
2018-10-16 20:06 ` Arnaldo Carvalho de Melo
2018-10-18 6:20 ` [tip:perf/urgent] perf report: Don't " tip-bot for Milian Wolff
2018-09-26 14:18 ` [PATCH 1/3] perf report: don't try to map ip to invalid map Arnaldo Carvalho de Melo
2018-09-26 14:41 ` Milian Wolff
2018-09-27 19:07 ` Arnaldo Carvalho de Melo
2018-09-27 8:48 ` Sandipan Das
2018-09-27 19:11 ` Arnaldo Carvalho de Melo
2018-09-27 16:02 ` Jiri Olsa
2018-10-05 16:20 ` [tip:perf/urgent] perf report: Don't " tip-bot for Milian Wolff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180926135207.30263-2-milian.wolff@kdab.com \
--to=milian.wolff@kdab.com \
--cc=Linux-kernel@vger.kernel.org \
--cc=acme@kernel.org \
--cc=jolsa@kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=namhyung@kernel.org \
--cc=sandipan@linux.ibm.com \
--cc=yao.jin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome