lkml.org 
[lkml]   [2016]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/19] perf script: Add option to stop printing callchain
    Date
    From: David Ahern <dsa@cumulusnetworks.com>

    Allow user to specify list of symbols which cause the dump of callchains
    to stop at that symbol.

    Committer notes:

    Testing it:

    # perf record -ag usleep 1
    [ perf record: Woken up 1 times to write data ]
    [ perf record: Captured and wrote 1.177 MB perf.data (33 samples) ]
    #
    # # Without it:
    #
    # perf script
    swapper 0 [000] 9693.370039: 1 cycles:ppp:
    2072ad x86_pmu_enable (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a29d7 perf_pmu_enable.part.90 (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a713a ctx_resched (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a76c1 __perf_event_enable (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a0390 event_function (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a1cff remote_function (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    326978 flush_smp_call_function_queue (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    327413 generic_smp_call_function_single_interrupt (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    249b37 smp_call_function_single_interrupt (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    a04b2c call_function_single_interrupt (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    889427 cpuidle_enter (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    2e534a call_cpuidle (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    2e5730 cpu_startup_entry (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    9f5167 rest_init (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    137ffeb start_kernel ([kernel.vmlinux].init.text)
    137f2ca x86_64_start_reservations ([kernel.vmlinux].init.text)
    137f419 x86_64_start_kernel ([kernel.vmlinux].init.text)

    swapper 0 [000] 9693.370044: 1 cycles:ppp:
    20ca1b intel_pmu_handle_irq (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    205b0c perf_event_nmi_handler (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    22a14a nmi_handle (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    22a6b3 default_do_nmi (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    22a83c do_nmi (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    a03fb1 end_repeat_nmi (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a29d7 perf_pmu_enable.part.90 (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a713a ctx_resched (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a76c1 __perf_event_enable (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a0390 event_function (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a1cff remote_function (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    326978 flush_smp_call_function_queue (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    327413 generic_smp_call_function_single_interrupt (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    249b37 smp_call_function_single_interrupt (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    a04b2c call_function_single_interrupt (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    889427 cpuidle_enter (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    2e534a call_cpuidle (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    2e5730 cpu_startup_entry (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    9f5167 rest_init (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    137ffeb start_kernel ([kernel.vmlinux].init.text)
    137f2ca x86_64_start_reservations ([kernel.vmlinux].init.text)
    #
    # # Using it to see just what are the calls from the 'remote_function' function:
    #
    # perf script --stop-bt remote_function
    swapper 0 [000] 9693.370039: 1 cycles:ppp:
    2072ad x86_pmu_enable (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a29d7 perf_pmu_enable.part.90 (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a713a ctx_resched (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a76c1 __perf_event_enable (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a0390 event_function (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a1cff remote_function (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)

    swapper 0 [000] 9693.370044: 1 cycles:ppp:
    20ca1b intel_pmu_handle_irq (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    205b0c perf_event_nmi_handler (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    22a14a nmi_handle (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    22a6b3 default_do_nmi (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    22a83c do_nmi (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    a03fb1 end_repeat_nmi (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a29d7 perf_pmu_enable.part.90 (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a713a ctx_resched (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a76c1 __perf_event_enable (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a0390 event_function (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)
    3a1cff remote_function (/usr/lib/debug/lib/modules/4.8.8-300.fc25.x86_64/vmlinux)

    Signed-off-by: David Ahern <dsa@cumulusnetworks.com>
    Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lkml.kernel.org/r/1480104021-36275-1-git-send-email-dsahern@gmail.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/Documentation/perf-script.txt | 3 +++
    tools/perf/builtin-script.c | 2 ++
    tools/perf/util/evsel_fprintf.c | 8 ++++++++
    tools/perf/util/symbol.c | 8 ++++++++
    tools/perf/util/symbol.h | 6 ++++--
    5 files changed, 25 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
    index c01904f388ce..0f6ee09f7256 100644
    --- a/tools/perf/Documentation/perf-script.txt
    +++ b/tools/perf/Documentation/perf-script.txt
    @@ -212,6 +212,9 @@ OPTIONS
    --hide-call-graph::
    When printing symbols do not display call chain.

    +--stop-bt::
    + Stop display of callgraph at these symbols
    +
    -C::
    --cpu:: Only report samples for the list of CPUs provided. Multiple CPUs can
    be provided as a comma-separated list with no space: 0,1. Ranges of
    diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
    index e1daff36d070..066b4bf73780 100644
    --- a/tools/perf/builtin-script.c
    +++ b/tools/perf/builtin-script.c
    @@ -2151,6 +2151,8 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused)
    "system-wide collection from all CPUs"),
    OPT_STRING('S', "symbols", &symbol_conf.sym_list_str, "symbol[,symbol...]",
    "only consider these symbols"),
    + OPT_STRING(0, "stop-bt", &symbol_conf.bt_stop_list_str, "symbol[,symbol...]",
    + "Stop display of callgraph at these symbols"),
    OPT_STRING('C', "cpu", &cpu_list, "cpu", "list of cpus to profile"),
    OPT_STRING('c', "comms", &symbol_conf.comm_list_str, "comm[,comm...]",
    "only display events for these comms"),
    diff --git a/tools/perf/util/evsel_fprintf.c b/tools/perf/util/evsel_fprintf.c
    index 5a6f52284452..6b2925542c0a 100644
    --- a/tools/perf/util/evsel_fprintf.c
    +++ b/tools/perf/util/evsel_fprintf.c
    @@ -166,6 +166,14 @@ int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,
    if (!print_oneline)
    printed += fprintf(fp, "\n");

    + if (symbol_conf.bt_stop_list &&
    + node->sym &&
    + node->sym->name &&
    + strlist__has_entry(symbol_conf.bt_stop_list,
    + node->sym->name)) {
    + break;
    + }
    +
    first = false;
    next:
    callchain_cursor_advance(cursor);
    diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
    index 420ada9de22f..df2482b2ba45 100644
    --- a/tools/perf/util/symbol.c
    +++ b/tools/perf/util/symbol.c
    @@ -2032,6 +2032,10 @@ int symbol__init(struct perf_env *env)
    symbol_conf.sym_list_str, "symbol") < 0)
    goto out_free_tid_list;

    + if (setup_list(&symbol_conf.bt_stop_list,
    + symbol_conf.bt_stop_list_str, "symbol") < 0)
    + goto out_free_sym_list;
    +
    /*
    * A path to symbols of "/" is identical to ""
    * reset here for simplicity.
    @@ -2049,6 +2053,8 @@ int symbol__init(struct perf_env *env)
    symbol_conf.initialized = true;
    return 0;

    +out_free_sym_list:
    + strlist__delete(symbol_conf.sym_list);
    out_free_tid_list:
    intlist__delete(symbol_conf.tid_list);
    out_free_pid_list:
    @@ -2064,6 +2070,7 @@ void symbol__exit(void)
    {
    if (!symbol_conf.initialized)
    return;
    + strlist__delete(symbol_conf.bt_stop_list);
    strlist__delete(symbol_conf.sym_list);
    strlist__delete(symbol_conf.dso_list);
    strlist__delete(symbol_conf.comm_list);
    @@ -2071,6 +2078,7 @@ void symbol__exit(void)
    intlist__delete(symbol_conf.pid_list);
    vmlinux_path__exit();
    symbol_conf.sym_list = symbol_conf.dso_list = symbol_conf.comm_list = NULL;
    + symbol_conf.bt_stop_list = NULL;
    symbol_conf.initialized = false;
    }

    diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
    index 1bcbefc0c325..6c358b7ed336 100644
    --- a/tools/perf/util/symbol.h
    +++ b/tools/perf/util/symbol.h
    @@ -132,14 +132,16 @@ struct symbol_conf {
    *pid_list_str,
    *tid_list_str,
    *sym_list_str,
    - *col_width_list_str;
    + *col_width_list_str,
    + *bt_stop_list_str;
    struct strlist *dso_list,
    *comm_list,
    *sym_list,
    *dso_from_list,
    *dso_to_list,
    *sym_from_list,
    - *sym_to_list;
    + *sym_to_list,
    + *bt_stop_list;
    struct intlist *pid_list,
    *tid_list;
    const char *symfs;
    --
    2.9.3
    \
     
     \ /
      Last update: 2016-12-01 19:06    [W:3.352 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site