From: Eduard Zingerman <eddyz87@gmail.com>
To: bpf@vger.kernel.org, ast@kernel.org
Cc: andrii@kernel.org, daniel@iogearbox.net, martin.lau@linux.dev,
kernel-team@fb.com, yonghong.song@linux.dev, void@manifault.com,
sinquersw@gmail.com, Eduard Zingerman <eddyz87@gmail.com>
Subject: [PATCH bpf-next v2 01/15] libbpf: allow version suffixes (___smth) for struct_ops types
Date: Sat, 2 Mar 2024 03:19:06 +0200 [thread overview]
Message-ID: <20240302011920.15302-2-eddyz87@gmail.com> (raw)
In-Reply-To: <20240302011920.15302-1-eddyz87@gmail.com>
E.g. allow the following struct_ops definitions:
struct bpf_testmod_ops___v1 { int (*test)(void); };
struct bpf_testmod_ops___v2 { int (*test)(void); };
SEC(".struct_ops.link")
struct bpf_testmod_ops___v1 a = { .test = ... }
SEC(".struct_ops.link")
struct bpf_testmod_ops___v2 b = { .test = ... }
Where both bpf_testmod_ops__v1 and bpf_testmod_ops__v2 would be
resolved as 'struct bpf_testmod_ops' from kernel BTF.
Acked-by: David Vernet <void@manifault.com>
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
---
tools/lib/bpf/libbpf.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index 6c2979f1b471..e2a4c409980b 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -948,7 +948,7 @@ static int find_btf_by_prefix_kind(const struct btf *btf, const char *prefix,
const char *name, __u32 kind);
static int
-find_struct_ops_kern_types(struct bpf_object *obj, const char *tname,
+find_struct_ops_kern_types(struct bpf_object *obj, const char *tname_raw,
struct module_btf **mod_btf,
const struct btf_type **type, __u32 *type_id,
const struct btf_type **vtype, __u32 *vtype_id,
@@ -958,8 +958,12 @@ find_struct_ops_kern_types(struct bpf_object *obj, const char *tname,
const struct btf_member *kern_data_member;
struct btf *btf;
__s32 kern_vtype_id, kern_type_id;
+ char tname[256];
__u32 i;
+ snprintf(tname, sizeof(tname), "%.*s",
+ (int)bpf_core_essential_name_len(tname_raw), tname_raw);
+
kern_type_id = find_ksym_btf_id(obj, tname, BTF_KIND_STRUCT,
&btf, mod_btf);
if (kern_type_id < 0) {
--
2.43.0
next prev parent reply other threads:[~2024-03-02 1:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-02 1:19 [PATCH bpf-next v2 00/15] libbpf: type suffixes and autocreate flag for struct_ops maps Eduard Zingerman
2024-03-02 1:19 ` Eduard Zingerman [this message]
2024-03-02 1:19 ` [PATCH bpf-next v2 02/15] libbpf: tie struct_ops programs to kernel BTF ids, not to local ids Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 03/15] libbpf: honor autocreate flag for struct_ops maps Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 04/15] selftests/bpf: test struct_ops map definition with type suffix Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 05/15] selftests/bpf: utility functions to capture libbpf log in test_progs Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 06/15] selftests/bpf: bad_struct_ops test Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 07/15] selftests/bpf: test autocreate behavior for struct_ops maps Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 08/15] libbpf: sync progs autoload with maps autocreate " Eduard Zingerman
2024-03-04 19:13 ` Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 09/15] selftests/bpf: verify struct_ops autoload/autocreate sync Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 10/15] libbpf: replace elf_state->st_ops_* fields with SEC_ST_OPS sec_type Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 11/15] libbpf: struct_ops in SEC("?.struct_ops") and SEC("?.struct_ops.link") Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 12/15] libbpf: rewrite btf datasec names starting from '?' Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 13/15] selftests/bpf: test case for SEC("?.struct_ops") Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 14/15] bpf: allow '?' at the beginning of DATASEC names Eduard Zingerman
2024-03-02 1:19 ` [PATCH bpf-next v2 15/15] selftests/bpf: test cases for '?' in BTF names Eduard Zingerman
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=20240302011920.15302-2-eddyz87@gmail.com \
--to=eddyz87@gmail.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kernel-team@fb.com \
--cc=martin.lau@linux.dev \
--cc=sinquersw@gmail.com \
--cc=void@manifault.com \
--cc=yonghong.song@linux.dev \
/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