perf script: Add option --show-text-poke-events

Consistent with other new events, add an option to perf script to
display text poke events and ksymbol events. Both text poke events and
ksymbol events are displayed because some text pokes (e.g. ftrace
trampolines) have corresponding ksymbol events.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Steven Rostedt (VMware) <rostedt@goodmis.org>
Cc: x86@kernel.org
Link: http://lore.kernel.org/lkml/20200512121922.8997-15-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/Documentation/perf-script.txt b/tools/perf/Documentation/perf-script.txt
index 372dfd110e6d61237d7e40cd017725966d875789..4f712fb8f175df89cdd9efced1d0a334d649b092 100644 (file)
--- a/tools/perf/Documentation/perf-script.txt
+++ b/tools/perf/Documentation/perf-script.txt
@@ -322,6 +322,10 @@ OPTIONS
 --show-cgroup-events
        Display cgroup events i.e. events of type PERF_RECORD_CGROUP.
 
+--show-text-poke-events
+       Display text poke events i.e. events of type PERF_RECORD_TEXT_POKE and
+       PERF_RECORD_KSYMBOL.
+
 --demangle::
        Demangle symbol names to human readable form. It's enabled by default,
        disable with --no-demangle.

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 366e7adbafe93bbe024fc8598e2973f37e5eb053..bd81cc1b062e192c156bd9205977883af4222b37 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -1678,6 +1678,7 @@ struct perf_script {
        bool                    show_round_events;
        bool                    show_bpf_events;
        bool                    show_cgroup_events;
+       bool                    show_text_poke_events;
        bool                    allocated;
        bool                    per_event_dump;
        bool                    stitch_lbr;
@@ -2329,6 +2330,18 @@ process_bpf_events(struct perf_tool *tool __maybe_unused,
                           sample->tid);
 }
 
+static int process_text_poke_events(struct perf_tool *tool,
+                                   union perf_event *event,
+                                   struct perf_sample *sample,
+                                   struct machine *machine)
+{
+       if (perf_event__process_text_poke(tool, event, sample, machine) < 0)
+               return -1;
+
+       return print_event(tool, event, sample, machine, sample->pid,
+                          sample->tid);
+}
+
 static void sig_handler(int sig __maybe_unused)
 {
        session_done = 1;
@@ -2437,6 +2450,10 @@ static int __cmd_script(struct perf_script *script)
                script->tool.ksymbol = process_bpf_events;
                script->tool.bpf     = process_bpf_events;
        }
+       if (script->show_text_poke_events) {
+               script->tool.ksymbol   = process_bpf_events;
+               script->tool.text_poke = process_text_poke_events;
+       }
 
        if (perf_script__setup_per_event_dump(script)) {
                pr_err("Couldn't create the per event dump files\n");
@@ -3473,6 +3490,8 @@ int cmd_script(int argc, const char **argv)
                    "Show round events (if recorded)"),
        OPT_BOOLEAN('\0', "show-bpf-events", &script.show_bpf_events,
                    "Show bpf related events (if recorded)"),
+       OPT_BOOLEAN('\0', "show-text-poke-events", &script.show_text_poke_events,
+                   "Show text poke related events (if recorded)"),
        OPT_BOOLEAN('\0', "per-event-dump", &script.per_event_dump,
                    "Dump trace output to files named by the monitored events"),
        OPT_BOOLEAN('f', "force", &symbol_conf.force, "don't complain, do it"),