lkml.org 
[lkml]   [2018]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 279/329] perf top: Fix top.call-graph config option reading
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    From: Yisheng Xie <xieyisheng1@huawei.com>

    [ Upstream commit a3a4a3b37c9b911af4c375b2475cea0fd2b84d38 ]

    When trying to add the "call-graph" variable for top into the
    .perfconfig file, like:

    [top]
    call-graph = fp

    I that perf_top_config() do not parse this variable.

    Fix it by calling perf_default_config() when the top.call-graph variable
    is set.

    Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
    Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Wang Nan <wangnan0@huawei.com>
    Fixes: b8cbb349061e ("perf config: Bring perf_default_config to the very beginning at main()")
    Link: http://lkml.kernel.org/r/1520853957-36106-1-git-send-email-xieyisheng1@huawei.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    tools/perf/builtin-top.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    --- a/tools/perf/builtin-top.c
    +++ b/tools/perf/builtin-top.c
    @@ -1061,8 +1061,10 @@ parse_callchain_opt(const struct option

    static int perf_top_config(const char *var, const char *value, void *cb __maybe_unused)
    {
    - if (!strcmp(var, "top.call-graph"))
    - var = "call-graph.record-mode"; /* fall-through */
    + if (!strcmp(var, "top.call-graph")) {
    + var = "call-graph.record-mode";
    + return perf_default_config(var, value, cb);
    + }
    if (!strcmp(var, "top.children")) {
    symbol_conf.cumulate_callchain = perf_config_bool(var, value);
    return 0;

    \
     
     \ /
      Last update: 2018-05-28 16:05    [W:4.127 / U:0.196 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site