From: Andrii Nakryiko <andriin@fb.com>
To: <bpf@vger.kernel.org>, <netdev@vger.kernel.org>, <ast@fb.com>,
<daniel@iogearbox.net>
Cc: <andrii.nakryiko@gmail.com>, <kernel-team@fb.com>,
Andrii Nakryiko <andriin@fb.com>
Subject: [RFC PATCH bpf-next 04/16] libbpf: add BPF_EMBED_OBJ macro for embedding BPF .o files
Date: Tue, 3 Dec 2019 23:00:03 -0800 [thread overview]
Message-ID: <20191204070015.3523523-5-andriin@fb.com> (raw)
In-Reply-To: <20191204070015.3523523-1-andriin@fb.com>
Add a convenience macro BPF_EMBED_OBJ, which allows to embed other files
(typically used to embed BPF .o files) into a hosting userspace programs. To
C program it is exposed as struct bpf_embed_data, containing a pointer to
raw data and its size in bytes.
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
---
tools/lib/bpf/libbpf.h | 35 +++++++++++++++++++
.../selftests/bpf/prog_tests/attach_probe.c | 23 ++----------
2 files changed, 38 insertions(+), 20 deletions(-)
diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h
index 2698fbcb0c79..fa803dde1f46 100644
--- a/tools/lib/bpf/libbpf.h
+++ b/tools/lib/bpf/libbpf.h
@@ -615,6 +615,41 @@ bpf_program__bpil_offs_to_addr(struct bpf_prog_info_linear *info_linear);
*/
LIBBPF_API int libbpf_num_possible_cpus(void);
+struct bpf_embed_data {
+ void *data;
+ size_t size;
+};
+
+#define BPF_EMBED_OBJ_DECLARE(NAME) \
+extern struct bpf_embed_data NAME##_embed; \
+extern char NAME##_data[]; \
+extern char NAME##_data_end[];
+
+#define __BPF_EMBED_OBJ(NAME, PATH, SZ, ASM_TYPE) \
+asm ( \
+" .pushsection \".rodata\", \"a\", @progbits \n" \
+" .global "#NAME"_data \n" \
+#NAME"_data: \n" \
+" .incbin \"" PATH "\" \n" \
+" .global "#NAME"_data_end \n" \
+#NAME"_data_end: \n" \
+" .global "#NAME"_embed \n" \
+" .type "#NAME"_embed, @object \n" \
+" .size "#NAME"_size, "#SZ" \n" \
+" .align 8, \n" \
+#NAME"_embed: \n" \
+" "ASM_TYPE" "#NAME"_data \n" \
+" "ASM_TYPE" "#NAME"_data_end - "#NAME"_data \n" \
+" .popsection \n" \
+); \
+BPF_EMBED_OBJ_DECLARE(NAME)
+
+#if __SIZEOF_POINTER__ == 4
+#define BPF_EMBED_OBJ(NAME, PATH) __BPF_EMBED_OBJ(NAME, PATH, 8, ".long")
+#else
+#define BPF_EMBED_OBJ(NAME, PATH) __BPF_EMBED_OBJ(NAME, PATH, 16, ".quad")
+#endif
+
#ifdef __cplusplus
} /* extern "C" */
#endif
diff --git a/tools/testing/selftests/bpf/prog_tests/attach_probe.c b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
index a83111a32d4a..b2e7c1424b07 100644
--- a/tools/testing/selftests/bpf/prog_tests/attach_probe.c
+++ b/tools/testing/selftests/bpf/prog_tests/attach_probe.c
@@ -1,24 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#include <test_progs.h>
-#define EMBED_FILE(NAME, PATH) \
-asm ( \
-" .pushsection \".rodata\", \"a\", @progbits \n" \
-" .global "#NAME"_data \n" \
-#NAME"_data: \n" \
-" .incbin \"" PATH "\" \n" \
-#NAME"_data_end: \n" \
-" .global "#NAME"_size \n" \
-" .type "#NAME"_size, @object \n" \
-" .size "#NAME"_size, 4 \n" \
-" .align 4, \n" \
-#NAME"_size: \n" \
-" .int "#NAME"_data_end - "#NAME"_data \n" \
-" .popsection \n" \
-); \
-extern char NAME##_data[]; \
-extern int NAME##_size;
-
ssize_t get_base_addr() {
size_t start;
char buf[256];
@@ -39,7 +21,7 @@ ssize_t get_base_addr() {
return -EINVAL;
}
-EMBED_FILE(probe, "test_attach_probe.o");
+BPF_EMBED_OBJ(probe, "test_attach_probe.o");
void test_attach_probe(void)
{
@@ -73,7 +55,8 @@ void test_attach_probe(void)
uprobe_offset = (size_t)&get_base_addr - base_addr;
/* open object */
- obj = bpf_object__open_mem(probe_data, probe_size, &open_opts);
+ obj = bpf_object__open_mem(probe_embed.data, probe_embed.size,
+ &open_opts);
if (CHECK(IS_ERR(obj), "obj_open_mem", "err %ld\n", PTR_ERR(obj)))
return;
--
2.17.1
next prev parent reply other threads:[~2019-12-04 7:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 6:59 [RFC PATCH bpf-next 00/16] Add code-generated BPF object skeleton support Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 01/16] libbpf: don't require root for bpf_object__open() Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 02/16] libbpf: add generic bpf_program__attach() Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 03/16] libbpf: move non-public APIs from libbpf.h to libbpf_internal.h Andrii Nakryiko
2019-12-04 7:00 ` Andrii Nakryiko [this message]
2019-12-04 7:00 ` [RFC PATCH bpf-next 05/16] libbpf: expose field/var declaration emitting API internally Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 06/16] libbpf: expose BPF program's function name Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 07/16] libbpf: refactor global data map initialization Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 08/16] libbpf: postpone BTF ID finding for TRACING programs to load phase Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 09/16] libbpf: reduce log level of supported section names dump Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 10/16] libbpf: add experimental BPF object skeleton support Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 11/16] bpftool: add skeleton codegen command Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 12/16] libbpf/samples: add runqslower sample to libbpf samples Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 13/16] selftests/bpf: add BPF skeletons selftests and convert attach_probe.c Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 14/16] selftests/bpf: convert few more selftest to skeletons Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 15/16] selftests/bpf: add test validating data section to struct convertion layout Andrii Nakryiko
2019-12-04 7:00 ` [RFC PATCH bpf-next 16/16] bpftool: add `gen skeleton` BASH completions Andrii Nakryiko
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=20191204070015.3523523-5-andriin@fb.com \
--to=andriin@fb.com \
--cc=andrii.nakryiko@gmail.com \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/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).