From: He Kuang <hekuang@huawei.com>
To: <acme@kernel.org>, <peterz@infradead.org>, <mingo@redhat.com>,
<jolsa@redhat.com>, <brendan.d.gregg@gmail.com>, <ast@kernel.org>,
<alexander.shishkin@linux.intel.com>, <wangnan0@huawei.com>,
<hekuang@huawei.com>
Cc: <linux-kernel@vger.kernel.org>
Subject: [RFC PATCH v2 11/26] perf bpf: Store arbitrary entries instread fd array in bpf_program
Date: Sun, 26 Jun 2016 11:21:03 +0000 [thread overview]
Message-ID: <1466940078-65581-12-git-send-email-hekuang@huawei.com> (raw)
In-Reply-To: <1466940078-65581-1-git-send-email-hekuang@huawei.com>
The bpf progs loaded into kernel are represented by fd, but we need
new types for storing the entity of userspace bpf progs. This patch
uses a void pointer to make it more generic so we can store any new
types and cast back to its original type when used.
Signed-off-by: He Kuang <hekuang@huawei.com>
Signed-off-by: Wang Nan <wangnan0@huawei.com>
---
tools/lib/bpf/libbpf.c | 41 +++++++++++++++++++++--------------------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 754e460..97f72b2 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -154,7 +154,7 @@ struct bpf_program {
struct {
int nr;
- int *fds;
+ void *entries;
} instances;
bpf_program_prep_t preprocessor;
@@ -226,14 +226,14 @@ static void bpf_program__unload(struct bpf_program *prog)
*/
if (prog->instances.nr > 0) {
for (i = 0; i < prog->instances.nr; i++)
- zclose(prog->instances.fds[i]);
+ zclose(((int *)prog->instances.entries)[i]);
} else if (prog->instances.nr != -1) {
pr_warning("Internal error: instances.nr is %d\n",
prog->instances.nr);
}
prog->instances.nr = -1;
- zfree(&prog->instances.fds);
+ zfree(&prog->instances.entries);
}
static void bpf_program__exit(struct bpf_program *prog)
@@ -284,7 +284,7 @@ bpf_program__init(void *data, size_t size, char *name, int idx,
memcpy(prog->insns, data,
prog->insns_cnt * sizeof(struct bpf_insn));
prog->idx = idx;
- prog->instances.fds = NULL;
+ prog->instances.entries = NULL;
prog->instances.nr = -1;
return 0;
@@ -934,20 +934,21 @@ bpf_program__load(struct bpf_program *prog,
{
int err = 0, fd, i;
- if (prog->instances.nr < 0 || !prog->instances.fds) {
+ if (prog->instances.nr < 0 || !prog->instances.entries) {
if (prog->preprocessor) {
pr_warning("Internal error: can't load program '%s'\n",
prog->section_name);
return -LIBBPF_ERRNO__INTERNAL;
}
- prog->instances.fds = malloc(sizeof(int));
- if (!prog->instances.fds) {
- pr_warning("Not enough memory for BPF fds\n");
+ prog->instances.entries = malloc(sizeof(int));
+ if (!prog->instances.entries) {
+ pr_warning("Not enough memory for BPF entries\n");
return -ENOMEM;
}
+
prog->instances.nr = 1;
- prog->instances.fds[0] = -1;
+ ((int *)prog->instances.entries)[0] = -1;
}
if (!prog->preprocessor) {
@@ -958,7 +959,7 @@ bpf_program__load(struct bpf_program *prog,
err = load_program(prog->insns, prog->insns_cnt,
license, kern_version, &fd);
if (!err)
- prog->instances.fds[0] = fd;
+ ((int *)prog->instances.entries)[0] = fd;
goto out;
}
@@ -978,7 +979,7 @@ bpf_program__load(struct bpf_program *prog,
if (!result.new_insn_ptr || !result.new_insn_cnt) {
pr_debug("Skip loading the %dth instance of program '%s'\n",
i, prog->section_name);
- prog->instances.fds[i] = -1;
+ ((int *)prog->instances.entries)[i] = -1;
continue;
}
@@ -992,7 +993,7 @@ bpf_program__load(struct bpf_program *prog,
goto out;
}
- prog->instances.fds[i] = fd;
+ ((int *)prog->instances.entries)[i] = fd;
}
out:
if (err)
@@ -1254,27 +1255,27 @@ int bpf_program__fd(struct bpf_program *prog)
int bpf_program__set_prep(struct bpf_program *prog, int nr_instances,
bpf_program_prep_t prep)
{
- int *instances_fds;
+ int *instances_entries;
if (nr_instances <= 0 || !prep)
return -EINVAL;
- if (prog->instances.nr > 0 || prog->instances.fds) {
+ if (prog->instances.nr > 0 || prog->instances.entries) {
pr_warning("Can't set pre-processor after loading\n");
return -EINVAL;
}
- instances_fds = malloc(sizeof(int) * nr_instances);
- if (!instances_fds) {
- pr_warning("alloc memory failed for fds\n");
+ instances_entries = malloc(sizeof(int) * nr_instances);
+ if (!instances_entries) {
+ pr_warning("alloc memory failed for entries\n");
return -ENOMEM;
}
/* fill all fd with -1 */
- memset(instances_fds, -1, sizeof(int) * nr_instances);
+ memset(instances_entries, -1, sizeof(int) * nr_instances);
prog->instances.nr = nr_instances;
- prog->instances.fds = instances_fds;
+ prog->instances.entries = instances_entries;
prog->preprocessor = prep;
return 0;
}
@@ -1289,7 +1290,7 @@ int bpf_program__nth_fd(struct bpf_program *prog, int n)
return -EINVAL;
}
- fd = prog->instances.fds[n];
+ fd = ((int *)prog->instances.entries)[n];
if (fd < 0) {
pr_warning("%dth instance of program '%s' is invalid\n",
n, prog->section_name);
--
1.8.5.2
next prev parent reply other threads:[~2016-06-26 11:22 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-26 11:20 [RFC PATCH v2 00/26] perf tools: Support uBPF script He Kuang
2016-06-26 11:20 ` [RFC PATCH v2 01/26] tools include: Adopt byte ordering macros from byteorder/generic.h He Kuang
2016-06-26 11:20 ` [RFC PATCH v2 02/26] tools include: Fix wrong macro definitions for cpu_to_le* for big endian He Kuang
2016-06-26 11:20 ` [RFC PATCH v2 03/26] bpf: split __bpf_prog_run code into new file He Kuang
2016-06-26 11:20 ` [RFC PATCH v2 04/26] bpf: extract jmp and default handler and introduce UBPF_BUILD flag He Kuang
2016-06-26 11:20 ` [RFC PATCH v2 05/26] tools include: Sync math64.h and div64.h He Kuang
2016-06-26 21:08 ` Nilay Vaish
2016-06-27 2:21 ` Hekuang
2016-06-27 18:13 ` Arnaldo Carvalho de Melo
2016-06-26 11:20 ` [RFC PATCH v2 06/26] tools include: Add (atomic|atomic64)_add implementation from the kernel sources He Kuang
2016-06-26 11:20 ` [RFC PATCH v2 07/26] perf bpf: Add map related BPF helper He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 08/26] perf bpf: Add UBPF flags and makefile options He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 09/26] perf bpf: Implement empty instruction handler and build bpf-vm He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 10/26] perf bpf: Remove unused code in libbpf He Kuang
2016-06-26 11:21 ` He Kuang [this message]
2016-06-26 11:21 ` [RFC PATCH v2 12/26] perf bpf: Add libbpf-internal.h header file He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 13/26] perf bpf: Add abstraction for bpf program methods He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 14/26] perf bpf: Add -Wextra to cflags for more warnings and fix them He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 15/26] perf bpf: Introduce the entity and engine for userspace bpf He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 16/26] perf bpf: Add method for fetching nth ubpf vm He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 17/26] perf bpf: Add methods to set/check ubpf engine for bpf programs He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 18/26] perf bpf: Add ubpf helper function slots and set/get methods He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 19/26] perf tools: Register basic uBPF helpers He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 20/26] perf bpf: Accept uBPF programs He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 21/26] bpf: Support bpf load/store boundary check for ubpf He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 22/26] perf bpf: Implement boundary check code in ubpf He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 23/26] perf record: Add uBPF hooks at beginning and end of perf record He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 24/26] perf bpf: Fillup bpf jmp_call handler He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 25/26] perf bpf: Implement run_ubpf_program He Kuang
2016-06-26 11:21 ` [RFC PATCH v2 26/26] perf tests: Add uBPF test case He Kuang
2016-06-26 20:48 ` [RFC PATCH v2 00/26] perf tools: Support uBPF script Alexei Starovoitov
2016-06-27 2:10 ` Hekuang
2016-06-28 11:47 ` Hekuang
2016-06-28 14:57 ` Alexei Starovoitov
2016-06-29 10:15 ` Hekuang
2016-06-29 10:35 ` Wangnan (F)
2016-06-29 12:37 ` Alexei Starovoitov
2016-06-29 13:03 ` pi3orama
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=1466940078-65581-12-git-send-email-hekuang@huawei.com \
--to=hekuang@huawei.com \
--cc=acme@kernel.org \
--cc=alexander.shishkin@linux.intel.com \
--cc=ast@kernel.org \
--cc=brendan.d.gregg@gmail.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=wangnan0@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
all inboxes | Powered by JetHome®