From: Wang Nan <wangnan0@huawei.com>
To: <paulus@samba.org>, <a.p.zijlstra@chello.nl>, <mingo@redhat.com>,
<acme@kernel.org>, <namhyung@kernel.org>, <jolsa@kernel.org>,
<adrian.hunter@intel.com>, <dsahern@gmail.com>,
<ast@plumgrid.com>, <daniel@iogearbox.net>,
<brendan.d.gregg@gmail.com>, <masami.hiramatsu.pt@hitachi.com>
Cc: <linux-kernel@vger.kernel.org>, <lizefan@huawei.com>,
<pi3orama@163.com>, <wangnan0@huawei.com>
Subject: [RFC PATCH v2 28/37] tools perf: add 'perf bpf record' subcommand.
Date: Fri, 15 May 2015 07:51:21 +0000 [thread overview]
Message-ID: <1431676290-1230-29-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1431676290-1230-1-git-send-email-wangnan0@huawei.com>
'perf bpf record' will be implemented to load eBPF object file then
start recording on events defined in it. This patch only adds a
'--object' option for selecting object file. Other arguments are
directly passed to cmd_record.
Example:
# perf bpf --object obj1.o --object obj2.o -- -a command-to-record
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
tools/perf/builtin-bpf.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 109 insertions(+), 2 deletions(-)
diff --git a/tools/perf/builtin-bpf.c b/tools/perf/builtin-bpf.c
index a8858e2..b5c613f 100644
--- a/tools/perf/builtin-bpf.c
+++ b/tools/perf/builtin-bpf.c
@@ -48,14 +48,121 @@ static void print_usage(void)
exit(129);
}
-static const char * const bpf_subcommands[] = { NULL };
+static const char * const bpf_record_usage[] = {
+ "perf bpf record [<options>] -- [options passed to record]",
+ NULL
+};
+
+struct param {
+ struct strlist *object_file_names;
+} param;
+
+static int add_bpf_object_file(const struct option *opt,
+ const char *str,
+ int unset __maybe_unused)
+{
+ struct strlist **filenames = (struct strlist **)opt->value;
+
+ if (!*filenames)
+ *filenames = strlist__new(true, NULL);
+
+ if (!*filenames) {
+ pr_err("alloc strlist failed\n");
+ return -ENOMEM;
+ }
+
+ strlist__add(*filenames, str);
+ return 0;
+}
+
+static int start_bpf_record(int argc, const char **argv)
+{
+ int i, new_argc, err, pos = 0;
+ const char **new_argv;
+
+ new_argc = argc + 1;
+ new_argv = malloc((new_argc + 1) * sizeof(const char *));
+ if (!new_argv) {
+ pr_err("malloc failed\n");
+ return -ENOMEM;
+ }
+ bzero(new_argv, sizeof(const char *) * (new_argc + 1));
+
+ new_argv[pos++] = strdup("bpf record --");
+
+ for (i = 0; i < argc; i++) {
+ new_argv[pos++] = strdup(argv[i]);
+ if (!new_argv[pos - 1]) {
+ pr_err("strdup failed\n");
+ err = -ENOMEM;
+ goto errout;
+ }
+ }
+
+ return cmd_record(new_argc, new_argv, NULL);
+
+errout:
+ if (new_argv) {
+ for (i = 0; i < pos; i++)
+ free((void *)new_argv[i]);
+ free(new_argv);
+ }
+ return err;
+}
+
+static int cmd_bpf_record(int argc, const char **argv,
+ const char *prefix __maybe_unused)
+{
+ /*
+ * Options in perf-record may be mirrored here. This command
+ * should add '-e' options to cmd_record.
+ */
+ static const struct option options[] = {
+ OPT_CALLBACK(0, "object", ¶m.object_file_names,
+ "file", "eBPF object file name",
+ add_bpf_object_file),
+ OPT_END()
+ };
+ struct str_node *str_node;
+
+ argc = parse_options(argc, argv, options,
+ bpf_record_usage, PARSE_OPT_KEEP_DASHDASH);
+
+ if (!param.object_file_names) {
+ pr_err("At least one '--object' option is needed to "
+ "select an eBPF object file\n");
+ goto usage;
+ }
+
+ if (!argv || strcmp(argv[0], "--")) {
+ pr_err("Should use '--' to pass options to perf "
+ "record\n");
+ goto usage;
+ }
+
+ /* skip "--" */
+ argc--;
+ argv++;
+
+ strlist__for_each(str_node, param.object_file_names)
+ pr_debug("loading %s\n", str_node->s);
+
+ return start_bpf_record(argc, argv);
+usage:
+ usage_with_options(bpf_record_usage, options);
+ return -1;
+}
+
+
+static const char * const bpf_subcommands[] = { "record", NULL };
static struct bpf_cmd bpf_cmds[] = {
+ { "record", "load eBPF program into kernel then start record on events in it", cmd_bpf_record },
{ .name = NULL, },
};
int cmd_bpf(int argc, const char **argv,
- const char *prefix __maybe_unused)
+ const char *prefix)
{
struct bpf_cmd *cmd;
const char *cmdstr;
--
1.8.3.4
next prev parent reply other threads:[~2015-05-15 7:53 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-15 7:50 [RFC PATCH v2 00/37] perf tools: introduce 'perf bpf' command to load eBPF programs Wang Nan
2015-05-15 7:50 ` [RFC PATCH v2 01/37] tools perf: set vmlinux_path__nr_entries to 0 in vmlinux_path__exit Wang Nan
2015-05-15 7:50 ` [RFC PATCH v2 02/37] tools lib traceevent: install libtraceevent.a into libdir Wang Nan
2015-05-15 7:50 ` [RFC PATCH v2 03/37] tools build: Allow other override features to check Wang Nan
2015-05-15 7:50 ` [RFC PATCH v2 04/37] tools include: add __aligned_u64 to types.h Wang Nan
2015-05-20 12:23 ` [tip:perf/core] " tip-bot for Wang Nan
2015-05-15 7:50 ` [RFC PATCH v2 05/37] tools lib bpf: introduce 'bpf' library to tools Wang Nan
2015-05-15 7:50 ` [RFC PATCH v2 06/37] tools lib bpf: allow set printing function Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 07/37] tools lib bpf: defines basic interface Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 08/37] tools lib bpf: open eBPF object file and do basic validation Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 09/37] tools lib bpf: check swap according to EHDR Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 10/37] tools lib bpf: iterater over elf sections to collect information Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 11/37] tools lib bpf: collect version and license from ELF Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 12/37] tools lib bpf: collect map definitions Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 13/37] tools lib bpf: collect config section in object Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 14/37] tools lib bpf: collect symbol table in object files Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 15/37] tools lib bpf: collect bpf programs from " Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 16/37] tools lib bpf: collect relocation sections from object file Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 17/37] tools lib bpf: collect relocation instructions for each program Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 18/37] tools lib bpf: clean elf memory after loading Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 19/37] tools lib bpf: add bpf.c/h for common bpf operations Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 20/37] tools lib bpf: create maps needed by object file Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 21/37] tools lib bpf: relocation programs Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 22/37] tools lib bpf: introduce bpf_load_program to bpf.c Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 23/37] tools lib bpf: load bpf programs in object file into kernel Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 24/37] tools lib bpf: accessors of bpf_program Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 25/37] tools lib bpf: accessors for struct bpf_object Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 26/37] tools perf: Add new 'perf bpf' command Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 27/37] tools perf: make perf depend on libbpf Wang Nan
2015-05-15 7:51 ` Wang Nan [this message]
2015-05-15 7:51 ` [RFC PATCH v2 29/37] tools perf: add bpf-loader and open elf object files Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 30/37] tools perf: collect all bpf programs Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 31/37] tools perf: config probe points of eBPF programs during prepartion Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 32/37] tools perf bpf: probe at kprobe points Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 33/37] tools perf bpf: load eBPF object into kernel Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 34/37] tools perf: add a bpf_wrapper global flag Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 35/37] tools perf: add bpf_fd field to evsel and introduce new event syntax Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 36/37] tools perf: generate event argv Wang Nan
2015-05-15 7:51 ` [RFC PATCH v2 37/37] tools perf bpf: passes generated arguments to cmd_record Wang Nan
2015-05-15 8:03 ` [RFC PATCH v2 00/37] perf tools: introduce 'perf bpf' command to load eBPF programs Ingo Molnar
2015-05-15 8:40 ` Wangnan (F)
2015-05-15 8:48 ` Ingo Molnar
2015-05-15 9:42 ` Wangnan (F)
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=1431676290-1230-29-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=ast@plumgrid.com \
--cc=brendan.d.gregg@gmail.com \
--cc=daniel@iogearbox.net \
--cc=dsahern@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=masami.hiramatsu.pt@hitachi.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=paulus@samba.org \
--cc=pi3orama@163.com \
/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
all inboxes | Powered by JetHome®