Re: [PATCH bpf-next v4 3/4] selftests/bpf: Correctly handle optlen > 4096

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

On 5/4/23 11:43 AM, Stanislav Fomichev wrote:
> @@ -298,9 +253,8 @@ static int run_setsockopt_test(struct bpf_object *obj, int cg_parent,
>   void test_sockopt_multi(void)
>   {
>   	int cg_parent = -1, cg_child = -1;
> -	struct bpf_object *obj = NULL;
> +	struct sockopt_multi *obj = NULL;
>   	int sock_fd = -1;
> -	int err = -1;
>   
>   	cg_parent = test__join_cgroup("/parent");
>   	if (!ASSERT_GE(cg_parent, 0, "join_cgroup /parent"))
> @@ -310,13 +264,11 @@ void test_sockopt_multi(void)
>   	if (!ASSERT_GE(cg_child, 0, "join_cgroup /parent/child"))
>   		goto out;
>   
> -	obj = bpf_object__open_file("sockopt_multi.bpf.o", NULL);
> -	if (!ASSERT_OK_PTR(obj, "obj_load"))
> -		goto out;
> +	obj = sockopt_multi__open_and_load();
> +	if (!ASSERT_OK_PTR(obj, "skel-load"))
> +		return;

goto out;

>   
> -	err = bpf_object__load(obj);
> -	if (!ASSERT_OK(err, "obj_load"))
> -		goto out;
> +	obj->bss->page_size = sysconf(_SC_PAGESIZE);
>   
>   	sock_fd = socket(AF_INET, SOCK_STREAM, 0);
>   	if (!ASSERT_GE(sock_fd, 0, "socket"))
> @@ -327,7 +279,7 @@ void test_sockopt_multi(void)
>   
>   out:
>   	close(sock_fd);
> -	bpf_object__close(obj);
> +	sockopt_multi__destroy(obj);
>   	close(cg_child);
>   	close(cg_parent);
>   }