Re: [PATCH bpf-next v2 3/3] selftests/bpf: Test multi_st_ops and calling kfuncs from different programs

[Martin KaFai Lau <martin.lau@xxxxxxxxx>]

On 8/6/25 9:25 AM, Amery Hung wrote:
> +static void test_st_ops_id_ops_mapping(void)
> +{
> +	struct struct_ops_id_ops_mapping1 *skel1 = NULL;
> +	struct struct_ops_id_ops_mapping2 *skel2 = NULL;
> +	LIBBPF_OPTS(bpf_test_run_opts, topts);

A default topts is not needed. Passing NULL is as good, so removed.

> +	struct bpf_map_info info = {};
> +	__u32 len = sizeof(info);
> +	int err, pid, prog1_fd, prog2_fd;
> +
> +	skel1 = struct_ops_id_ops_mapping1__open_and_load();
> +	if (!ASSERT_OK_PTR(skel1, "struct_ops_id_ops_mapping1__open"))
> +		goto out;
> +
> +	skel2 = struct_ops_id_ops_mapping2__open_and_load();
> +	if (!ASSERT_OK_PTR(skel2, "struct_ops_id_ops_mapping2__open"))
> +		goto out;
> +
> +	err = bpf_map_get_info_by_fd(bpf_map__fd(skel1->maps.st_ops_map),
> +				     &info, &len);
> +	if (!ASSERT_OK(err, "bpf_map_get_info_by_fd"))
> +		goto out;
> +
> +	skel1->bss->st_ops_id = info.id;
> +
> +	err = bpf_map_get_info_by_fd(bpf_map__fd(skel2->maps.st_ops_map),
> +				     &info, &len);
> +	if (!ASSERT_OK(err, "bpf_map_get_info_by_fd"))
> +		goto out;
> +
> +	skel2->bss->st_ops_id = info.id;
> +
> +	err = struct_ops_id_ops_mapping1__attach(skel1);
> +	if (!ASSERT_OK(err, "struct_ops_id_ops_mapping1__attach"))
> +		goto out;
> +
> +	err = struct_ops_id_ops_mapping2__attach(skel2);
> +	if (!ASSERT_OK(err, "struct_ops_id_ops_mapping2__attach"))
> +		goto out;
> +
> +	/* run tracing prog that calls .test_1 and checks return */
> +	pid = getpid();
> +	skel1->bss->test_pid = pid;
> +	skel2->bss->test_pid = pid;
> +	sys_gettid();
> +	skel1->bss->test_pid = 0;
> +	skel2->bss->test_pid = 0;
> +
> +	/* run syscall_prog that calls .test_1 and checks return */
> +	prog1_fd = bpf_program__fd(skel1->progs.syscall_prog);
> +	err = bpf_prog_test_run_opts(prog1_fd, &topts);
> +	ASSERT_OK(err, "bpf_prog_test_run_opts");
> +
> +	prog2_fd = bpf_program__fd(skel2->progs.syscall_prog);
> +	err = bpf_prog_test_run_opts(prog2_fd, &topts);
> +	ASSERT_OK(err, "bpf_prog_test_run_opts");
> +
> +	ASSERT_EQ(skel1->bss->test_err, 0, "skel1->bss->test_err");
> +	ASSERT_EQ(skel2->bss->test_err, 0, "skel2->bss->test_err");
> +
> +out:
> +	if (skel1)
> +		struct_ops_id_ops_mapping1__destroy(skel1);
> +	if (skel2)

NULL check on skel[12] is not needed, so removed.

Applied. Thanks.

> +		struct_ops_id_ops_mapping2__destroy(skel2);
> +}
> +