summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorYonghong Song <yonghong.song@linux.dev>2026-08-28 23:15:34 -0700
committerAlexei Starovoitov <ast@kernel.org>2026-08-29 18:16:32 -0700
commit8d7ea1b752e5e49b00442f27f2a76228423aa74b (patch)
treef8e118e08a15e34fa58cd2e11f3980af0b57ec5d /kernel
parent3fc3e7331af6f60979fdf55e776bfe67105b584a (diff)
bpf: Let the by-value struct walk take the kinds of member it accepts
btf_struct_member_walk() hardcodes that every member of a struct returned by value must be a scalar. A later patch needs the same walk to also accept arena pointers, so give it a mask of the member kinds it allows. The mask reaches callers through btf_struct_is_composed_of(), which replaces btf_type_is_scalar_struct() as the entry point exported to btf.c. btf_type_is_scalar_struct() stays as a verifier-local wrapper for the call sites that only ever ask about scalars. There is no functional change: btf_member_kind_allowed() is exactly btf_type_is_scalar() when the mask is BTF_MEMBER_SCALAR alone, and the shared check is the last statement of the loop body, so dropping the array branch's continue neither skips a member nor checks one twice. Signed-off-by: Yonghong Song <yonghong.song@linux.dev> Link: https://lore.kernel.org/r/20260829061534.1693789-1-yonghong.song@linux.dev Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/bpf/btf.c2
-rw-r--r--kernel/bpf/verifier.c38
2 files changed, 29 insertions, 11 deletions
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c
index 280530d25886..b1f4ef614d4c 100644
--- a/kernel/bpf/btf.c
+++ b/kernel/bpf/btf.c
@@ -7979,7 +7979,7 @@ static int btf_validate_return_type(struct bpf_verifier_env *env, struct btf *bt
*/
bool local_func = subprog && !is_global;
- if (local_func || btf_type_is_scalar_struct(env, btf, t))
+ if (local_func || btf_struct_is_composed_of(env, btf, t, BTF_MEMBER_SCALAR))
return 0;
}
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index ed077a5422af..90139f1b78d1 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -11646,9 +11646,23 @@ static bool is_kfunc_arg_implicit(const struct bpf_call_arg_meta *meta, u32 arg_
return argn <= arg_idx;
}
-/* Returns true if struct is composed of scalars, 4 levels of nesting allowed */
+static bool btf_member_kind_allowed(const struct btf *btf, const struct btf_type *t,
+ u32 member_kinds)
+{
+ if ((member_kinds & BTF_MEMBER_SCALAR) && btf_type_is_scalar(t))
+ return true;
+ if ((member_kinds & BTF_MEMBER_ARENA_PTR) && btf_type_is_arena_ptr(btf, t))
+ return true;
+ return false;
+}
+
+/*
+ * Returns true if every member of struct @t is of a kind listed in
+ * @member_kinds, 4 levels of nesting allowed. An array member counts as its
+ * element type.
+ */
static bool btf_struct_member_walk(struct bpf_verifier_env *env, const struct btf *btf,
- const struct btf_type *t, int rec)
+ const struct btf_type *t, u32 member_kinds, int rec)
{
const struct btf_type *member_type;
const struct btf_member *member;
@@ -11666,7 +11680,7 @@ static bool btf_struct_member_walk(struct bpf_verifier_env *env, const struct bt
verbose(env, "max struct nesting depth exceeded\n");
return false;
}
- if (!btf_struct_member_walk(env, btf, member_type, rec + 1))
+ if (!btf_struct_member_walk(env, btf, member_type, member_kinds, rec + 1))
return false;
continue;
}
@@ -11675,21 +11689,25 @@ static bool btf_struct_member_walk(struct bpf_verifier_env *env, const struct bt
if (!array->nelems)
return false;
member_type = btf_type_skip_modifiers(btf, array->type, NULL);
- if (!btf_type_is_scalar(member_type))
- return false;
- continue;
}
- if (!btf_type_is_scalar(member_type))
+ if (!btf_member_kind_allowed(btf, member_type, member_kinds))
return false;
}
return true;
}
-bool btf_type_is_scalar_struct(struct bpf_verifier_env *env,
+bool btf_struct_is_composed_of(struct bpf_verifier_env *env,
const struct btf *btf,
- const struct btf_type *t)
+ const struct btf_type *t, u32 member_kinds)
+{
+ return btf_struct_member_walk(env, btf, t, member_kinds, 0);
+}
+
+static bool btf_type_is_scalar_struct(struct bpf_verifier_env *env,
+ const struct btf *btf,
+ const struct btf_type *t)
{
- return btf_struct_member_walk(env, btf, t, 0);
+ return btf_struct_is_composed_of(env, btf, t, BTF_MEMBER_SCALAR);
}
enum kfunc_ptr_arg_type {