Re: [PATCH bpf-next v2 2/3] selftests/bpf: Add ARRAY map type to token tests that use struct_ops global data

[sashiko-bot@kernel.org]

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] The patch introduces a test logic asymmetry by adding `BPF_MAP_TYPE_ARRAY` to the positive test `obj_priv_btf_success` but omitting it from the paired negative test `obj_priv_btf_fail`.
--

commit 86da58cc137440e9870bfb020bfbb8bab233e69a
Author: Yuan Chen <chenyuan@kylinos.cn>

selftests/bpf: Add ARRAY map type to token tests that use struct_ops global data

This commit adds BPF_MAP_TYPE_ARRAY to the allowed map types for the token
permissions of three positive subtests: obj_priv_btf_success,
obj_priv_implicit_token, and obj_priv_implicit_token_envvar. This allows
their skeletons to successfully load since they require ARRAY maps for global
data.

> diff --git a/tools/testing/selftests/bpf/prog_tests/token.c b/tools/testing/selftests/bpf/prog_tests/token.c
> index f2f5d36ae00a4..1812de87bedb8 100644
> --- a/tools/testing/selftests/bpf/prog_tests/token.c
> +++ b/tools/testing/selftests/bpf/prog_tests/token.c
> @@ -1214,7 +1214,7 @@ void serial_test_token(void)
>  		struct bpffs_opts opts = {
>  			/* allow BTF loading */
>  			.cmds = bit(BPF_BTF_LOAD) | bit(BPF_MAP_CREATE) | bit(BPF_PROG_LOAD),
> -			.maps = bit(BPF_MAP_TYPE_STRUCT_OPS),
> +			.maps = bit(BPF_MAP_TYPE_STRUCT_OPS) | bit(BPF_MAP_TYPE_ARRAY),

[Severity: Medium]
Should the negative test obj_priv_btf_fail also receive this update to its
map permissions?

Looking at obj_priv_btf_fail() earlier in the file, it is designed to verify
that lacking BPF_BTF_LOAD properly prevents BTF loading. It currently uses
only bit(BPF_MAP_TYPE_STRUCT_OPS) for its map permissions.

If a kernel regression incorrectly allowed BTF loading to bypass the token
restrictions, wouldn't obj_priv_btf_fail still fail during map creation
because it lacks BPF_MAP_TYPE_ARRAY, thereby silently masking the BTF load
enforcement regression?

>  			.progs = bit(BPF_PROG_TYPE_STRUCT_OPS),
>  			.attachs = ~0ULL,
>  		};

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20260604031033.806727-1-chenyuan_fl@163.com?part=2