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 v4 14/15] bpf: allow all printable characters in BTF DATASEC names
Date: Wed, 6 Mar 2024 12:45:28 +0200 [thread overview]
Message-ID: <20240306104529.6453-15-eddyz87@gmail.com> (raw)
In-Reply-To: <20240306104529.6453-1-eddyz87@gmail.com>
The intent is to allow libbpf to use SEC("?.struct_ops") to identify
struct_ops maps that are optional, e.g. like in the following BPF code:
SEC("?.struct_ops")
struct test_ops optional_map = { ... };
Which yields the following BTF:
...
[13] DATASEC '?.struct_ops' size=0 vlen=...
...
To load such BTF libbpf rewrites DATASEC name before load.
After this patch the rewrite won't be necessary.
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
---
kernel/bpf/btf.c | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 6ff0bd1a91d5..170d017e8e4a 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -809,9 +809,23 @@ static bool btf_name_valid_identifier(const struct btf *btf, u32 offset)
return __btf_name_valid(btf, offset);
}
+/* Allow any printable character in DATASEC names */
static bool btf_name_valid_section(const struct btf *btf, u32 offset)
{
- return __btf_name_valid(btf, offset);
+ /* offset must be valid */
+ const char *src = btf_str_by_offset(btf, offset);
+ const char *src_limit;
+
+ /* set a limit on identifier length */
+ src_limit = src + KSYM_NAME_LEN;
+ src++;
+ while (*src && src < src_limit) {
+ if (!isprint(*src))
+ return false;
+ src++;
+ }
+
+ return !*src;
}
static const char *__btf_name_by_offset(const struct btf *btf, u32 offset)
--
2.43.0
next prev parent reply other threads:[~2024-03-06 10:45 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-06 10:45 [PATCH bpf-next v4 00/15] libbpf: type suffixes and autocreate flag for struct_ops maps Eduard Zingerman
2024-03-06 10:45 ` [PATCH bpf-next v4 01/15] libbpf: allow version suffixes (___smth) for struct_ops types Eduard Zingerman
2024-03-06 10:45 ` [PATCH bpf-next v4 02/15] libbpf: tie struct_ops programs to kernel BTF ids, not to local ids Eduard Zingerman
2024-03-06 10:45 ` [PATCH bpf-next v4 03/15] libbpf: honor autocreate flag for struct_ops maps Eduard Zingerman
2024-03-06 10:45 ` [PATCH bpf-next v4 04/15] selftests/bpf: test struct_ops map definition with type suffix Eduard Zingerman
2024-03-06 10:45 ` [PATCH bpf-next v4 05/15] selftests/bpf: utility functions to capture libbpf log in test_progs Eduard Zingerman
2024-03-06 10:45 ` [PATCH bpf-next v4 06/15] selftests/bpf: bad_struct_ops test Eduard Zingerman
2024-03-06 10:45 ` [PATCH bpf-next v4 07/15] selftests/bpf: test autocreate behavior for struct_ops maps Eduard Zingerman
2024-03-06 10:45 ` [PATCH bpf-next v4 08/15] libbpf: sync progs autoload with maps autocreate " Eduard Zingerman
2024-03-06 10:45 ` [PATCH bpf-next v4 09/15] selftests/bpf: verify struct_ops autoload/autocreate sync Eduard Zingerman
2024-03-06 10:45 ` [PATCH bpf-next v4 10/15] libbpf: replace elf_state->st_ops_* fields with SEC_ST_OPS sec_type Eduard Zingerman
2024-03-06 10:45 ` [PATCH bpf-next v4 11/15] libbpf: struct_ops in SEC("?.struct_ops") / SEC("?.struct_ops.link") Eduard Zingerman
2024-03-06 10:45 ` [PATCH bpf-next v4 12/15] libbpf: rewrite btf datasec names starting from '?' Eduard Zingerman
2024-03-06 10:45 ` [PATCH bpf-next v4 13/15] selftests/bpf: test case for SEC("?.struct_ops") Eduard Zingerman
2024-03-06 10:45 ` Eduard Zingerman [this message]
2024-03-06 19:17 ` [PATCH bpf-next v4 14/15] bpf: allow all printable characters in BTF DATASEC names Andrii Nakryiko
2024-03-06 10:45 ` [PATCH bpf-next v4 15/15] selftests/bpf: test cases for '?' in BTF names Eduard Zingerman
2024-03-06 19:30 ` [PATCH bpf-next v4 00/15] libbpf: type suffixes and autocreate flag for struct_ops maps patchwork-bot+netdevbpf
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=20240306104529.6453-15-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