Re: [PATCH net-next v6 4/5] vsock/test: Introduce enable_so_linger() helper

[Stefano Garzarella <sgarzare@xxxxxxxxxx>]

On Thu, May 22, 2025 at 01:18:24AM +0200, Michal Luczaj wrote:
> Add a helper function that sets SO_LINGER. Adapt the caller.
>
> Signed-off-by: Michal Luczaj <mhal@xxxxxxx>
> ---
> tools/testing/vsock/util.c       | 13 +++++++++++++
> tools/testing/vsock/util.h       |  1 +
> tools/testing/vsock/vsock_test.c | 10 +---------
> 3 files changed, 15 insertions(+), 9 deletions(-)

Reviewed-by: Stefano Garzarella <sgarzare@xxxxxxxxxx>

> diff --git a/tools/testing/vsock/util.c b/tools/testing/vsock/util.c
> index 4427d459e199f643d415dfc13e071f21a2e4d6ba..0c7e9cbcbc85cde9c8764fc3bb623cde2f6c77a6 100644
> --- a/tools/testing/vsock/util.c
> +++ b/tools/testing/vsock/util.c
> @@ -823,3 +823,16 @@ void enable_so_zerocopy_check(int fd)
> 	setsockopt_int_check(fd, SOL_SOCKET, SO_ZEROCOPY, 1,
> 			     "setsockopt SO_ZEROCOPY");
> }
> +
> +void enable_so_linger(int fd, int timeout)
> +{
> +	struct linger optval = {
> +		.l_onoff = 1,
> +		.l_linger = timeout
> +	};
> +
> +	if (setsockopt(fd, SOL_SOCKET, SO_LINGER, &optval, sizeof(optval))) {
> +		perror("setsockopt(SO_LINGER)");
> +		exit(EXIT_FAILURE);
> +	}
> +}
> diff --git a/tools/testing/vsock/util.h b/tools/testing/vsock/util.h
> index 91f9df12f26a0858777e1a65456f8058544a5f18..5e2db67072d5053804a9bb93934b625ea78bcd7a 100644
> --- a/tools/testing/vsock/util.h
> +++ b/tools/testing/vsock/util.h
> @@ -80,4 +80,5 @@ void setsockopt_int_check(int fd, int level, int optname, int val,
> void setsockopt_timeval_check(int fd, int level, int optname,
> 			      struct timeval val, char const *errmsg);
> void enable_so_zerocopy_check(int fd);
> +void enable_so_linger(int fd, int timeout);
> #endif /* UTIL_H */
> diff --git a/tools/testing/vsock/vsock_test.c b/tools/testing/vsock/vsock_test.c
> index 9d3a77be26f4eb5854629bb1fce08c4ef5485c84..b3258d6ba21a5f51cf4791514854bb40451399a9 100644
> --- a/tools/testing/vsock/vsock_test.c
> +++ b/tools/testing/vsock/vsock_test.c
> @@ -1813,10 +1813,6 @@ static void test_stream_connect_retry_server(const struct test_opts *opts)
>
> static void test_stream_linger_client(const struct test_opts *opts)
> {
> -	struct linger optval = {
> -		.l_onoff = 1,
> -		.l_linger = 1
> -	};
> 	int fd;
>
> 	fd = vsock_stream_connect(opts->peer_cid, opts->peer_port);
> @@ -1825,11 +1821,7 @@ static void test_stream_linger_client(const struct test_opts *opts)
> 		exit(EXIT_FAILURE);
> 	}
>
> -	if (setsockopt(fd, SOL_SOCKET, SO_LINGER, &optval, sizeof(optval))) {
> -		perror("setsockopt(SO_LINGER)");
> -		exit(EXIT_FAILURE);
> -	}
> -
> +	enable_so_linger(fd, 1);
> 	close(fd);
> }
>
>
> --
> 2.49.0