lkml.org 
[lkml]   [2016]   [Oct]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.8 098/125] perf symbols: Check symbol_conf.allow_aliases for kallsyms loading too
    Date
    4.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    commit c97b40e4d15f13a36cd037d598e45cbe9e1e5757 upstream.

    We can allow aliases to be kept, but we were checking this just when
    loading vmlinux files, be consistent, do it for any symbol table loading
    code that calls symbol__fixup_duplicate() by making this function check
    .allow_aliases instead.

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Masami Hiramatsu <mhiramat@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Wang Nan <wangnan0@huawei.com>
    Fixes: 680d926a8cb0 ("perf symbols: Allow symbol alias when loading map for symbol name")
    Link: http://lkml.kernel.org/n/tip-z0avp0s6cfjckc4xj3pdfjdz@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    tools/perf/util/symbol-elf.c | 3 +--
    tools/perf/util/symbol.c | 3 +++
    2 files changed, 4 insertions(+), 2 deletions(-)

    --- a/tools/perf/util/symbol-elf.c
    +++ b/tools/perf/util/symbol-elf.c
    @@ -1113,8 +1113,7 @@ new_symbol:
    * For misannotated, zeroed, ASM function sizes.
    */
    if (nr > 0) {
    - if (!symbol_conf.allow_aliases)
    - symbols__fixup_duplicate(&dso->symbols[map->type]);
    + symbols__fixup_duplicate(&dso->symbols[map->type]);
    symbols__fixup_end(&dso->symbols[map->type]);
    if (kmap) {
    /*
    --- a/tools/perf/util/symbol.c
    +++ b/tools/perf/util/symbol.c
    @@ -152,6 +152,9 @@ void symbols__fixup_duplicate(struct rb_
    struct rb_node *nd;
    struct symbol *curr, *next;

    + if (symbol_conf.allow_aliases)
    + return;
    +
    nd = rb_first(symbols);

    while (nd) {

    \
     
     \ /
      Last update: 2016-10-29 16:05    [W:3.405 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site