Re: [PATCH bpf-next v1 02/14] selftests/bpf: Modernize resolve_btfids test scaffolding

On Mon Jun 1, 2026 at 6:17 PM EDT, Ihor Solodrai wrote:
> Refactor resolve_btfids test in order to:
>   * use newer ASSERT_* macros instead of CHECK
>   * extend the lifetime of loaded BTF to enable additional checks
>   * cleanup unused/unnecessary code
>
> Signed-off-by: Ihor Solodrai <[email protected]>

Reviewed-by: Emil Tsalapatis <[email protected]>

One nit below.

> ---
>  .../selftests/bpf/prog_tests/resolve_btfids.c | 54 +++++++------------
>  1 file changed, 18 insertions(+), 36 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c b/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c
> index 41dfaaabb73f..d742ecb2ca8e 100644
> --- a/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c
> +++ b/tools/testing/selftests/bpf/prog_tests/resolve_btfids.c
> @@ -10,8 +10,6 @@
>  #include <linux/btf_ids.h>
>  #include "test_progs.h"
>  
> -static int duration;
> -
>  struct symbol {
>  	const char	*name;
>  	int		 type;
> @@ -95,25 +93,15 @@ __resolve_symbol(struct btf *btf, int type_id)
>  	return 0;
>  }
>  
> -static int resolve_symbols(void)
> +static int resolve_symbols(struct btf *btf)
>  {
> -	struct btf *btf;
> +	__u32 nr = btf__type_cnt(btf);
>  	int type_id;
> -	__u32 nr;
> -
> -	btf = btf__parse_raw("resolve_btfids.test.o.BTF");

Nit; Maybe #define the file name instead of using it directly in
the code?

> -	if (CHECK(libbpf_get_error(btf), "resolve",
> -		  "Failed to load BTF from resolve_btfids.test.o.BTF\n"))
> -		return -1;
> -
> -	nr = btf__type_cnt(btf);
>  
>  	for (type_id = 1; type_id < nr; type_id++) {
>  		if (__resolve_symbol(btf, type_id))
> -			break;
> +			return -1;
>  	}
> -
> -	btf__free(btf);
>  	return 0;
>  }
>  
> @@ -121,25 +109,22 @@ void test_resolve_btfids(void)
>  {
>  	__u32 *test_list, *test_lists[] = { test_list_local, test_list_global };
>  	unsigned int i, j;
> -	int ret = 0;
> +	struct btf *btf;
>  
> -	if (resolve_symbols())
> -		return;
> +	btf = btf__parse_raw("resolve_btfids.test.o.BTF");
> +	if (!ASSERT_OK_PTR(btf, "btf_parse"))
> +		goto out;
> +
> +	if (resolve_symbols(btf))
> +		goto out;
>  
>  	/* Check BTF_ID_LIST(test_list_local) and
>  	 * BTF_ID_LIST_GLOBAL(test_list_global) IDs
>  	 */
>  	for (j = 0; j < ARRAY_SIZE(test_lists); j++) {
>  		test_list = test_lists[j];
> -		for (i = 0; i < ARRAY_SIZE(test_symbols); i++) {
> -			ret = CHECK(test_list[i] != test_symbols[i].id,
> -				    "id_check",
> -				    "wrong ID for %s (%d != %d)\n",
> -				    test_symbols[i].name,
> -				    test_list[i], test_symbols[i].id);
> -			if (ret)
> -				return;
> -		}
> +		for (i = 0; i < ARRAY_SIZE(test_symbols); i++)
> +			ASSERT_EQ(test_list[i], test_symbols[i].id, test_symbols[i].name);
>  	}
>  
>  	/* Check BTF_SET_START(test_set) IDs */
> @@ -153,15 +138,12 @@ void test_resolve_btfids(void)
>  			break;
>  		}
>  
> -		ret = CHECK(!found, "id_check",
> -			    "ID %d not found in test_symbols\n",
> -			    test_set.ids[i]);
> -		if (ret)
> -			break;
> +		ASSERT_TRUE(found, "id_in_test_symbols");
>  
> -		if (i > 0) {
> -			if (!ASSERT_LE(test_set.ids[i - 1], test_set.ids[i], "sort_check"))
> -				return;
> -		}
> +		if (i > 0)
> +			ASSERT_LE(test_set.ids[i - 1], test_set.ids[i], "sort_check");
>  	}
> +
> +out:
> +	btf__free(btf);
>  }