mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: <acme@kernel.org>, <ast@plumgrid.com>,
	<brendan.d.gregg@gmail.com>, <daniel@iogearbox.net>,
	<namhyung@kernel.org>, <masami.hiramatsu.pt@hitachi.com>,
	<paulus@samba.org>, <a.p.zijlstra@chello.nl>, <mingo@redhat.com>,
	<jolsa@kernel.org>, <dsahern@gmail.com>
Cc: <linux-kernel@vger.kernel.org>, <lizefan@huawei.com>,
	<hekuang@huawei.com>, <xiakaixu@huawei.com>, <pi3orama@163.com>
Subject: [RFC PATCH v9 20/50] bpf tools: Introduce accessors for struct bpf_program
Date: Fri, 26 Jun 2015 14:15:25 +0000	[thread overview]
Message-ID: <1435328155-87115-21-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1435328155-87115-1-git-send-email-wangnan0@huawei.com>

This patch introduces accessors for user of libbpf to retrieve 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>
Acked-by: Alexei Starovoitov <ast@plumgrid.com>
---
 tools/lib/bpf/libbpf.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++
 tools/lib/bpf/libbpf.h | 25 +++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 33452f8..e4c5f07 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -98,6 +98,10 @@ struct bpf_program {
 	int nr_reloc;
 
 	int fd;
+
+	struct bpf_object *obj;
+	void *priv;
+	bpf_program_clear_priv_t clear_priv;
 };
 
 struct bpf_object {
@@ -150,6 +154,12 @@ static void bpf_program__clear(struct bpf_program *prog)
 	if (!prog)
 		return;
 
+	if (prog->clear_priv)
+		prog->clear_priv(prog, prog->priv);
+
+	prog->priv = NULL;
+	prog->clear_priv = NULL;
+
 	bpf_program__unload(prog);
 	zfree(&prog->section_name);
 	zfree(&prog->insns);
@@ -211,6 +221,7 @@ bpf_program__new(struct bpf_object *obj, void *data, size_t size,
 	       prog->insns_cnt * sizeof(struct bpf_insn));
 	prog->idx = idx;
 	prog->fd = -1;
+	prog->obj = obj;
 
 	return prog;
 out:
@@ -924,3 +935,74 @@ void bpf_object__close(struct bpf_object *obj)
 
 	free(obj);
 }
