From: Arnaldo Carvalho de Melo <acme@infradead.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Namhyung Kim <namhyung.kim@lge.com>,
Namhyung Kim <namhyung@kernel.org>,
Andi Kleen <ak@linux.intel.com>, David Ahern <dsahern@gmail.com>,
Jiri Olsa <jolsa@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Stephane Eranian <eranian@google.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 15/21] perf annotate: Don't try to follow jump target on PLT symbols
Date: Fri, 9 Nov 2012 18:43:04 -0300 [thread overview]
Message-ID: <1352497390-17716-16-git-send-email-acme@infradead.org> (raw)
In-Reply-To: <1352497390-17716-1-git-send-email-acme@infradead.org>
From: Namhyung Kim <namhyung.kim@lge.com>
The perf annotate browser on TUI can identify a jump target for a
selected instruction. It assumes that the jump target is within the
function but it's not the case of PLT symbols which have offset out of
the function as a target.
Since it caused a segmentation fault, do not try to follow jump target
on the PLT symbols.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1352482044-3443-5-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/ui/browsers/annotate.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index 3eff17f..5dab3ca 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -188,6 +188,12 @@ static void annotate_browser__draw_current_jump(struct ui_browser *browser)
struct disasm_line *cursor = ab->selection, *target;
struct browser_disasm_line *btarget, *bcursor;
unsigned int from, to;
+ struct map_symbol *ms = ab->b.priv;
+ struct symbol *sym = ms->sym;
+
+ /* PLT symbols contain external offsets */
+ if (strstr(sym->name, "@plt"))
+ return;
if (!cursor || !cursor->ins || !ins__is_jump(cursor->ins) ||
!disasm_line__has_offset(cursor))
@@ -771,6 +777,12 @@ static void annotate_browser__mark_jump_targets(struct annotate_browser *browser
size_t size)
{
u64 offset;
+ struct map_symbol *ms = browser->b.priv;
+ struct symbol *sym = ms->sym;
+
+ /* PLT symbols contain external offsets */
+ if (strstr(sym->name, "@plt"))
+ return;
for (offset = 0; offset < size; ++offset) {
struct disasm_line *dl = browser->offsets[offset], *dlt;
--
1.7.9.2.358.g22243
next prev parent reply other threads:[~2012-11-09 21:47 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-09 21:42 [GIT PULL 00/21] perf/core improvements and fixes Arnaldo Carvalho de Melo
2012-11-09 21:42 ` [PATCH 01/21] perf machine: Set kernel data mapping length Arnaldo Carvalho de Melo
2012-11-09 21:42 ` [PATCH 02/21] perf tools: Fix detection of stack area Arnaldo Carvalho de Melo
2012-11-09 21:42 ` [PATCH 03/21] perf hists: Free branch_info when freeing hist_entry Arnaldo Carvalho de Melo
2012-11-09 21:42 ` [PATCH 04/21] perf tests: Move attr.py temp dir cleanup into finally section Arnaldo Carvalho de Melo
2012-11-09 21:42 ` [PATCH 05/21] perf tools: Add LIBDW_DIR Makefile variable to for alternate libdw Arnaldo Carvalho de Melo
2012-11-09 21:42 ` [PATCH 06/21] perf tools: Add arbitary aliases and support names with - Arnaldo Carvalho de Melo
2012-11-09 21:42 ` [PATCH 07/21] perf tools: Don't try to lookup objdump for live mode Arnaldo Carvalho de Melo
2012-11-09 21:42 ` [PATCH 08/21] perf diff: Start moving to support matching more than two hists Arnaldo Carvalho de Melo
2012-11-09 21:42 ` [PATCH 09/21] perf diff: Move hists__match to the hists lib Arnaldo Carvalho de Melo
2012-11-09 21:42 ` [PATCH 10/21] perf hists: Introduce hists__link Arnaldo Carvalho de Melo
2012-11-12 2:40 ` Namhyung Kim
2012-11-12 16:04 ` Arnaldo Carvalho de Melo
2012-11-09 21:43 ` [PATCH 11/21] perf diff: Use hists__link when not pairing just with baseline Arnaldo Carvalho de Melo
2012-11-09 21:43 ` [PATCH 12/21] perf machine: Move more methods to machine.[ch] Arnaldo Carvalho de Melo
2012-11-09 21:43 ` [PATCH 13/21] perf test: fix a build error on builtin-test Arnaldo Carvalho de Melo
2012-11-09 21:43 ` [PATCH 14/21] perf annotate: Whitespace fixups Arnaldo Carvalho de Melo
2012-11-09 21:43 ` Arnaldo Carvalho de Melo [this message]
2012-11-09 21:43 ` [PATCH 16/21] perf annotate: Merge same lines in summary view Arnaldo Carvalho de Melo
2012-11-09 21:43 ` [PATCH 17/21] tools lib traceevent: Add __maybe_unused to unused parameters Arnaldo Carvalho de Melo
2012-11-09 21:43 ` [PATCH 18/21] tools lib traceevent: Avoid comparisions between signed/unsigned Arnaldo Carvalho de Melo
2012-11-09 21:43 ` [PATCH 19/21] tools lib traceevent: No need to check for < 0 on an unsigned enum Arnaldo Carvalho de Melo
2012-11-09 21:43 ` [PATCH 20/21] tools lib traceevent: Handle INVALID_ARG_TYPE errno in pevent_strerror Arnaldo Carvalho de Melo
2012-11-09 21:43 ` [PATCH 21/21] tools lib traceevent: Use 'const' in variables pointing to const strings Arnaldo Carvalho de Melo
2012-11-12 2:10 ` [GIT PULL 00/21] perf/core improvements and fixes Namhyung Kim
2012-11-12 13:55 ` Jiri Olsa
2012-11-12 16:01 ` Arnaldo Carvalho de Melo
2012-11-13 1:20 ` Namhyung Kim
2012-11-13 18:11 ` Ingo Molnar
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=1352497390-17716-16-git-send-email-acme@infradead.org \
--to=acme@infradead.org \
--cc=acme@redhat.com \
--cc=ak@linux.intel.com \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).