lkml.org 
[lkml]   [2012]   [Nov]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/21] perf annotate: Don't try to follow jump target on PLT symbols
    Date
    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


    \
     
     \ /
      Last update: 2012-11-10 00:41    [W:3.481 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site