+
+struct bpf_program *
+bpf_program__next(struct bpf_program *prev, struct bpf_object *obj)
+{
+	size_t idx;
+
+	if (!obj->programs)
+		return NULL;
+	/* First handler */
+	if (prev == NULL)
+		return &obj->programs[0];
+
+	if (prev->obj != obj) {
+		pr_warning("error: program handler doesn't match object\n");
+		return NULL;
+	}
+
+	idx = (prev - obj->programs) + 1;
+	if (idx >= obj->nr_programs)
+		return NULL;
+	return &obj->programs[idx];
+}
+
+int bpf_program__set_private(struct bpf_program *prog,
+			     void *priv,
+			     bpf_program_clear_priv_t clear_priv)
+{
+	if (prog->priv && prog->clear_priv)
+		prog->clear_priv(prog, prog->priv);
+
+	prog->priv = priv;
+	prog->clear_priv = clear_priv;
+	return 0;
+}
+
+int bpf_program__get_private(struct bpf_program *prog, void **ppriv)
+{
+	*ppriv = prog->priv;
+	return 0;
+}
+
+int bpf_program__get_title(struct bpf_program *prog,
+			   const char **ptitle, bool dup)
+{
+	const char *title;
+
+	if (!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_program__get_fd(struct bpf_program *prog, int *pfd)
+{
+	if (!pfd)
+		return -EINVAL;
+
+	*pfd = prog->fd;
+	return 0;
+}
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index 3e69600..9e0e102 100644
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -9,6 +9,7 @@
 #define __BPF_LIBBPF_H
 
 #include <stdio.h>
+#include <stdbool.h>
 
 /*
  * In include/linux/compiler-gcc.h, __printf is defined. However
@@ -34,6 +35,30 @@ void bpf_object__close(struct bpf_object *object);
 int bpf_object__load(struct bpf_object *obj);
 int bpf_object__unload(struct bpf_object *obj);
 
+/* Accessors of bpf_program. */
+struct bpf_program;
+struct bpf_program *bpf_program__next(struct bpf_program *prog,
+				      struct bpf_object *obj);
+
+#define bpf_object__for_each_program(pos, obj)		\
+	for ((pos) = bpf_program__next(NULL, (obj));	\
+	     (pos) != NULL;				\
+	     (pos) = bpf_program__next((pos), (obj)))
+
+typedef void (*bpf_program_clear_priv_t)(struct bpf_program *,
+					 void *);
+
+int bpf_program__set_private(struct bpf_program *prog, void *priv,
+			     bpf_program_clear_priv_t clear_priv);
+
+int bpf_program__get_private(struct bpf_program *prog,
+			     void **ppriv);
+
+int bpf_program__get_title(struct bpf_program *prog,
+			   const char **ptitle, bool dup);
+
+int bpf_program__get_fd(struct bpf_program *prog, int *pfd);
+
 /*
  * We don't need __attribute__((packed)) now since it is
  * unnecessary for 'bpf_map_def' because they are all aligned.
-- 
1.8.3.4


  parent reply	other threads:[~2015-06-26 14:16 UTC|newest]

Thread overview: 66+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-26 14:15 [RFC PATCH v9 00/50] perf tools: filtering events using eBPF programs Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 01/50] tracing, perf: Implement BPF programs attached to uprobes Wang Nan
2015-06-27 12:10   ` [PATCH] bpf: Use correct #ifdef controller for trace_call_bpf() Wang Nan
2015-06-27 12:36     ` [PATCH v2] " Wang Nan
2015-06-27 12:11   ` [RFC PATCH v9 01/50 -fix] tracing, perf: Implement BPF programs attached to uprobes Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 02/50] tools build: Add feature check for eBPF API Wang Nan
2015-06-29 19:21   ` Arnaldo Carvalho de Melo
2015-06-29 19:41     ` Arnaldo Carvalho de Melo
2015-06-30  2:29       ` Wangnan (F)
2015-06-30 14:34         ` Arnaldo Carvalho de Melo
2015-07-01  1:23           ` Wangnan (F)
2015-06-26 14:15 ` [RFC PATCH v9 03/50] bpf tools: Introduce 'bpf' library to tools Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 04/50] bpf tools: Allow caller to set printing function Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 05/50] bpf tools: Open eBPF object file and do basic validation Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 06/50] bpf tools: Read eBPF object from buffer Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 07/50] bpf tools: Check endianness and make libbpf fail early Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 08/50] bpf tools: Iterate over ELF sections to collect information Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 09/50] bpf tools: Collect version and license from ELF sections Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 10/50] bpf tools: Collect map definitions from 'maps' section Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 11/50] bpf tools: Collect symbol table from SHT_SYMTAB section Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 12/50] bpf tools: Collect eBPF programs from their own sections Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 13/50] bpf tools: Collect relocation sections from SHT_REL sections Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 14/50] bpf tools: Record map accessing instructions for each program Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 15/50] bpf tools: Add bpf.c/h for common bpf operations Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 16/50] bpf tools: Create eBPF maps defined in an object file Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 17/50] bpf tools: Relocate eBPF programs Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 18/50] bpf tools: Introduce bpf_load_program() to bpf.c Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 19/50] bpf tools: Load eBPF programs in object files into kernel Wang Nan
2015-06-26 14:15 ` Wang Nan [this message]
2015-06-26 14:15 ` [RFC PATCH v9 21/50] bpf tools: Introduce accessors for struct bpf_object Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 22/50] bpf tools: Link all bpf objects onto a list Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 23/50] perf tools: Make perf depend on libbpf Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 24/50] perf tools: Introduce llvm config options Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 25/50] perf tools: Call clang to compile C source to object code Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 26/50] perf tests: Add LLVM test for eBPF on-the-fly compiling Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 27/50] perf tools: Auto detecting kernel build directory Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 28/50] perf tools: Auto detecting kernel include options Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 29/50] perf record: Enable passing bpf object file to --event Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 30/50] perf record: Compile scriptlets if pass '.c' " Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 31/50] perf tools: Parse probe points of eBPF programs during preparation Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 32/50] perf probe: Attach trace_probe_event with perf_probe_event Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 33/50] perf record: Probe at kprobe points Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 34/50] perf record: Load all eBPF object into kernel Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 35/50] perf tools: Add bpf_fd field to evsel and config it Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 36/50] perf tools: Attach eBPF program to perf event Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 37/50] perf tools: Suppress probing messages when probing by BPF loading Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 38/50] perf record: Add clang options for compiling BPF scripts Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 39/50] bpf tools: Load a program with different instance using preprocessor Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 40/50] perf tools: Fix probe-event.h include Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 41/50] perf probe: Reset tev->args and tev->nargs when failure Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 42/50] perf tools: Move linux/filter.h to tools/include Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 43/50] perf tools: Add BPF_PROLOGUE config options for further patches Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 44/50] perf tools: Introduce arch_get_reg_info() for x86 Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 45/50] perf tools: Add prologue for BPF programs for fetching arguments Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 46/50] perf tools: Generate prologue for BPF programs Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 47/50] perf tools: Use same BPF program if arguments are identical Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 48/50] perf record: Support custom vmlinux path Wang Nan
2015-06-26 14:15 ` [RFC PATCH v9 49/50] perf probe: Init symbol as kprobe if any event is kprobe Wang Nan
2015-06-27 12:25   ` [RFC PATCH v9 49/50 -fix] " Wang Nan
2015-06-29 14:33     ` Arnaldo Carvalho de Melo
2015-06-30  1:38       ` Wangnan (F)
2015-06-30 14:37         ` Arnaldo Carvalho de Melo
2015-07-01  1:31           ` Wangnan (F)
2015-06-26 14:15 ` [RFC PATCH v9 50/50] perf tools: Support attach BPF program on uprobe events Wang Nan
2015-06-26 22:44 ` [RFC PATCH v9 00/50] perf tools: filtering events using eBPF programs Alexei Starovoitov
2015-06-27  0:14   ` 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=1435328155-87115-21-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=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

Powered by JetHome