From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <ast@plumgrid.com>, <brendan.d.gregg@gmail.com>
Cc: <a.p.zijlstra@chello.nl>, <daniel@iogearbox.net>,
<dsahern@gmail.com>, <hekuang@huawei.com>, <jolsa@kernel.org>,
<lizefan@huawei.com>, <masami.hiramatsu.pt@hitachi.com>,
<namhyung@kernel.org>, <paulus@samba.org>,
<linux-kernel@vger.kernel.org>, <pi3orama@163.com>,
<xiakaixu@huawei.com>, Wang Nan <wangnan0@huawei.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 28/31] perf tools: Add API to config maps in bpf object
Date: Wed, 14 Oct 2015 12:41:39 +0000 [thread overview]
Message-ID: <1444826502-49291-29-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1444826502-49291-1-git-send-email-wangnan0@huawei.com>
bpf__config_obj() is introduced as a core API to config BPF object
after loading. One configuration option of maps is introduced. After
this patch BPF object can accept configuration like:
maps.my_pmy.event=evt
Where evt is a predefined event with alias "evt".
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Signed-off-by: He Kuang <hekuang@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: David Ahern <dsahern@gmail.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kaixu Xia <xiakaixu@huawei.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/n/ebpf-36xcrahy9n0ayc05mu7aajpk@git.kernel.org
---
tools/perf/util/bpf-loader.c | 147 +++++++++++++++++++++++++++++++++++++++++++
tools/perf/util/bpf-loader.h | 39 ++++++++++++
2 files changed, 186 insertions(+)
diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c
index 73ff9a9..b92c2f7 100644
--- a/tools/perf/util/bpf-loader.c
+++ b/tools/perf/util/bpf-loader.c
@@ -10,6 +10,7 @@
#include <linux/err.h>
#include "perf.h"
#include "debug.h"
+#include "util.h"
#include "bpf-loader.h"
#include "bpf-prologue.h"
#include "llvm-utils.h"
@@ -633,6 +634,139 @@ int bpf__foreach_tev(struct bpf_object *obj,
return 0;
}
+struct bpf_map_priv {
+ struct perf_evsel *evsel;
+};
+
+static void
+bpf_map_priv__clear(struct bpf_map *map __maybe_unused,
+ void *_priv)
+{
+ struct bpf_map_priv *priv = _priv;
+
+ free(priv);
+}
+
+static int
+bpf__config_obj_map_event(struct bpf_map *map, const char *val,
+ struct perf_evlist *evlist)
+{
+ struct bpf_map_priv *priv;
+ struct perf_evsel *evsel;
+ struct bpf_map_def def;
+ const char *map_name;
+ int err;
+
+ map_name = bpf_map__get_name(map);
+
+ evsel = perf_evlist__find_evsel_by_alias(evlist, val);
+ if (!evsel) {
+ pr_debug("Event '%s' doesn't exist\n", val);
+ return -EINVAL;
+ }
+
+ err = bpf_map__get_def(map, &def);
+ if (err) {
+ pr_debug("Unable to get map definition from '%s'\n",
+ map_name);
+ return -EINVAL;
+ }
+
+ if (def.type != BPF_MAP_TYPE_PERF_EVENT_ARRAY) {
+ pr_debug("Map %s type is not BPF_MAP_TYPE_PERF_EVENT_ARRAY\n",
+ map_name);
+ return -EINVAL;
+ }
+
+ priv = calloc(sizeof(*priv), 1);
+ if (!priv) {
+ pr_debug("No enough memory to alloc map private\n");
+ return -ENOMEM;
+ }
+
+ priv->evsel = evsel;
+ return bpf_map__set_private(map, priv, bpf_map_priv__clear);
+}
+
+struct bpf_config_map_func {
+ const char *config_opt;
+ int (*config_func)(struct bpf_map *, const char *,
+ struct perf_evlist *);
+};
+
+struct bpf_config_map_func bpf_config_map_funcs[] = {
+ {"event", bpf__config_obj_map_event},
+};
+
+static int
+bpf__config_obj_map(struct bpf_object *obj,
+ const char *key,
+ const char *val,
+ struct perf_evlist *evlist)
+{
+ /* key is "maps.<mapname>.<config opt>" */
+ char *map_name = strdup(key + sizeof("maps.") - 1);
+ struct bpf_map *map;
+ int err = -ENOENT;
+ char *map_opt;
+ size_t i;
+
+ if (!map_name)
+ return -ENOMEM;
+
+ map_opt = strchr(map_name, '.');
+ if (!map_opt) {
+ pr_debug("ERROR: Invalid map config: %s\n", map_name);
+ goto out;
+ }
+
+ *map_opt++ = '\0';
+ if (*map_opt == '\0') {
+ pr_debug("ERROR: Invalid map option: %s\n", key);
+ goto out;
+ }
+
+ map = bpf_object__get_map_by_name(obj, map_name);
+ if (!map) {
+ pr_debug("ERROR: Map %s doesn't exist\n", map_name);
+ goto out;
+ }
+
+ for (i = 0; i < ARRAY_SIZE(bpf_config_map_funcs); i++) {
+ struct bpf_config_map_func *func = &bpf_config_map_funcs[i];
+
+ if (strcmp(map_opt, func->config_opt) == 0) {
+ err = func->config_func(map, val, evlist);
+ goto out;
+ }
+ }
+
+ pr_debug("ERROR: invalid config option '%s' for maps\n",
+ map_opt);
+ err = -ENOENT;
+out:
+ free(map_name);
+ return err;
+}
+
+int bpf__config_obj(struct bpf_object *obj,
+ const char *key,
+ struct bpf_config_val *val,
+ struct perf_evlist *evlist)
+{
+ if (!obj || !key || !val)
+ return -ENODEV;
+
+ if (!prefixcmp(key, "maps.")) {
+ if (val->type != BPF_CONFIG_VAL_STRING) {
+ pr_debug("ERROR: incorrect value type\n");
+ return -EINVAL;
+ }
+ return bpf__config_obj_map(obj, key, val->string, evlist);
+ }
+ return -ENODEV;
+}
+
#define bpf__strerror_head(err, buf, size) \
char sbuf[STRERR_BUFSIZE], *emsg;\
if (!size)\
@@ -675,3 +809,16 @@ int bpf__strerror_load(struct bpf_object *obj __maybe_unused,
bpf__strerror_end(buf, size);
return 0;
}
+
+int bpf__strerror_config_obj(struct bpf_object *obj __maybe_unused,
+ const char *key, struct bpf_config_val *val,
+ struct perf_evlist *evlist __maybe_unused,
+ int err, char *buf, size_t size)
+{
+ bpf__strerror_head(err, buf, size);
+ bpf__strerror_entry(ENODEV, "Invalid config option: '%s'", key)
+ bpf__strerror_entry(ENOENT, "Config target in '%s' is invalid", key)
+ bpf__strerror_entry(EINVAL, "Invalid config value %s", val)
+ bpf__strerror_end(buf, size);
+ return 0;
+}
diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h
index d8f1945..4c99b21 100644
--- a/tools/perf/util/bpf-loader.h
+++ b/tools/perf/util/bpf-loader.h
@@ -9,6 +9,7 @@
#include <linux/err.h>
#include <string.h>
#include "probe-event.h"
+#include "evlist.h"
#include "debug.h"
struct bpf_object;
@@ -17,6 +18,17 @@ struct bpf_object;
typedef int (*bpf_prog_iter_callback_t)(struct probe_trace_event *tev,
int fd, void *arg);
+struct bpf_config_val {
+ enum {
+ BPF_CONFIG_VAL_STRING,
+ BPF_CONFIG_VAL_NUM,
+ } type;
+ union {
+ const char *string;
+ unsigned long long num;
+ };
+};
+
#ifdef HAVE_LIBBPF_SUPPORT
struct bpf_object *bpf__prepare_load(const char *filename, bool source);
struct bpf_object *bpf__prepare_load_buffer(void *obj_buf, size_t obj_buf_sz,
@@ -34,6 +46,13 @@ int bpf__strerror_load(struct bpf_object *obj, int err,
char *buf, size_t size);
int bpf__foreach_tev(struct bpf_object *obj,
bpf_prog_iter_callback_t func, void *arg);
+
+int bpf__config_obj(struct bpf_object *obj, const char *key,
+ struct bpf_config_val *val, struct perf_evlist *evlist);
+int bpf__strerror_config_obj(struct bpf_object *obj,
+ const char *key, struct bpf_config_val *val,
+ struct perf_evlist *evlist,
+ int err, char *buf, size_t size);
#else
static inline struct bpf_object *
bpf__prepare_load(const char *filename __maybe_unused,
@@ -65,6 +84,15 @@ bpf__foreach_tev(struct bpf_object *obj __maybe_unused,
}
static inline int
+bpf__config_obj(struct bpf_object *obj __maybe_unused,
+ const char *key __maybe_unused,
+ struct bpf_config_val *val __maybe_unused,
+ struct perf_evlist *evlist __maybe_unused)
+{
+ return 0;
+}
+
+static inline int
__bpf_strerror(char *buf, size_t size)
{
if (!size)
@@ -90,5 +118,16 @@ static inline int bpf__strerror_load(struct bpf_object *obj __maybe_unused,
{
return __bpf_strerror(buf, size);
}
+
+static inline int
+bpf__strerror_config_obj(struct bpf_object *obj __maybe_unused,
+ const char *key __maybe_unused,
+ struct bpf_config_val *val __maybe_unused,
+ struct perf_evlist *evlist __maybe_unused,
+ int err __maybe_unused,
+ char *buf, size_t size)
+{
+ return __bpf_strerror(buf, size);
+}
#endif
#endif
--
1.8.3.4
next prev parent reply other threads:[~2015-10-14 12:43 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-14 12:41 [GIT PULL 00/31] perf tools: filtering events using eBPF programs Wang Nan
2015-10-14 12:41 ` [PATCH 01/31] perf tools: Make perf depend on libbpf Wang Nan
2015-10-29 12:21 ` [tip:perf/core] " tip-bot for Wang Nan
2015-10-14 12:41 ` [PATCH 02/31] perf ebpf: Add the libbpf glue Wang Nan
2015-10-29 12:21 ` [tip:perf/core] " tip-bot for Wang Nan
2015-10-14 12:41 ` [PATCH 03/31] perf tools: Enable passing bpf object file to --event Wang Nan
2015-10-20 15:12 ` Arnaldo Carvalho de Melo
2015-10-20 15:15 ` Arnaldo Carvalho de Melo
2015-10-20 15:42 ` Arnaldo Carvalho de Melo
2015-10-21 2:01 ` Wangnan (F)
2015-10-21 1:55 ` Wangnan (F)
2015-10-29 12:22 ` [tip:perf/core] " tip-bot for Wang Nan
2015-10-14 12:41 ` [PATCH 04/31] perf record, bpf: Create probe points for BPF programs Wang Nan
2015-10-20 19:12 ` Arnaldo Carvalho de Melo
2015-10-20 19:16 ` David Ahern
2015-10-20 19:21 ` Arnaldo Carvalho de Melo
2015-10-20 20:34 ` Arnaldo Carvalho de Melo
2015-10-21 2:27 ` Wangnan (F)
2015-10-21 3:31 ` Wangnan (F)
2015-10-21 13:28 ` Arnaldo Carvalho de Melo
2015-10-22 16:13 ` Arnaldo Carvalho de Melo
2015-10-29 12:22 ` [tip:perf/core] perf tools: " tip-bot for Wang Nan
2015-10-14 12:41 ` [PATCH 05/31] perf record: Load eBPF object into kernel Wang Nan
2015-10-23 16:58 ` Arnaldo Carvalho de Melo
2015-10-24 0:27 ` Arnaldo Carvalho de Melo
2015-10-26 7:18 ` Wangnan (F)
2015-10-24 1:18 ` pi3orama
2015-10-29 12:22 ` [tip:perf/core] perf tools: " tip-bot for Wang Nan
2015-10-14 12:41 ` [PATCH 06/31] perf tools: Collect perf_evsel in BPF object files Wang Nan
2015-10-29 12:23 ` [tip:perf/core] perf bpf: " tip-bot for Wang Nan
2015-10-14 12:41 ` [PATCH 07/31] perf tools: Attach eBPF program to perf event Wang Nan
2015-10-30 9:13 ` [tip:perf/core] perf bpf: Attach eBPF filter " tip-bot for Wang Nan
2015-10-14 12:41 ` [PATCH 08/31] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-10-30 9:14 ` [tip:perf/core] " tip-bot for Wang Nan
2015-10-14 12:41 ` [PATCH 09/31] perf tools: Compile scriptlets to BPF objects when passing '.c' to --event Wang Nan
2015-10-14 15:45 ` Namhyung Kim
2015-10-15 2:10 ` Wangnan (F)
2015-10-29 16:25 ` Arnaldo Carvalho de Melo
2015-10-29 16:30 ` Arnaldo Carvalho de Melo
2015-10-29 22:52 ` Arnaldo Carvalho de Melo
2015-10-30 9:14 ` [tip:perf/core] " tip-bot for Wang Nan
2015-10-14 12:41 ` [PATCH 10/31] perf test: Enforce LLVM test for BPF test Wang Nan
2015-10-14 15:48 ` Namhyung Kim
2015-10-15 11:58 ` Wangnan (F)
2015-11-03 18:24 ` Arnaldo Carvalho de Melo
2015-11-04 1:41 ` Wangnan (F)
2015-10-29 22:37 ` Arnaldo Carvalho de Melo
2015-10-31 5:31 ` Wangnan (F)
2015-10-14 12:41 ` [PATCH 11/31] perf test: Add 'perf test BPF' Wang Nan
2015-10-14 12:41 ` [PATCH 12/31] perf probe: Reset args and nargs for probe_trace_event when failure Wang Nan
2015-10-29 22:39 ` Arnaldo Carvalho de Melo
2015-10-30 10:24 ` 平松雅巳 / HIRAMATU,MASAMI
2015-10-14 12:41 ` [PATCH 13/31] bpf tools: Load a program with different instances using preprocessor Wang Nan
2015-10-29 22:44 ` Arnaldo Carvalho de Melo
2015-10-31 10:40 ` Wangnan (F)
2015-10-14 12:41 ` [PATCH 14/31] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-10-29 22:45 ` Arnaldo Carvalho de Melo
2015-10-14 12:41 ` [PATCH 15/31] perf tools: Compile dwarf-regs.c if CONFIG_BPF_PROLOGUE is on Wang Nan
2015-10-14 12:41 ` [PATCH 16/31] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-10-15 5:26 ` Namhyung Kim
2015-10-15 11:56 ` Wangnan (F)
2015-10-14 12:41 ` [PATCH 17/31] perf tools: Generate prologue for BPF programs Wang Nan
2015-10-14 12:41 ` [PATCH 18/31] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-10-14 12:41 ` [PATCH 19/31] perf record: Support custom vmlinux path Wang Nan
2015-10-14 12:41 ` [PATCH 20/31] perf tools: Allow BPF program attach to uprobe events Wang Nan
2015-10-27 2:28 ` Wangnan (F)
2015-10-27 3:07 ` [PATCH] perf tools: Allow BPF program attach to modules Wang Nan
2015-10-14 12:41 ` [PATCH 21/31] perf test: Enforce LLVM test, add kbuild test Wang Nan
2015-10-19 14:42 ` Namhyung Kim
2015-10-19 14:53 ` Arnaldo Carvalho de Melo
2015-10-19 15:21 ` Namhyung Kim
2015-10-20 10:36 ` Wangnan (F)
2015-10-20 13:42 ` Arnaldo Carvalho de Melo
2015-10-20 12:06 ` Wangnan (F)
2015-10-20 13:41 ` Arnaldo Carvalho de Melo
2015-10-14 12:41 ` [PATCH 22/31] perf test: Test BPF prologue Wang Nan
2015-10-14 12:41 ` [PATCH 23/31] bpf tools: Add helper function for updating bpf maps elements Wang Nan
2015-10-14 12:41 ` [PATCH 24/31] bpf tools: Collect map definition in bpf_object Wang Nan
2015-10-14 12:41 ` [PATCH 25/31] bpf tools: Extract and collect map names from BPF object file Wang Nan
2015-10-14 12:41 ` [PATCH 26/31] perf tools: Support perf event alias name Wang Nan
2015-10-21 8:53 ` Namhyung Kim
2015-10-21 13:00 ` Wangnan (F)
2015-10-22 7:16 ` Namhyung Kim
2015-10-22 7:29 ` Wangnan (F)
2015-10-22 7:53 ` Namhyung Kim
2015-10-22 7:59 ` Wangnan (F)
2015-10-14 12:41 ` [PATCH 27/31] perf tools: Pass available CPU number to clang compiler Wang Nan
2015-10-14 12:41 ` Wang Nan [this message]
2015-10-14 12:41 ` [PATCH 29/31] perf tools: Add API to apply config to BPF map Wang Nan
2015-10-14 12:41 ` [PATCH 30/31] perf record: Apply config to BPF objects before recording Wang Nan
2015-10-14 12:41 ` [PATCH 31/31] perf tools: Enable BPF object configure syntax Wang Nan
2015-10-14 15:44 ` [GIT PULL 00/31] perf tools: filtering events using eBPF programs Namhyung Kim
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=1444826502-49291-29-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=ast@plumgrid.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=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).