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 31/37] tools perf: config probe points of eBPF programs during prepartion.
Date: Fri, 15 May 2015 07:51:24 +0000 [thread overview]
Message-ID: <1431676290-1230-32-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1431676290-1230-1-git-send-email-wangnan0@huawei.com>
This patch parses section name of each program, and creates
corresponding 'struct perf_probe_event' structure.
parse_perf_probe_command() is used to do the main parsing works.
Parsing result is stored into a global array. This is because
add_perf_probe_events() is non-reentrantable. In following patch,
add_perf_probe_events will be introduced to insert kprobes. It accepts
an array of 'struct perf_probe_event' and do works in one call.
Define PERF_BPF_PROBE_GROUP as "perf_bpf_probe", which will be used
as group name of all eBPF probing points.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
tools/perf/util/bpf-loader.c | 74 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index 67bfb62..3dc9b61 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -29,6 +29,7 @@ DEFINE_PRINT_FN(debug, 1)
static bool libbpf_inited = false;
#define MAX_OBJECTS 128
+#define PERF_BPF_PROBE_GROUP "perf_bpf_probe"
struct {
struct bpf_object *objects[MAX_OBJECTS];
@@ -36,10 +37,78 @@ struct {
struct {
struct bpf_prog_handler *prog;
+ struct perf_probe_event *pevent;
} progs[MAX_PROBES];
size_t nr_progs;
+
+ struct perf_probe_event event_array[MAX_PROBES];
+ size_t nr_events;
} params;
+static struct perf_probe_event *
+alloc_perf_probe_event(void)
+{
+ struct perf_probe_event *pev;
+ int n = params.nr_events;
+
+ if (n >= MAX_PROBES) {
+ pr_err("bpf: too many events, increase MAX_PROBES\n");
+ return NULL;
+ }
+
+ params.nr_events = n + 1;
+ pev = ¶ms.event_array[n];
+ bzero(pev, sizeof(*pev));
+ return pev;
+}
+
+static int
+bpf_do_config(size_t prog_idx, const char *config_str)
+{
+ struct perf_probe_event *pev = alloc_perf_probe_event();
+ int err = 0;
+
+ if (!pev)
+ return -ENOMEM;
+
+ if ((err = parse_perf_probe_command(config_str, pev)) < 0) {
+ pr_err("bpf config: %s is not a valid config string\n",
+ config_str);
+ /* parse failed, don't need clear pev. */
+ return -EINVAL;
+ }
+
+ if (pev->group && strcmp(pev->group, PERF_BPF_PROBE_GROUP)) {
+ pr_err("bpf config: '%s': group for event is set "
+ "and not '%s'.\n", config_str,
+ PERF_BPF_PROBE_GROUP);
+ err = -EINVAL;
+ goto errout;
+ } else if (!pev->group)
+ pev->group = strdup(PERF_BPF_PROBE_GROUP);
+
+ if (!pev->group) {
+ pr_err("bpf config: strdup failed\n");
+ err = -ENOMEM;
+ goto errout;
+ }
+
+ if (!pev->event) {
+ pr_err("bpf config: '%s': event name is missing\n",
+ config_str);
+ err = -EINVAL;
+ goto errout;
+ }
+
+ pr_debug("bpf config: config '%s' ok\n", config_str);
+ params.progs[prog_idx].pevent = pev;
+ return 0;
+errout:
+ if (pev)
+ clear_perf_probe_event(pev);
+ return err;
+}
+
int bpf_prepare_load(const char *filename)
{
struct bpf_object *obj;
@@ -81,6 +150,8 @@ int bpf_prepare_load(const char *filename)
return -EINVAL;
}
pr_debug("bpf: add program '%s'\n", title);
+
+ bpf_do_config(params.nr_progs - 1, title);
}
return 0;
}
@@ -89,6 +160,9 @@ void bpf_clear(void)
{
size_t i;
+ for (i = 0; i < params.nr_events; i++)
+ clear_perf_probe_event(¶ms.event_array[i]);
+
for (i = 0; i < params.nr_objects; i++)
bpf_close_object(params.objects[i]);
}
--
1.8.3.4
next prev parent reply other threads:[~2015-05-15 8:00 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 ` [RFC PATCH v2 28/37] tools perf: add 'perf bpf record' subcommand Wang Nan
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 ` Wang Nan [this message]
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-32-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®