linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: <namhyung@kernel.org>, <alexei.starovoitov@gmail.com>,
	<masami.hiramatsu.pt@hitachi.com>, <acme@kernel.org>,
	<paulus@samba.org>, <a.p.zijlstra@chello.nl>, <mingo@redhat.com>,
	<jolsa@kernel.org>, <dsahern@gmail.com>, <daniel@iogearbox.net>,
	<brendan.d.gregg@gmail.com>
Cc: <lizefan@huawei.com>, <hekuang@huawei.com>, <xiakaixu@huawei.com>,
	<linux-kernel@vger.kernel.org>, <pi3orama@163.com>
Subject: [RFC PATCH v5 25/30] perf tools: Parse probe points of eBPF programs during preparation
Date: Mon, 1 Jun 2015 07:38:11 +0000	[thread overview]
Message-ID: <1433144296-74992-26-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1433144296-74992-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 all 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.

This patch utilizes bpf_program__set_private(), bind perf_probe_event
with bpf program by private field.

Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
 tools/perf/util/bpf-loader.c | 123 ++++++++++++++++++++++++++++++++++++++++++-
 tools/perf/util/bpf-loader.h |   2 +
 2 files changed, 124 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index eef15f3..1022729 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -9,6 +9,8 @@
 #include "perf.h"
 #include "debug.h"
 #include "bpf-loader.h"
+#include "probe-event.h"
+#include "probe-finder.h"
 
 #define DEFINE_PRINT_FN(name, level) \
 static int libbpf_##name(const char *fmt, ...)	\
@@ -28,9 +30,120 @@ DEFINE_PRINT_FN(debug, 1)
 
 static bool libbpf_initialized = false;
 
+static struct perf_probe_event probe_event_array[MAX_PROBES];
+static size_t nr_probe_events;
+
+static struct perf_probe_event *
+alloc_perf_probe_event(void)
+{
+	struct perf_probe_event *pev;
+	int n = nr_probe_events;
+	if (n >= MAX_PROBES) {
+		pr_err("bpf: too many events, increase MAX_PROBES\n");
+		return NULL;
+	}
+
+	nr_probe_events = n + 1;
+	pev = &probe_event_array[n];
+	bzero(pev, sizeof(*pev));
+	return pev;
+}
+
+struct bpf_prog_priv {
+	struct perf_probe_event *pev;
+};
+
+static void
+bpf_prog_priv__clear(struct bpf_program *prog __maybe_unused,
+			  void *_priv)
+{
+	struct bpf_prog_priv *priv = _priv;
+	if (priv->pev)
+		clear_perf_probe_event(priv->pev);
+	free(priv);
+}
+
+static int
+config_bpf_program(struct bpf_program *prog)
+{
+	struct perf_probe_event *pev = alloc_perf_probe_event();
+	struct bpf_prog_priv *priv = NULL;
+	const char *config_str;
+	int err;
+
+	/* pr_err has been done by alloc_perf_probe_event */
+	if (!pev)
+		return -ENOMEM;
+
+	err = bpf_program__get_title(prog, &config_str, false);
+	if (err || !config_str) {
+		pr_err("bpf: unable to get title for program\n");
+		return -EINVAL;
+	}
+
+	pr_debug("bpf: config program '%s'\n", config_str);
+	err = parse_perf_probe_command(config_str, pev);
+	if (err < 0) {
+		pr_err("bpf: '%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: '%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: strdup failed\n");
+		err = -ENOMEM;
+		goto errout;
+	}
+
+	if (!pev->event) {
+		pr_err("bpf: '%s': event name is missing\n",
+		       config_str);
+		err = -EINVAL;
+		goto errout;
+	}
+
+	pr_debug("bpf: config '%s' is ok\n", config_str);
+
+	priv = calloc(1, sizeof(*priv));
+	if (!priv) {
+		pr_err("bpf: failed to alloc memory\n");
+		err = -ENOMEM;
+		goto errout;
+	}
+
+	priv->pev = pev;
+	
+	err = bpf_program__set_private(prog, priv,
+				       bpf_prog_priv__clear);
+	if (err) {
+		pr_err("bpf: set program private failed\n");
+		err = -ENOMEM;
+		goto errout;
+	}
+	return 0;
+
+errout:
+	if (pev)
+		clear_perf_probe_event(pev);
+	if (priv)
+		free(priv);
+	return err;
+}
+
 int bpf__prepare_load(const char *filename)
 {
 	struct bpf_object *obj;
+	struct bpf_program *prog;
+	int err = 0;
 
 	if (!libbpf_initialized)
 		libbpf_set_print(libbpf_warning,
@@ -43,12 +156,20 @@ int bpf__prepare_load(const char *filename)
 		return -EINVAL;
 	}
 
+	bpf_object__for_each_program(prog, obj) {
+		err = config_bpf_program(prog);
+		if (err)
+			goto errout;
+	}
+
 	/*
 	 * Throw object pointer away: it will be retrived using
 	 * bpf_objects iterater.
 	 */
-
 	return 0;
+errout:
+	bpf_object__close(obj);
+	return err;
 }
 
 void bpf__clear(void)
diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h
index 39d8d1a..9d1582f 100644
--- a/tools/perf/util/bpf-loader.h
+++ b/tools/perf/util/bpf-loader.h
@@ -8,6 +8,8 @@
 #include <linux/compiler.h>
 #include "debug.h"
 
+#define PERF_BPF_PROBE_GROUP "perf_bpf_probe"
+
 #ifdef HAVE_LIBBPF_SUPPORT
 int bpf__prepare_load(const char *filename);
 
-- 
1.8.3.4


  parent reply	other threads:[~2015-06-01 10:02 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-01  7:37 [RFC PATCH v5 00/30] perf tools: filtering events using eBPF programs Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 01/30] perf tools: Move linux/kernel.h to tools/include Wang Nan
2015-06-04 14:11   ` [tip:perf/core] " tip-bot for Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 02/30] perf tools: Move linux/{list.h,poison.h} " Wang Nan
2015-06-04 14:11   ` [tip:perf/core] tools: Move tools/perf/util/include/linux/{list.h ,poison.h} " tip-bot for Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 03/30] tools build: Add feature check for eBPF API Wang Nan
2015-06-02 22:11   ` Arnaldo Carvalho de Melo
2015-06-03  1:15     ` Wangnan (F)
2015-06-03 13:47       ` Arnaldo Carvalho de Melo
2015-06-01  7:37 ` [RFC PATCH v5 04/30] bpf tools: Introduce 'bpf' library to tools Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 05/30] bpf tools: Allow caller to set printing function Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 06/30] bpf tools: Open eBPF object file and do basic validation Wang Nan
2015-06-03 21:33   ` Arnaldo Carvalho de Melo
2015-06-03 21:35     ` Arnaldo Carvalho de Melo
2015-06-04  2:18       ` Wangnan (F)
2015-06-01  7:37 ` [RFC PATCH v5 07/30] bpf tools: Check endianess and make libbpf fail early Wang Nan
2015-06-03 21:52   ` Arnaldo Carvalho de Melo
2015-06-01  7:37 ` [RFC PATCH v5 08/30] bpf tools: Iterate over ELF sections to collect information Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 09/30] bpf tools: Collect version and license from ELF sections Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 10/30] bpf tools: Collect map definitions from 'maps' section Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 11/30] bpf tools: Collect symbol table from SHT_SYMTAB section Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 12/30] bpf tools: Collect eBPF programs from their own sections Wang Nan
2015-06-01  7:37 ` [RFC PATCH v5 13/30] bpf tools: Collect relocation sections from SHT_REL sections Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 14/30] bpf tools: Record map accessing instructions for each program Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 15/30] bpf tools: Add bpf.c/h for common bpf operations Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 16/30] bpf tools: Create eBPF maps defined in an object file Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 17/30] bpf tools: Relocate eBPF programs Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 18/30] bpf tools: Introduce bpf_load_program() to bpf.c Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 19/30] bpf tools: Load eBPF programs in object files into kernel Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 20/30] bpf tools: Introduce accessors for struct bpf_program Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 21/30] bpf tools: Introduce accessors for struct bpf_object Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 22/30] bpf tools: Link all bpf objects onto a list Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 23/30] perf tools: Make perf depend on libbpf Wang Nan
2015-06-03  2:45   ` [RFC PATCH v6 " Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 24/30] perf record: Enable passing bpf object file to --event Wang Nan
2015-06-01  7:38 ` Wang Nan [this message]
2015-06-01  7:38 ` [RFC PATCH v5 26/30] perf probe: Attach trace_probe_event with perf_probe_event Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 27/30] perf record: Probe at kprobe points Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 28/30] perf record: Load all eBPF object into kernel Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 29/30] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-06-01  7:38 ` [RFC PATCH v5 30/30] perf tools: Attach eBPF program to perf event Wang Nan
2015-06-02  0:48 ` [RFC PATCH v5 00/30] perf tools: filtering events using eBPF programs Alexei Starovoitov
2015-06-02  1:15   ` 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=1433144296-74992-26-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=alexei.starovoitov@gmail.com \
    --cc=brendan.d.gregg@gmail.com \
    --cc=daniel@iogearbox.net \
    --cc=dsahern@gmail.com \
    --cc=hekuang@huawei.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 \
    --cc=xiakaixu@huawei.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;
as well as URLs for NNTP newsgroup(s).