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 v7 04/18] perf ftrace: add option '-m/--buffer-size' to set per-cpu buffer size
Date: Sat, 18 Jul 2020 14:48:12 +0800 [thread overview]
Message-ID: <20200718064826.9865-5-changbin.du@gmail.com> (raw)
In-Reply-To: <20200718064826.9865-1-changbin.du@gmail.com>
This adds an option '-m/--buffer-size' to allow us set the size of per-cpu
tracing buffer.
Signed-off-by: Changbin Du <changbin.du@gmail.com>
---
v2: support units as a suffix.
---
tools/perf/Documentation/perf-ftrace.txt | 5 +++
tools/perf/builtin-ftrace.c | 56 +++++++++++++++++++++++-
2 files changed, 60 insertions(+), 1 deletion(-)
diff --git a/tools/perf/Documentation/perf-ftrace.txt b/tools/perf/Documentation/perf-ftrace.txt
index d79560dea19f..dcac0d75a0e5 100644
--- a/tools/perf/Documentation/perf-ftrace.txt
+++ b/tools/perf/Documentation/perf-ftrace.txt
@@ -52,6 +52,11 @@ OPTIONS
Ranges of CPUs are specified with -: 0-2.
Default is to trace on all online CPUs.
+-m::
+--buffer-size::
+ Set the size of per-cpu tracing buffer, <size> is expected to
+ be a number with appended unit character - B/K/M/G.
+
-T::
--trace-funcs=::
Only trace functions given by the argument. Multiple functions
diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
index 9abf97c29cb6..3ea3aaa4650b 100644
--- a/tools/perf/builtin-ftrace.c
+++ b/tools/perf/builtin-ftrace.c
@@ -26,7 +26,7 @@
#include "thread_map.h"
#include "util/cap.h"
#include "util/config.h"
-
+#include "util/units.h"
struct perf_ftrace {
struct evlist *evlist;
@@ -38,6 +38,7 @@ struct perf_ftrace {
struct list_head graph_funcs;
struct list_head nograph_funcs;
int graph_depth;
+ unsigned long percpu_buffer_size;
};
struct filter_entry {
@@ -323,6 +324,21 @@ static int set_tracing_depth(struct perf_ftrace *ftrace)
return 0;
}
+static int set_tracing_percpu_buffer_size(struct perf_ftrace *ftrace)
+{
+ int ret;
+
+ if (ftrace->percpu_buffer_size == 0)
+ return 0;
+
+ ret = write_tracing_file_int("buffer_size_kb",
+ ftrace->percpu_buffer_size / 1024);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv)
{
char *trace_file;
@@ -387,6 +403,11 @@ static int __cmd_ftrace(struct perf_ftrace *ftrace, int argc, const char **argv)
goto out_reset;
}
+ if (set_tracing_percpu_buffer_size(ftrace) < 0) {
+ pr_err("failed to set tracing per-cpu buffer size\n");
+ goto out_reset;
+ }
+
if (write_tracing_file("current_tracer", ftrace->tracer) < 0) {
pr_err("failed to set current_tracer to %s\n", ftrace->tracer);
goto out_reset;
@@ -506,6 +527,37 @@ static void delete_filter_func(struct list_head *head)
}
}
+static int parse_buffer_size(const struct option *opt,
+ const char *str, int unset)
+{
+ unsigned long *s = (unsigned long *)opt->value;
+ static struct parse_tag tags_size[] = {
+ { .tag = 'B', .mult = 1 },
+ { .tag = 'K', .mult = 1 << 10 },
+ { .tag = 'M', .mult = 1 << 20 },
+ { .tag = 'G', .mult = 1 << 30 },
+ { .tag = 0 },
+ };
+ unsigned long val;
+
+ if (unset) {
+ *s = 0;
+ return 0;
+ }
+
+ val = parse_tag_value(str, tags_size);
+ if (val != (unsigned long) -1) {
+ if (val < 1024) {
+ pr_err("buffer size too small, must larger than 1KB.");
+ return -1;
+ }
+ *s = val;
+ return 0;
+ }
+
+ return -1;
+}
+
int cmd_ftrace(int argc, const char **argv)
{
int ret;
@@ -543,6 +595,8 @@ int cmd_ftrace(int argc, const char **argv)
"Set nograph filter on given functions", parse_filter_func),
OPT_INTEGER('D', "graph-depth", &ftrace.graph_depth,
"Max depth for function graph tracer"),
+ OPT_CALLBACK('m', "buffer-size", &ftrace.percpu_buffer_size, "size",
+ "size of per cpu buffer", parse_buffer_size),
OPT_END()
};
--
2.25.1
next prev parent reply other threads:[~2020-07-18 6:49 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-18 6:48 [PATCH v7 00/18] perf: ftrace enhancement Changbin Du
2020-07-18 6:48 ` [PATCH v7 01/18] perf ftrace: select function/function_graph tracer automatically Changbin Du
2020-08-04 12:51 ` Arnaldo Carvalho de Melo
2020-08-06 0:14 ` Changbin Du
2020-08-06 1:05 ` Arnaldo Carvalho de Melo
2020-08-08 2:22 ` Changbin Du
2020-07-18 6:48 ` [PATCH v7 02/18] perf ftrace: add option '-F/--funcs' to list available functions Changbin Du
2020-07-18 6:48 ` [PATCH v7 03/18] perf ftrace: factor out function write_tracing_file_int() Changbin Du
2020-07-18 6:48 ` Changbin Du [this message]
2020-07-18 6:48 ` [PATCH v7 05/18] perf ftrace: show trace column header Changbin Du
2020-07-18 6:48 ` [PATCH v7 06/18] perf ftrace: add option '--inherit' to trace children processes Changbin Du
2020-07-18 6:48 ` [PATCH v7 07/18] perf: util: add general function to parse sublevel options Changbin Du
2020-07-18 6:48 ` [PATCH v7 08/18] perf ftrace: add support for tracing option 'func_stack_trace' Changbin Du
2020-07-18 6:48 ` [PATCH v7 09/18] perf ftrace: add support for trace option sleep-time Changbin Du
2020-07-18 6:48 ` [PATCH v7 10/18] perf ftrace: add support for trace option funcgraph-irqs Changbin Du
2020-07-18 6:48 ` [PATCH v7 11/18] perf ftrace: add support for tracing option 'irq-info' Changbin Du
2020-07-18 6:48 ` [PATCH v7 12/18] perf ftrace: add option 'verbose' to show more info for graph tracer Changbin Du
2020-07-18 6:48 ` [PATCH v7 13/18] perf ftrace: add support for trace option tracing_thresh Changbin Du
2020-07-18 6:48 ` [PATCH v7 14/18] perf: ftrace: allow set graph depth by '--graph-opts' Changbin Du
2020-07-18 6:48 ` [PATCH v7 15/18] perf ftrace: add option -D/--delay to delay tracing Changbin Du
2020-07-18 6:48 ` [PATCH v7 16/18] perf ftrace: add option --tid to filter by thread id Changbin Du
2020-07-18 6:48 ` [PATCH v7 17/18] perf: ftrace: Add set_tracing_options() to set all trace options Changbin Du
2020-07-18 6:48 ` [PATCH v7 18/18] perf ftrace: add change log Changbin Du
2020-07-21 13:39 ` [PATCH v7 00/18] perf: ftrace enhancement Namhyung Kim
2020-07-31 17:35 ` Changbin Du
2020-07-31 22:42 ` Arnaldo Carvalho de Melo
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=20200718064826.9865-5-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).