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 15/37] tools lib bpf: collect bpf programs from object files.
Date: Fri, 15 May 2015 07:51:08 +0000 [thread overview]
Message-ID: <1431676290-1230-16-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1431676290-1230-1-git-send-email-wangnan0@huawei.com>
This patch collects all programs in an object file into an array of
'struct bpf_program' for further processing. That structure is for
representing each eBPF program. 'bpf_prog' should be a better name, but
it has been used by linux/filter.h. Although it is a kernel space name,
I still prefer to call it 'bpf_program' to prevent possible confusion.
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
tools/lib/bpf/libbpf.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 111 insertions(+)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 2068f0b..18b221f 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -77,6 +77,18 @@ void libbpf_set_print(int (*warn)(const char *format, ...),
# define LIBBPF_ELF_C_READ_MMAP ELF_C_READ
#endif
+/*
+ * bpf_prog should be a better name but it has been used in
+ * linux/filter.h.
+ */
+struct bpf_program {
+ /* Index in elf obj file, for relocation use. */
+ int idx;
+ char *section_name;
+ struct bpf_insn *insns;
+ size_t insns_cnt;
+};
+
struct bpf_object {
char *path;
bool needs_swap;
@@ -86,6 +98,9 @@ struct bpf_object {
size_t maps_buf_sz;
char *config_str;
+ struct bpf_program *programs;
+ size_t nr_programs;
+
/*
* Information when doing elf related work. Only valid if fd
* is valid.
@@ -99,6 +114,79 @@ struct bpf_object {
};
#define obj_elf_valid(o) ((o)->elf.fd >= 0)
+static void bpf_clear_program(struct bpf_program *prog)
+{
+ if (!prog)
+ return;
+ if (prog->section_name) {
+ free(prog->section_name);
+ prog->section_name = NULL;
+ }
+ if (prog->insns) {
+ free(prog->insns);
+ prog->insns = NULL;
+ }
+ prog->insns_cnt = 0;
+ prog->idx = -1;
+}
+
+static struct bpf_program *
+bpf_program_alloc(struct bpf_object *obj, void *data, size_t size,
+ char *name, int idx)
+{
+ struct bpf_program *prog, *progs;
+ int nr_progs;
+
+ if (size < sizeof(struct bpf_insn)) {
+ pr_warning("corrupted section '%s'\n", name);
+ return NULL;
+ }
+
+ progs = obj->programs;
+ nr_progs = obj->nr_programs;
+
+ progs = realloc(progs, sizeof(*prog) * (nr_progs + 1));
+ if (!progs) {
+ /*
+ * In this case the original obj->programs
+ * is still valid, so don't need special treat for
+ * bpf_close_object().
+ */
+ pr_warning("failed to alloc a new program '%s'\n",
+ name);
+ return NULL;
+ }
+
+ obj->programs = progs;
+
+ prog = &progs[nr_progs];
+ bzero(prog, sizeof(*prog));
+
+ obj->nr_programs = nr_progs + 1;
+
+ prog->section_name = strdup(name);
+ if (!prog->section_name) {
+ pr_warning("failed to alloc name for prog %s\n",
+ name);
+ goto out;
+ }
+
+ prog->insns = malloc(size);
+ if (!prog->insns) {
+ pr_warning("failed to alloc insns for %s\n", name);
+ goto out;
+ }
+ prog->insns_cnt = size / sizeof(struct bpf_insn);
+ memcpy(prog->insns, data,
+ prog->insns_cnt * sizeof(struct bpf_insn));
+ prog->idx = idx;
+
+ return prog;
+out:
+ bpf_clear_program(prog);
+ return NULL;
+}
+
static struct bpf_object *__bpf_obj_alloc(const char *path)
{
struct bpf_object *obj;
@@ -380,6 +468,22 @@ static int bpf_obj_elf_collect(struct bpf_object *obj)
err = -EEXIST;
} else
obj->elf.symbols = data;
+ } else if ((sh.sh_type == SHT_PROGBITS) &&
+ (sh.sh_flags & SHF_EXECINSTR) &&
+ (data->d_size > 0)) {
+ struct bpf_program *prog;
+
+ prog = bpf_program_alloc(obj, data->d_buf,
+ data->d_size, name,
+ idx);
+ if (!prog) {
+ pr_warning("failed to alloc "
+ "program %s (%s)", name,
+ obj->path);
+ err = -ENOMEM;
+ } else
+ pr_debug("found program %s\n",
+ prog->section_name);
}
if (err)
goto out;
@@ -446,5 +550,12 @@ void bpf_close_object(struct bpf_object *obj)
free(obj->maps_buf);
if (obj->config_str)
free(obj->config_str);
+ if (obj->programs) {
+ size_t i;
+
+ for (i = 0; i < obj->nr_programs; i++)
+ bpf_clear_program(&obj->programs[i]);
+ free(obj->programs);
+ }
free(obj);
}
--
1.8.3.4
next prev parent reply other threads:[~2015-05-15 7:56 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 ` Wang Nan [this message]
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 ` [RFC PATCH v2 31/37] tools perf: config probe points of eBPF programs during prepartion Wang Nan
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-16-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®