From: Alan Maguire <alan.maguire@oracle.com>
To: ast@kernel.org, andrii@kernel.org
Cc: daniel@iogearbox.net, eddyz87@gmail.com, jolsa@kernel.org,
ihor.solodrai@linux.dev, yonghong.song@linux.dev,
song@kernel.org, qmo@kernel.org, martin.lau@linux.dev,
memxor@gmail.com, emil@etsalapatis.com, mcgrof@kernel.org,
petr.pavlu@suse.com, tj@kernel.org, kees@kernel.org,
bpf@vger.kernel.org, nathan@kernel.org, nsc@kernel.org,
arnd@arndb.de, puranjay@kernel.org, yatsenko@meta.com,
atenart@kernel.org, ojeda@kernel.org,
linux-modules@vger.kernel.org,
Alan Maguire <alan.maguire@oracle.com>
Subject: [PATCH v2 bpf-next 08/18] selftests/bpf: Validate that btf__permute transfer works
Date: Tue, 1 Sep 2026 17:57:47 +0100 [thread overview]
Message-ID: <20260901165757.801449-9-alan.maguire@oracle.com> (raw)
In-Reply-To: <20260901165757.801449-1-alan.maguire@oracle.com>
Add coverage for btf__permute() transfer mode, including type-ID
remapping and LOCSEC record ordering in the resulting split BTF.
Verify string handling for both cases: a string used only by transferred
types is removed from the base BTF and deduplicated locally in the split
BTF, while a string also referenced by a retained base type remains a
base-string reference.
Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
---
.../selftests/bpf/prog_tests/btf_permute.c | 128 ++++++++++++++++++
1 file changed, 128 insertions(+)
diff --git a/tools/testing/selftests/bpf/prog_tests/btf_permute.c b/tools/testing/selftests/bpf/prog_tests/btf_permute.c
index 04ade5ad77ac..ef75fd71df96 100644
--- a/tools/testing/selftests/bpf/prog_tests/btf_permute.c
+++ b/tools/testing/selftests/bpf/prog_tests/btf_permute.c
@@ -235,10 +235,138 @@ static void test_permute_split(void)
btf__free(base_btf);
}
+/* Ensure selected types can be moved into a split BTF while permuting. */
+static void test_permute_transfer(void)
+{
+ struct btf *btf = NULL, *transfer_btf = NULL;
+ LIBBPF_OPTS(btf_permute_opts, opts);
+ __u32 permute_ids[11];
+ int err, id, foo_name_off = -1, shared_name_off, foo_funcs = 0, shared_funcs = 0;
+
+ btf = btf__new_empty();
+ if (!ASSERT_OK_PTR(btf, "empty_main_btf"))
+ return;
+
+ btf__add_int(btf, "int", 4, BTF_INT_SIGNED); /* [1] int */
+ btf__add_func_proto(btf, 1); /* [2] int (*)(void) */
+ btf__add_func(btf, "foo", BTF_FUNC_STATIC, 2); /* [3] int foo(void) */
+ btf__add_loc_param(btf, 4, BTF_LOC_PARAM_SIGNED); /* [4] location */
+ btf__add_loc_param_value(btf, 0);
+ btf__add_loc_proto(btf); /* [5] location proto */
+ btf__add_loc_proto_param(btf, 4);
+ btf__add_locsec(btf, ".locs"); /* [6] location section */
+ btf__add_locsec_loc(btf, 3, 5, 128);
+ btf__add_locsec_loc(btf, 3, 5, 0);
+ btf__add_int(btf, "long", 8, BTF_INT_SIGNED); /* [7] long */
+ btf__add_func(btf, "foo", BTF_FUNC_STATIC, 2); /* [8] another foo */
+ btf__add_func(btf, "shared", BTF_FUNC_STATIC, 2); /* [9] shared string */
+ btf__add_struct(btf, "shared", 4); /* [10] retains string */
+
+ permute_ids[0] = 0;
+ permute_ids[1] = 1;
+ permute_ids[2] = BTF_PERMUTE_ID_TRANSFER | 2;
+ permute_ids[3] = BTF_PERMUTE_ID_TRANSFER | 3;
+ permute_ids[4] = BTF_PERMUTE_ID_TRANSFER | 5;
+ permute_ids[5] = BTF_PERMUTE_ID_TRANSFER | 6;
+ permute_ids[6] = BTF_PERMUTE_ID_TRANSFER | 7;
+ permute_ids[7] = 4;
+ permute_ids[8] = BTF_PERMUTE_ID_TRANSFER | 8;
+ permute_ids[9] = BTF_PERMUTE_ID_TRANSFER | 9;
+ permute_ids[10] = 10;
+ opts.transfer_btf = &transfer_btf;
+ err = btf__permute(btf, permute_ids, ARRAY_SIZE(permute_ids), &opts);
+ if (!ASSERT_OK(err, "btf__permute_transfer") ||
+ !ASSERT_OK_PTR(transfer_btf, "transfer_btf"))
+ goto cleanup;
+
+ ASSERT_EQ(4, btf__type_cnt(btf), "base_type_cnt");
+ ASSERT_EQ(-ENOENT, btf__find_str(btf, "foo"), "func_name_not_in_base");
+ shared_name_off = btf__find_str(btf, "shared");
+ if (!ASSERT_GE(shared_name_off, 0, "shared_name_in_base"))
+ goto cleanup;
+ for (id = btf__type_cnt(btf); id < btf__type_cnt(transfer_btf); id++) {
+ const struct btf_type *t = btf__type_by_id(transfer_btf, id);
+
+ if (!btf_is_func(t))
+ continue;
+ if (!strcmp(btf__name_by_offset(transfer_btf, t->name_off), "foo")) {
+ foo_funcs++;
+ if (foo_name_off < 0)
+ foo_name_off = t->name_off;
+ else if (!ASSERT_EQ(foo_name_off, t->name_off, "local_foo_dedup"))
+ goto cleanup;
+ } else if (!strcmp(btf__name_by_offset(transfer_btf, t->name_off), "shared")) {
+ shared_funcs++;
+ if (!ASSERT_EQ(shared_name_off, t->name_off, "shared_name_reuses_base"))
+ goto cleanup;
+ }
+ }
+ if (!ASSERT_GE(foo_name_off, 0, "local_foo_name"))
+ goto cleanup;
+ if (!ASSERT_EQ(2, foo_funcs, "local_foo_count") ||
+ !ASSERT_EQ(1, shared_funcs, "shared_func_count"))
+ goto cleanup;
+ VALIDATE_RAW_BTF(
+ transfer_btf,
+ "[1] INT 'int' size=4 bits_offset=0 nr_bits=32 encoding=SIGNED",
+ "[2] INT 'long' size=8 bits_offset=0 nr_bits=64 encoding=SIGNED",
+ "[3] STRUCT 'shared' size=4 vlen=0",
+ "[4] FUNC_PROTO '(anon)' ret_type_id=1 vlen=0",
+ "[5] FUNC 'foo' type_id=4 linkage=static",
+ "[6] LOC_PARAM '(anon)' size=4 flags=0x1 vlen=1\n"
+ "\tvalue=0",
+ "[7] LOC_PROTO '(anon)' vlen=1\n"
+ "\ttype_id=6",
+ "[8] LOCSEC '.locs' vlen=2\n"
+ "\tfunc_type_id=5 loc_proto_type_id=7 offset=128\n"
+ "\tfunc_type_id=5 loc_proto_type_id=7 offset=0",
+ "[9] FUNC 'foo' type_id=4 linkage=static",
+ "[10] FUNC 'shared' type_id=4 linkage=static");
+cleanup:
+ btf__free(transfer_btf);
+ btf__free(btf);
+}
+
+/* Permuting BTF with a layout section must keep section offsets in sync. */
+static void test_permute_layout(void)
+{
+ LIBBPF_OPTS(btf_new_opts, opts, .add_layout = true);
+ LIBBPF_OPTS(btf_permute_opts, permute_opts);
+ struct btf *btf, *parsed, *transfer_btf = NULL;
+ const void *raw;
+ __u32 raw_sz;
+ __u32 permute_ids[] = { 0, 1, BTF_PERMUTE_ID_TRANSFER | 2 };
+ int err;
+
+ btf = btf__new_empty_opts(&opts);
+ if (!ASSERT_OK_PTR(btf, "empty_layout_btf"))
+ return;
+
+ btf__add_int(btf, "int", 4, BTF_INT_SIGNED);
+ btf__add_ptr(btf, 1);
+ permute_opts.transfer_btf = &transfer_btf;
+ err = btf__permute(btf, permute_ids, ARRAY_SIZE(permute_ids), &permute_opts);
+ if (!ASSERT_OK(err, "btf__permute_layout"))
+ goto cleanup;
+
+ raw = btf__raw_data(btf, &raw_sz);
+ parsed = btf__new(raw, raw_sz);
+ if (!ASSERT_OK_PTR(parsed, "parse_permuted_layout"))
+ goto cleanup;
+ btf__free(parsed);
+cleanup:
+ btf__free(transfer_btf);
+ btf__free(btf);
+}
+
void test_btf_permute(void)
{
if (test__start_subtest("permute_base"))
test_permute_base();
if (test__start_subtest("permute_split"))
test_permute_split();
+ if (test__start_subtest("permute_transfer"))
+ test_permute_transfer();
+ if (test__start_subtest("permute_layout"))
+ test_permute_layout();
}
--
2.43.5
next prev parent reply other threads:[~2026-09-01 16:58 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-01 16:57 [PATCH v2 bpf-next 00/18] Support inline functions in BTF Alan Maguire
2026-09-01 16:57 ` [PATCH v2 bpf-next 01/18] btf: Extend UAPI to support BTF location (inline site) info Alan Maguire
2026-09-01 17:17 ` sashiko-bot
2026-09-01 17:55 ` bot+bpf-ci
2026-09-01 16:57 ` [PATCH v2 bpf-next 02/18] libbpf: Add support for BTF kinds LOC[_PARAM|_PROTO|SEC] Alan Maguire
2026-09-01 17:11 ` sashiko-bot
2026-09-01 16:57 ` [PATCH v2 bpf-next 03/18] libbpf: Support moving permuted BTF types into split BTF Alan Maguire
2026-09-01 17:15 ` sashiko-bot
2026-09-01 18:14 ` bot+bpf-ci
2026-09-01 16:57 ` [PATCH v2 bpf-next 04/18] selftests/bpf: Test helper support for BTF_KIND_LOC[_PARAM|_PROTO|SEC] Alan Maguire
2026-09-01 17:06 ` sashiko-bot
2026-09-01 16:57 ` [PATCH v2 bpf-next 05/18] selftests/bpf: Add LOC_PARAM, LOC_PROTO, LOCSEC to field iter tests Alan Maguire
2026-09-01 16:57 ` [PATCH v2 bpf-next 06/18] selftests/bpf: Add LOC_PARAM, LOC_PROTO, LOCSEC to dedup split tests Alan Maguire
2026-09-01 17:55 ` bot+bpf-ci
2026-09-01 16:57 ` [PATCH v2 bpf-next 07/18] selftests/bpf: BTF distill tests to ensure LOC[_PARAM|_PROTO] add to split BTF Alan Maguire
2026-09-01 17:55 ` bot+bpf-ci
2026-09-01 16:57 ` Alan Maguire [this message]
2026-09-01 17:16 ` [PATCH v2 bpf-next 08/18] selftests/bpf: Validate that btf__permute transfer works sashiko-bot
2026-09-01 17:55 ` bot+bpf-ci
2026-09-01 16:57 ` [PATCH v2 bpf-next 09/18] bpftool: Handle multi-split BTF by supporting multiple base BTFs Alan Maguire
2026-09-01 17:13 ` sashiko-bot
2026-09-01 16:57 ` [PATCH v2 bpf-next 10/18] bpftool: Document support for multi-split BTF Alan Maguire
2026-09-01 17:12 ` sashiko-bot
2026-09-01 16:57 ` [PATCH v2 bpf-next 11/18] bpftool: Add ability to dump LOC_PARAM, LOC_PROTO and LOCSEC Alan Maguire
2026-09-01 17:16 ` sashiko-bot
2026-09-01 17:55 ` bot+bpf-ci
2026-09-01 16:57 ` [PATCH v2 bpf-next 12/18] resolve_btfids: Extract inline BTF Alan Maguire
2026-09-01 17:23 ` sashiko-bot
2026-09-01 16:57 ` [PATCH v2 bpf-next 13/18] kbuild: Add support for BTF inline information Alan Maguire
2026-09-01 17:55 ` bot+bpf-ci
2026-09-01 16:57 ` [PATCH v2 bpf-next 14/18] btf: Make vmlinux, module inline info available in /sys/kernel/btf Alan Maguire
2026-09-01 16:57 ` [PATCH v2 bpf-next 15/18] btf: Support CONFIG_DEBUG_INFO_BTF_INLINE=m Alan Maguire
2026-09-01 17:24 ` sashiko-bot
2026-09-01 16:57 ` [PATCH v2 bpf-next 16/18] btf: Relocate inline BTF for modules with distilled base BTF Alan Maguire
2026-09-01 17:29 ` sashiko-bot
2026-09-01 17:55 ` bot+bpf-ci
2026-09-01 16:57 ` [PATCH v2 bpf-next 17/18] selftests/bpf: Test BTF sysfs inline representations Alan Maguire
2026-09-01 17:22 ` sashiko-bot
2026-09-01 17:55 ` bot+bpf-ci
2026-09-01 16:57 ` [PATCH v2 bpf-next 18/18] selftests/bpf: Add a test verifying inline information Alan Maguire
2026-09-01 17:28 ` sashiko-bot
2026-09-01 17:55 ` bot+bpf-ci
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=20260901165757.801449-9-alan.maguire@oracle.com \
--to=alan.maguire@oracle.com \
--cc=andrii@kernel.org \
--cc=arnd@arndb.de \
--cc=ast@kernel.org \
--cc=atenart@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=eddyz87@gmail.com \
--cc=emil@etsalapatis.com \
--cc=ihor.solodrai@linux.dev \
--cc=jolsa@kernel.org \
--cc=kees@kernel.org \
--cc=linux-modules@vger.kernel.org \
--cc=martin.lau@linux.dev \
--cc=mcgrof@kernel.org \
--cc=memxor@gmail.com \
--cc=nathan@kernel.org \
--cc=nsc@kernel.org \
--cc=ojeda@kernel.org \
--cc=petr.pavlu@suse.com \
--cc=puranjay@kernel.org \
--cc=qmo@kernel.org \
--cc=song@kernel.org \
--cc=tj@kernel.org \
--cc=yatsenko@meta.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