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>,
<dsahern@gmail.com>, <ast@plumgrid.com>, <daniel@iogearbox.net>,
<brendan.d.gregg@gmail.com>, <masami.hiramatsu.pt@hitachi.com>
Cc: <lizefan@huawei.com>, <linux-kernel@vger.kernel.org>, <pi3orama@163.com>
Subject: [RFC PATCH v3 25/37] bpf tools: Introduce accessors for struct bpf_program
Date: Sun, 17 May 2015 10:56:50 +0000 [thread overview]
Message-ID: <1431860222-61636-26-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1431860222-61636-1-git-send-email-wangnan0@huawei.com>
This patch introduces accessors for user of libbpf to retrive section
name and fd of a opened/loaded eBPF program. 'struct bpf_prog_handler'
is used for that purpose. Accessors of programs section name and file
descriptor are provided. Set/get private data are also impelmented.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
tools/lib/bpf/libbpf.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++
tools/lib/bpf/libbpf.h | 25 +++++++++
2 files changed, 162 insertions(+)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index e8ef78e..d770adc 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -79,6 +79,20 @@ void libbpf_set_print(int (*warn)(const char *format, ...),
# define LIBBPF_ELF_C_READ_MMAP ELF_C_READ
#endif
+#ifndef container_of
+# define container_of(ptr, type, member) ({ \
+ const typeof( ((type *)0)->member ) *__mptr = (ptr); \
+ (type *)( (char *)__mptr - offsetof(type,member) );})
+#endif
+
+/* Accessing of project */
+struct bpf_prog_handler {
+ struct bpf_object *obj;
+
+ void *priv;
+ bpf_prog_clear_priv_t clear_priv;
+};
+
/*
* bpf_prog should be a better name but it has been used in
* linux/filter.h.
@@ -97,6 +111,7 @@ struct bpf_program {
int nr_reloc;
int fd;
+ struct bpf_prog_handler handler;
};
struct bpf_object {
@@ -146,6 +161,12 @@ static void bpf_clear_program(struct bpf_program *prog)
if (!prog)
return;
+ if (prog->handler.clear_priv)
+ prog->handler.clear_priv(&prog->handler, prog->handler.priv);
+
+ prog->handler.priv = NULL;
+ prog->handler.clear_priv = NULL;
+
bpf_unload_program(prog);
if (prog->section_name) {
@@ -217,6 +238,7 @@ bpf_program_alloc(struct bpf_object *obj, void *data, size_t size,
prog->insns_cnt * sizeof(struct bpf_insn));
prog->idx = idx;
prog->fd = -1;
+ prog->handler.obj = obj;
return prog;
out:
@@ -941,3 +963,118 @@ void bpf_close_object(struct bpf_object *obj)
}
free(obj);
}
+
+static inline struct bpf_program *
+handler_to_prog(struct bpf_prog_handler *handler)
+{
+ struct bpf_program *prog;
+ struct bpf_object *obj;
+ size_t idx;
+
+ if (!handler)
+ goto out_warn;
+
+ obj = handler->obj;
+ prog = container_of(handler, struct bpf_program, handler);
+ idx = prog - obj->programs;
+ if (idx >= obj->nr_programs)
+ goto out_warn;
+ return &obj->programs[idx];
+
+out_warn:
+ pr_warning("invalid handler %p\n", handler);
+ return NULL;
+}
+
+struct bpf_prog_handler *
+bpf_next_prog(struct bpf_object *obj, struct bpf_prog_handler *handler)
+{
+ struct bpf_program *prog;
+ size_t idx;
+
+ if (!obj->programs)
+ return NULL;
+ /* First handler */
+ if (handler == NULL)
+ return (&obj->programs[0].handler);
+
+ if (handler->obj != obj) {
+ pr_warning("error: program handler doesn't "
+ "match object\n");
+ return NULL;
+ }
+
+ prog = handler_to_prog(handler);
+ if (!prog)
+ return NULL;
+
+ idx = (prog - obj->programs) + 1;
+ if (idx >= obj->nr_programs)
+ return NULL;
+ return &obj->programs[idx].handler;
+}
+
+int bpf_prog_set_private(struct bpf_prog_handler *handler, void *priv,
+ bpf_prog_clear_priv_t clear_priv)
+{
+ struct bpf_program *prog;
+
+ prog = handler_to_prog(handler);
+ if (!prog)
+ return -EINVAL;
+
+ if (prog->handler.priv && prog->handler.clear_priv)
+ prog->handler.clear_priv(&prog->handler, prog->handler.priv);
+
+ prog->handler.priv = priv;
+ prog->handler.clear_priv = clear_priv;
+ return 0;
+}
+
+int bpf_prog_get_private(struct bpf_prog_handler *handler, void **ppriv)
+{
+ struct bpf_program *prog;
+
+ prog = handler_to_prog(handler);
+ if (!prog || !ppriv)
+ return -EINVAL;
+
+ *ppriv = prog->handler.priv;
+ return 0;
+}
+
+int bpf_prog_get_title(struct bpf_prog_handler *handler,
+ const char **ptitle, bool dup)
+{
+ struct bpf_program *prog;
+ const char *title;
+
+ prog = handler_to_prog(handler);
+ if (!prog || !ptitle)
+ return -EINVAL;
+
+ title = prog->section_name;
+ if (dup) {
+ title = strdup(title);
+ if (!title) {
+ pr_warning("failed to strdup program title\n");
+ *ptitle = NULL;
+ return -ENOMEM;
+ }
+ }
+
+ *ptitle = title;
+ return 0;
+}
+
+int bpf_prog_get_fd(struct bpf_prog_handler *handler, int *pfd)
+{
+ struct bpf_program *prog;
+
+ prog = handler_to_prog(handler);
+ if (!prog || !pfd)
+ return -EINVAL;
+
+ *pfd = prog->fd;
+ return 0;
+}
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index c0b290d..b451d1a 100644
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -10,6 +10,7 @@
#define __BPF_LIBBPF_H
#include <stdio.h>
+#include <stdbool.h>
void libbpf_set_print(int (*warn)(const char *format, ...),
int (*info)(const char *format, ...),
@@ -25,6 +26,30 @@ void bpf_close_object(struct bpf_object *object);
int bpf_load_object(struct bpf_object *obj);
int bpf_unload_object(struct bpf_object *obj);
+/* Accessors of bpf_program. */
+struct bpf_prog_handler;
+struct bpf_prog_handler *bpf_next_prog(struct bpf_object *obj,
+ struct bpf_prog_handler *handler);
+
+#define bpf_obj_for_each_prog(obj, pos) \
+ for ((pos) = bpf_next_prog((obj), NULL); \
+ (pos) != NULL; \
+ (pos) = bpf_next_prog((obj), (pos)))
+
+typedef void (*bpf_prog_clear_priv_t)(struct bpf_prog_handler *,
+ void *);
+
+int bpf_prog_set_private(struct bpf_prog_handler *handler, void *priv,
+ bpf_prog_clear_priv_t clear_priv);
+
+int bpf_prog_get_private(struct bpf_prog_handler *handler,
+ void **ppriv);
+
+int bpf_prog_get_title(struct bpf_prog_handler *handler,
+ const char **ptitle, bool dup);
+
+int bpf_prog_get_fd(struct bpf_prog_handler *handler, int *pfd);
+
/*
* packed attribute is unnecessary for 'bpf_map_def'.
*/
--
1.8.3.4
next prev parent reply other threads:[~2015-05-17 11:01 UTC|newest]
Thread overview: 108+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-17 10:56 [RFC PATCH v3 00/37] perf tools: introduce 'perf bpf' command to load eBPF programs Wang Nan
2015-05-17 10:56 ` [RFC PATCH v3 01/37] perf/events/core: fix race in bpf program unregister Wang Nan
2015-05-18 16:59 ` Alexei Starovoitov
2015-05-17 10:56 ` [RFC PATCH v3 02/37] perf tools: Set vmlinux_path__nr_entries to 0 in vmlinux_path__exit Wang Nan
2015-05-18 17:01 ` Alexei Starovoitov
2015-05-18 20:28 ` Arnaldo Carvalho de Melo
2015-05-20 12:25 ` [tip:perf/core] " tip-bot for Wang Nan
2015-05-17 10:56 ` [RFC PATCH v3 03/37] tools lib traceevent: Install libtraceevent.a into libdir Wang Nan
2015-05-18 14:28 ` Jiri Olsa
2015-05-20 12:26 ` [tip:perf/core] " tip-bot for Wang Nan
2015-05-17 10:56 ` [RFC PATCH v3 04/37] tools: Change FEATURE_TESTS and FEATURE_DISPLAY to weak binding Wang Nan
2015-05-18 14:30 ` Jiri Olsa
2015-05-20 12:26 ` [tip:perf/core] tools build: " tip-bot for Wang Nan
2015-05-17 10:56 ` [RFC PATCH v3 05/37] tools: Add __aligned_u64 to types.h Wang Nan
2015-05-17 10:56 ` [RFC PATCH v3 06/37] bpf tools: Introduce 'bpf' library to tools Wang Nan
2015-05-18 17:35 ` Alexei Starovoitov
2015-05-20 3:48 ` Wangnan (F)
2015-05-20 5:24 ` Alexei Starovoitov
2015-05-21 0:24 ` Wangnan (F)
2015-05-21 17:53 ` Alexei Starovoitov
2015-05-21 7:10 ` Wangnan (F)
2015-05-17 10:56 ` [RFC PATCH v3 07/37] bpf tools: Allow caller to set printing function Wang Nan
2015-05-18 17:55 ` Alexei Starovoitov
2015-05-17 10:56 ` [RFC PATCH v3 08/37] bpf tools: Define basic interface Wang Nan
2015-05-18 17:57 ` Alexei Starovoitov
2015-05-22 17:22 ` Jiri Olsa
2015-05-17 10:56 ` [RFC PATCH v3 09/37] bpf tools: Open eBPF object file and do basic validation Wang Nan
2015-05-18 18:06 ` Alexei Starovoitov
2015-05-22 17:22 ` Jiri Olsa
2015-05-22 17:23 ` Jiri Olsa
2015-05-23 1:00 ` Alexei Starovoitov
2015-05-25 13:30 ` Arnaldo Carvalho de Melo
2015-05-26 0:05 ` Wangnan (F)
2015-05-26 0:41 ` Arnaldo Carvalho de Melo
2015-05-17 10:56 ` [RFC PATCH v3 10/37] bpf tools: Check endianess and set swap flag according to EHDR Wang Nan
2015-05-18 18:19 ` Alexei Starovoitov
2015-05-17 10:56 ` [RFC PATCH v3 11/37] bpf tools: Iterate over ELF sections to collect information Wang Nan
2015-05-18 18:21 ` Alexei Starovoitov
2015-05-17 10:56 ` [RFC PATCH v3 12/37] bpf tools: Collect version and license from ELF sections Wang Nan
2015-05-18 18:27 ` Alexei Starovoitov
2015-05-18 20:34 ` Arnaldo Carvalho de Melo
2015-05-18 20:51 ` Alexei Starovoitov
2015-05-17 10:56 ` [RFC PATCH v3 13/37] bpf tools: Collect map definitions from 'maps' section Wang Nan
2015-05-17 10:56 ` [RFC PATCH v3 14/37] bpf tools: Collect config string from 'config' section Wang Nan
2015-05-18 18:30 ` Alexei Starovoitov
2015-05-17 10:56 ` [RFC PATCH v3 15/37] bpf tools: Collect symbol table from SHT_SYMTAB section Wang Nan
2015-05-17 10:56 ` [RFC PATCH v3 16/37] bpf tools: Collect eBPF programs from their own sections Wang Nan
2015-05-18 12:29 ` Namhyung Kim
2015-05-18 12:47 ` Wangnan (F)
2015-05-18 18:32 ` Alexei Starovoitov
2015-05-17 10:56 ` [RFC PATCH v3 17/37] bpf tools: Collect relocation sections from SHT_REL sections Wang Nan
2015-05-17 10:56 ` [RFC PATCH v3 18/37] bpf tools: Record map accessing instructions for each program Wang Nan
2015-05-18 18:34 ` Alexei Starovoitov
2015-05-25 7:39 ` Wangnan (F)
2015-05-17 10:56 ` [RFC PATCH v3 19/37] bpf tools: Clear libelf and ELF parsing resrouce to finish opening Wang Nan
2015-05-18 18:36 ` Alexei Starovoitov
2015-05-18 20:35 ` Arnaldo Carvalho de Melo
2015-05-17 10:56 ` [RFC PATCH v3 20/37] bpf tools: Add bpf.c/h for common bpf operations Wang Nan
2015-05-18 18:39 ` Alexei Starovoitov
2015-05-22 17:24 ` Jiri Olsa
2015-05-17 10:56 ` [RFC PATCH v3 21/37] bpf tools: Create eBPF maps defined in an object file Wang Nan
2015-05-18 18:48 ` Alexei Starovoitov
2015-05-18 20:37 ` Arnaldo Carvalho de Melo
2015-05-25 9:23 ` Wangnan (F)
2015-05-22 17:23 ` Jiri Olsa
2015-05-17 10:56 ` [RFC PATCH v3 22/37] bpf tools: Relocate eBPF programs Wang Nan
2015-05-17 10:56 ` [RFC PATCH v3 23/37] bpf tools: Introduce bpf_load_program() to bpf.c Wang Nan
2015-05-18 18:52 ` Alexei Starovoitov
2015-05-18 20:37 ` Arnaldo Carvalho de Melo
2015-05-17 10:56 ` [RFC PATCH v3 24/37] bpf tools: Load eBPF programs in object files into kernel Wang Nan
2015-05-17 10:56 ` Wang Nan [this message]
2015-05-17 10:56 ` [RFC PATCH v3 26/37] bpf tools: Introduce accessors for struct bpf_object Wang Nan
2015-05-17 10:56 ` [RFC PATCH v3 27/37] perf tools: Add new 'perf bpf' command Wang Nan
2015-05-17 10:56 ` [RFC PATCH v3 28/37] perf tools: Make perf depend on libbpf Wang Nan
2015-05-22 17:24 ` Jiri Olsa
2015-05-17 10:56 ` [RFC PATCH v3 29/37] perf bpf: Add 'perf bpf record' subcommand Wang Nan
2015-05-17 10:56 ` [RFC PATCH v3 30/37] perf bpf: Add bpf-loader and open ELF object files Wang Nan
2015-05-22 17:24 ` Jiri Olsa
2015-05-25 11:47 ` Wangnan (F)
2015-05-25 13:00 ` Arnaldo Carvalho de Melo
2015-05-17 10:56 ` [RFC PATCH v3 31/37] perf bpf: Collect all eBPF programs Wang Nan
2015-05-17 10:56 ` [RFC PATCH v3 32/37] perf bpf: Parse probe points of eBPF programs during preparation Wang Nan
2015-05-22 17:24 ` Jiri Olsa
2015-05-17 10:56 ` [RFC PATCH v3 33/37] perf bpf: Probe at kprobe points Wang Nan
2015-05-18 19:25 ` Alexei Starovoitov
2015-05-17 10:56 ` [RFC PATCH v3 34/37] perf bpf: Load all eBPF object into kernel Wang Nan
2015-05-17 10:57 ` [RFC PATCH v3 35/37] perf tools: Add a bpf_wrapper global flag Wang Nan
2015-05-17 10:57 ` [RFC PATCH v3 36/37] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-05-17 10:57 ` [RFC PATCH v3 37/37] perf tools: Attach eBPF program to perf event Wang Nan
2015-05-18 19:38 ` [RFC PATCH v3 00/37] perf tools: introduce 'perf bpf' command to load eBPF programs Alexei Starovoitov
2015-05-18 20:44 ` Arnaldo Carvalho de Melo
2015-05-18 21:05 ` Alexei Starovoitov
2015-05-18 21:20 ` Arnaldo Carvalho de Melo
2015-05-18 21:45 ` Alexei Starovoitov
2015-05-19 13:44 ` Arnaldo Carvalho de Melo
2015-05-19 16:04 ` Namhyung Kim
2015-05-19 16:40 ` Arnaldo Carvalho de Melo
2015-05-19 20:46 ` Alexei Starovoitov
2015-05-19 21:10 ` Arnaldo Carvalho de Melo
2015-05-19 21:42 ` Alexei Starovoitov
2015-05-19 22:05 ` Arnaldo Carvalho de Melo
2015-05-20 1:02 ` Alexei Starovoitov
2015-05-20 1:14 ` Arnaldo Carvalho de Melo
2015-05-20 0:30 ` Namhyung Kim
2015-05-20 0:43 ` Arnaldo Carvalho de Melo
2015-05-26 6:22 ` Wangnan (F)
2015-05-20 0:23 ` Namhyung Kim
2015-05-20 0:37 ` 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=1431860222-61636-26-git-send-email-wangnan0@huawei.com \
--to=wangnan0@huawei.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--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®