selftests/bpf: Verify arena type tags in resolve_btfids test

Extend test_resolve_btfids() to assert that resolve_btfids emits the
address_space(1) type attribute (a BTF_KIND_TYPE_TAG with kflag=1) on
the return type and/or arguments of kfuncs marked KF_ARENA_RET,
KF_ARENA_ARG1 or KF_ARENA_ARG2.

Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://patch.msgid.link/20260807032029.78092-4-ihor.solodrai@linux.dev
Signed-off-by: Eduard Zingerman <eddyz87@gmail.com>
This commit is contained in:
Ihor Solodrai
2026-08-06 20:20:26 -07:00
committed by Eduard Zingerman
parent 27a78c2e7e
commit ef77140f4b
2 changed files with 76 additions and 0 deletions

View File

@@ -12,9 +12,20 @@
#define BTF_DATA_FILE "resolve_btfids.test.o.BTF"
#define TYPE_ATTR_ARENA "address_space(1)"
#ifndef KF_FASTCALL
#define KF_FASTCALL (1 << 12)
#endif
#ifndef KF_ARENA_RET
#define KF_ARENA_RET (1 << 13)
#endif
#ifndef KF_ARENA_ARG1
#define KF_ARENA_ARG1 (1 << 14)
#endif
#ifndef KF_ARENA_ARG2
#define KF_ARENA_ARG2 (1 << 15)
#endif
struct symbol {
const char *name;
@@ -41,6 +52,8 @@ struct kfunc_symbol {
static struct kfunc_symbol kfunc_symbols[] = {
{ "kfunc_a", -1, 0 },
{ "kfunc_b", -1, KF_FASTCALL },
{ "kfunc_c", -1, KF_ARENA_RET | KF_ARENA_ARG1 | KF_ARENA_ARG2 },
{ "kfunc_d", -1, KF_ARENA_ARG2 },
};
/* Align the .BTF_ids section to 4 bytes */
@@ -88,6 +101,8 @@ BTF_SET_END(test_set)
BTF_KFUNCS_START(test_kfunc_set)
BTF_ID_FLAGS(func, kfunc_a)
BTF_ID_FLAGS(func, kfunc_b, KF_FASTCALL)
BTF_ID_FLAGS(func, kfunc_c, KF_ARENA_RET | KF_ARENA_ARG1 | KF_ARENA_ARG2)
BTF_ID_FLAGS(func, kfunc_d, KF_ARENA_ARG2)
BTF_KFUNCS_END(test_kfunc_set)
/*
@@ -95,6 +110,8 @@ BTF_KFUNCS_END(test_kfunc_set)
* actually sort at least one of the two sets.
*/
BTF_KFUNCS_START(test_kfunc_set_rev)
BTF_ID_FLAGS(func, kfunc_d, KF_ARENA_ARG2)
BTF_ID_FLAGS(func, kfunc_c, KF_ARENA_RET | KF_ARENA_ARG1 | KF_ARENA_ARG2)
BTF_ID_FLAGS(func, kfunc_b, KF_FASTCALL)
BTF_ID_FLAGS(func, kfunc_a)
BTF_KFUNCS_END(test_kfunc_set_rev)
@@ -184,6 +201,22 @@ static void check_kfunc_set(struct btf_id_set8 *set)
}
}
/* True if @id is PTR -> TYPE_TAG(kflag=1, "address_space(1)") -> pointee */
static bool is_arena_tagged_ptr(struct btf *btf, __u32 id)
{
const struct btf_type *ptr, *tag;
const char *name;
ptr = btf__type_by_id(btf, id);
if (!btf_is_ptr(ptr))
return false;
tag = btf__type_by_id(btf, ptr->type);
if (!btf_is_type_tag(tag) || !btf_kflag(tag))
return false;
name = btf__name_by_offset(btf, tag->name_off);
return strcmp(name, TYPE_ATTR_ARENA) == 0;
}
void test_resolve_btfids(void)
{
__u32 *test_list, *test_lists[] = { test_list_local, test_list_global };
@@ -227,6 +260,39 @@ void test_resolve_btfids(void)
check_kfunc_set(&test_kfunc_set);
check_kfunc_set(&test_kfunc_set_rev);
/*
* Check resolve_btfids wrapped exactly the arena-flagged return/args
* with the address_space(1) type attribute, and left other
* pointers/returns untouched.
*/
for (i = 0; i < ARRAY_SIZE(kfunc_symbols); i++) {
const struct btf_type *fn, *proto;
const struct btf_param *params;
const char *name = kfunc_symbols[i].name;
u32 fl = kfunc_symbols[i].flags;
__u32 nr;
fn = btf__type_by_id(btf, kfunc_symbols[i].id);
if (!ASSERT_TRUE(btf_is_func(fn), name))
continue;
proto = btf__type_by_id(btf, fn->type);
if (!ASSERT_TRUE(btf_is_func_proto(proto), name))
continue;
params = btf_params(proto);
nr = btf_vlen(proto);
ASSERT_EQ(is_arena_tagged_ptr(btf, proto->type),
!!(fl & KF_ARENA_RET), name);
if (nr > 0) {
ASSERT_EQ(is_arena_tagged_ptr(btf, params[0].type),
!!(fl & KF_ARENA_ARG1), name);
}
if (nr > 1) {
ASSERT_EQ(is_arena_tagged_ptr(btf, params[1].type),
!!(fl & KF_ARENA_ARG2), name);
}
}
out:
btf__free(btf);
}

View File

@@ -58,3 +58,13 @@ int kfunc_b(struct root_struct *root)
{
return 0;
}
struct root_struct *kfunc_c(struct root_struct *a, struct root_struct *b)
{
return a;
}
int kfunc_d(struct root_struct *a, struct root_struct *b)
{
return 0;
}