From: Changbin Du <changbin.du@gmail.com>
To: Jiri Olsa <jolsa@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Namhyung Kim <namhyung@kernel.org>,
Steven Rostedt <rostedt@goodmis.org>,
linux-kernel@vger.kernel.org, Changbin Du <changbin.du@gmail.com>
Subject: [PATCH v3 10/17] perf ftrace: add support for tracing option 'func_stack_trace'
Date: Thu, 9 Jul 2020 00:45:58 +0800 [thread overview]
Message-ID: <20200708164605.31245-11-changbin.du@gmail.com> (raw)
In-Reply-To: <20200708164605.31245-1-changbin.du@gmail.com>
This adds support to display call trace for function tracer. To do this,
just specify a '--func-opts call-graph' option.
$ sudo perf ftrace -T vfs_read --func-opts call-graph
iio-sensor-prox-855 [003] 6168.369657: vfs_read <-ksys_read
iio-sensor-prox-855 [003] 6168.369677: <stack trace>
=> vfs_read
=> ksys_read
=> __x64_sys_read
=> do_syscall_64
=> entry_SYSCALL_64_after_hwframe
...
Signed-off-by: Changbin Du <changbin.du@gmail.com>
---
v3: switch to uniform option --func-opts.
v2: option name '-s' -> '--func-call-graph'
---
tools/perf/Documentation/perf-ftrace.txt | 4 +++
tools/perf/builtin-ftrace.c | 42 ++++++++++++++++++++++++
2 files changed, 46 insertions(+)
diff --git a/tools/perf/Documentation/perf-ftrace.txt b/tools/perf/Documentation/perf-ftrace.txt
index 27381c0dafe7..eba0e85aa308 100644
--- a/tools/perf/Documentation/perf-ftrace.txt
+++ b/tools/perf/Documentation/perf-ftrace.txt
@@ -82,6 +82,10 @@ OPTIONS
(or glob patterns). It will be passed to 'set_ftrace_notrace'
in tracefs.
+--func-opts::
+ List of options allowed to set:
+ call-graph - Display kernel stack trace for function tracer.
+
-G::
--graph-funcs=::
Set graph filter on the given function (or a glob pattern).
diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
index ab1435c2cd0e..095471593d68 100644
--- a/tools/perf/builtin-ftrace.c
+++ b/tools/perf/builtin-ftrace.c
@@ -27,6 +27,7 @@
#include "util/cap.h"
#include "util/config.h"
#include "util/units.h"
+#include "util/util.h"
struct perf_ftrace {
struct evlist *evlist;
@@ -41,6 +42,7 @@ struct perf_ftrace {
unsigned initial_delay;
unsigned long percpu_buffer_size;
bool inherit;
+ int func_stack_trace;
};
struct filter_entry {
@@ -198,6 +200,7 @@ static void reset_tracing_filters(void);
static void reset_tracing_options(struct perf_ftrace *ftrace __maybe_unused)
{
write_tracing_option_file("function-fork", "0");
+ write_tracing_option_file("func_stack_trace", "0");
}
static int reset_tracing_files(struct perf_ftrace *ftrace __maybe_unused)
@@ -274,6 +277,17 @@ static int set_tracing_cpu(struct perf_ftrace *ftrace)
return set_tracing_cpumask(cpumap);
}
+static int set_tracing_func_stack_trace(struct perf_ftrace *ftrace)
+{
+ if (!ftrace->func_stack_trace)
+ return 0;
+
+ if (write_tracing_option_file("func_stack_trace", "1") < 0)
+ return -1;
+
+ return 0;
+}
+
static int reset_tracing_cpu(void)
{
struct perf_cpu_map *cpumap = perf_cpu_map__new(NULL);
@@ -422,6 +436,11 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv)
goto out_reset;
}
+ if (set_tracing_func_stack_trace(ftrace) < 0) {
+ pr_err("failed to set tracing option func_stack_trace\n");
+ goto out_reset;
+ }
+
if (set_tracing_filters(ftrace) < 0) {
pr_err("failed to set tracing filters\n");
goto out_reset;
@@ -605,6 +624,26 @@ static int parse_buffer_size(const struct option *opt,
return -1;
}
+static int parse_func_tracer_opts(const struct option *opt,
+ const char *str, int unset)
+{
+ int ret;
+ struct perf_ftrace *ftrace = (struct perf_ftrace *) opt->value;
+ struct sublevel_option func_tracer_opts[] = {
+ { .name = "call-graph", .value_ptr = &ftrace->func_stack_trace },
+ { .name = NULL, }
+ };
+
+ if (unset)
+ return 0;
+
+ ret = perf_parse_sublevel_options(str, func_tracer_opts);
+ if (ret)
+ return ret;
+
+ return 0;
+}
+
int cmd_ftrace(int argc, const char **argv)
{
int ret;
@@ -637,6 +676,9 @@ int cmd_ftrace(int argc, const char **argv)
parse_filter_func),
OPT_CALLBACK('N', "notrace-funcs", &ftrace.notrace, "func",
"do not trace given functions", parse_filter_func),
+ OPT_CALLBACK(0, "func-opts", &ftrace, "options",
+ "function tracer options, available options: call-graph",
+ parse_func_tracer_opts),
OPT_CALLBACK('G', "graph-funcs", &ftrace.graph_funcs, "func",
"trace given functions using function_graph tracer",
parse_filter_func),
--
2.25.1
next prev parent reply other threads:[~2020-07-08 16:47 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 16:45 [PATCH v3 00/17] perf: ftrace enhancement Changbin Du
2020-07-08 16:45 ` [PATCH v3 01/17] perf ftrace: select function/function_graph tracer automatically Changbin Du
2020-07-08 16:45 ` [PATCH v3 02/17] perf ftrace: add option '-F/--funcs' to list available functions Changbin Du
2020-07-08 16:45 ` [PATCH v3 03/17] perf ftrace: add option -t/--tid to filter by thread id Changbin Du
2020-07-08 16:45 ` [PATCH v3 04/17] perf ftrace: add option -d/--delay to delay tracing Changbin Du
2020-07-08 16:45 ` [PATCH v3 05/17] perf ftrace: factor out function write_tracing_file_int() Changbin Du
2020-07-08 16:45 ` [PATCH v3 06/17] perf ftrace: add option '-m/--buffer-size' to set per-cpu buffer size Changbin Du
2020-07-08 16:45 ` [PATCH v3 07/17] perf ftrace: show trace column header Changbin Du
2020-07-08 16:45 ` [PATCH v3 08/17] perf ftrace: add option '--inherit' to trace children processes Changbin Du
2020-07-08 16:45 ` [PATCH v3 09/17] perf: util: add general function to parse sublevel options Changbin Du
2020-07-08 17:34 ` Arnaldo Carvalho de Melo
2020-07-10 13:14 ` Changbin Du
2020-07-08 16:45 ` Changbin Du [this message]
2020-07-08 16:45 ` [PATCH v3 11/17] perf ftrace: add support for trace option sleep-time Changbin Du
2020-07-08 16:46 ` [PATCH v3 12/17] perf ftrace: add support for trace option funcgraph-irqs Changbin Du
2020-07-08 16:46 ` [PATCH v3 13/17] perf ftrace: add support for tracing option 'irq-info' Changbin Du
2020-07-08 16:46 ` [PATCH v3 14/17] perf ftrace: add option 'verbose' to show more info for graph tracer Changbin Du
2020-07-08 16:46 ` [PATCH v3 15/17] perf ftrace: add support for trace option tracing_thresh Changbin Du
2020-07-08 16:46 ` [PATCH v3 16/17] perf: ftrace: allow set graph depth by '--graph-opts' Changbin Du
2020-07-08 16:46 ` [PATCH v3 17/17] perf ftrace: add change log Changbin Du
2020-07-08 17:39 ` [PATCH v3 00/17] perf: ftrace enhancement Arnaldo Carvalho de Melo
2020-07-10 13:35 ` Changbin Du
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200708164605.31245-11-changbin.du@gmail.com \
--to=changbin.du@gmail.com \
--cc=acme@kernel.org \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).