From: Ihor Solodrai <ihor.solodrai@linux.dev>
To: Alexei Starovoitov <ast@kernel.org>,
Andrii Nakryiko <andrii@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Eduard Zingerman <eddyz87@gmail.com>,
Kumar Kartikeya Dwivedi <memxor@gmail.com>,
Quentin Monnet <qmo@kernel.org>
Cc: bpf@vger.kernel.org, Alan Maguire <alan.maguire@oracle.com>,
Cupertino Miranda <cupertino.miranda@oracle.com>,
David Faust <david.faust@oss.qualcomm.com>,
Ian Rogers <irogers@google.com>,
"Jose E . Marchesi" <jose.marchesi@oracle.com>,
Vineet Gupta <vineet.gupta@linux.dev>,
Yonghong Song <yonghong.song@linux.dev>
Subject: [PATCH bpf-next v3 06/13] selftests/bpf: Cover legacy arena type tags in bpftool C dumps
Date: Fri, 30 Oct 2026 16:33:48 -0700 [thread overview]
Message-ID: <20261030233355.1836749-7-ihor.solodrai@linux.dev> (raw)
In-Reply-To: <20261030233355.1836749-1-ihor.solodrai@linux.dev>
bpftool rewrites kflagged "address_space(1)" type tags from older
kernel BTF to the complete attribute specifier before dumping C.
Add a bpftool_btf_dump subtest that dumps a minimal BTF with an arena
kfunc in the legacy encoding, and checks that its C prototype carries
the complete specifier, fixed up by bpftool.
Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
---
.../bpf/prog_tests/bpftool_btf_dump.c | 51 +++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/tools/testing/selftests/bpf/prog_tests/bpftool_btf_dump.c b/tools/testing/selftests/bpf/prog_tests/bpftool_btf_dump.c
index 80e8e435d702..e66e686e4e12 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpftool_btf_dump.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpftool_btf_dump.c
@@ -57,6 +57,38 @@ static struct btf *mk_btf(void)
return btf;
}
+/*
+ * Older kernel BTF encodes the arena attribute as "address_space(1)":
+ *
+ * int __attribute__((address_space(1))) *arena(void);
+ */
+static struct btf *mk_legacy_arena_btf(void)
+{
+ struct btf *btf;
+
+ btf = btf__new_empty();
+ if (!ASSERT_OK_PTR(btf, "new_empty"))
+ return NULL;
+
+ btf__add_int(btf, "int", 4, BTF_INT_SIGNED);
+ btf__add_type_attr(btf, "address_space(1)", 1);
+ btf__add_ptr(btf, 2);
+ btf__add_func_proto(btf, 3);
+ btf__add_func(btf, "arena", BTF_FUNC_GLOBAL, 4);
+ btf__add_decl_tag(btf, "bpf_kfunc", 5, -1);
+
+ VALIDATE_RAW_BTF(
+ btf,
+ "[1] INT 'int' size=4 bits_offset=0 nr_bits=32 encoding=SIGNED",
+ "[2] TYPE_TAG 'address_space(1)' type_id=1 kflag=1",
+ "[3] PTR '(anon)' type_id=2",
+ "[4] FUNC_PROTO '(anon)' ret_type_id=3 vlen=0",
+ "[5] FUNC 'arena' type_id=4 linkage=global",
+ "[6] DECL_TAG 'bpf_kfunc' type_id=5 component_idx=-1");
+
+ return btf;
+}
+
static struct btf *mk_loc_btf(void)
{
struct btf *btf;
@@ -234,6 +266,19 @@ static void test_dump(const char *btf_path, bool sorted)
free(dump);
}
+static void test_legacy_arena(const char *btf_path)
+{
+ char *dump;
+
+ dump = dump_c(btf_path, true);
+ if (!dump)
+ return;
+
+ ASSERT_HAS_SUBSTR(dump, "int __attribute__((address_space(1))) *arena(void)",
+ "arena_kfunc");
+ free(dump);
+}
+
static void test_loc_dump(const char *btf_path)
{
const char expected[] =
@@ -283,6 +328,12 @@ void test_bpftool_btf_dump(void)
unlink(path);
}
+ if (!btf_to_tmpfile(mk_legacy_arena_btf, path)) {
+ if (test__start_subtest("legacy_arena"))
+ test_legacy_arena(path);
+ unlink(path);
+ }
+
if (!btf_to_tmpfile(mk_loc_btf, path)) {
if (test__start_subtest("loc_dump"))
test_loc_dump(path);
--
2.56.0
next prev parent reply other threads:[~2026-10-30 23:34 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-30 23:33 [PATCH bpf-next v3 00/13] bpftool: Per-record CO-RE attributes in the C dump Ihor Solodrai
2026-10-30 23:33 ` [PATCH bpf-next v3 01/13] libbpf: Look up BTF strings without making BTF modifiable Ihor Solodrai
2026-10-30 23:33 ` [PATCH bpf-next v3 02/13] libbpf: Dump kflagged BTF tags as is Ihor Solodrai
2026-10-31 0:16 ` bot+bpf-ci
2026-10-31 0:36 ` Ihor Solodrai
2026-10-30 23:33 ` [PATCH bpf-next v3 03/13] docs, libbpf: Document complete BTF annotation strings Ihor Solodrai
2026-10-31 0:16 ` bot+bpf-ci
2026-10-31 0:27 ` Ihor Solodrai
2026-10-30 23:33 ` [PATCH bpf-next v3 04/13] bpftool: Normalize legacy arena type tags before C dumps Ihor Solodrai
2026-10-31 0:16 ` bot+bpf-ci
2026-10-31 0:31 ` Ihor Solodrai
2026-10-30 23:33 ` [PATCH bpf-next v3 05/13] selftests/bpf: Build BTF fixtures in btf_to_tmpfile() Ihor Solodrai
2026-10-30 23:33 ` Ihor Solodrai [this message]
2026-10-30 23:33 ` [PATCH bpf-next v3 07/13] selftests/bpf: Cover unknown BTF header-extension bytes in btf dump Ihor Solodrai
2026-10-30 23:33 ` [PATCH bpf-next v3 08/13] bpftool: Apply __bpf_relocatable per record on BTF dump Ihor Solodrai
2026-10-30 23:33 ` [PATCH bpf-next v3 09/13] bpftool: Skip __bpf_relocatable on verifier-rewritten context types Ihor Solodrai
2026-10-30 23:33 ` [PATCH bpf-next v3 10/13] bpftool: Emit __bpf_static_offset " Ihor Solodrai
2026-10-30 23:33 ` [PATCH bpf-next v3 11/13] selftests/bpf: Cover record attributes in bpftool BTF dumps Ihor Solodrai
2026-10-30 23:33 ` [PATCH bpf-next v3 12/13] selftests/bpf: Cover context and socket accesses through vmlinux.h Ihor Solodrai
2026-10-30 23:33 ` [PATCH bpf-next v3 13/13] bpftool: Document __bpf_relocatable and __bpf_static_offset Ihor Solodrai
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=20261030233355.1836749-7-ihor.solodrai@linux.dev \
--to=ihor.solodrai@linux.dev \
--cc=alan.maguire@oracle.com \
--cc=andrii@kernel.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=cupertino.miranda@oracle.com \
--cc=daniel@iogearbox.net \
--cc=david.faust@oss.qualcomm.com \
--cc=eddyz87@gmail.com \
--cc=irogers@google.com \
--cc=jose.marchesi@oracle.com \
--cc=memxor@gmail.com \
--cc=qmo@kernel.org \
--cc=vineet.gupta@linux.dev \
--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