[bpf-next,6/6] selftests/bpf: Drop make_socket in sk_lookup

Commit Message

Geliang Tang June 21, 2024, 10:35 a.m. UTC

From: Geliang Tang <[e-mail]>

Use public network helpers make_sockaddr() and connect_to_addr() instead of
using the local defined function make_socket() and connect().

Then make_socket() can be dropped.

Signed-off-by: Geliang Tang <[e-mail]>
---
 .../selftests/bpf/prog_tests/sk_lookup.c      | 50 +++----------------
 1 file changed, 6 insertions(+), 44 deletions(-)

Comments

Eduard Zingerman June 21, 2024, 8:45 p.m. UTC | #1

On Fri, 2024-06-21 at 18:35 +0800, Geliang Tang wrote:

[...]

> @@ -224,24 +188,22 @@ static int make_server(int sotype, const char *ip, int port,
>  
>  static int make_client(int sotype, const char *ip, int port)
>  {
> +	int family = is_ipv6(ip) ? AF_INET6 : AF_INET;
>  	struct sockaddr_storage addr = {0};
>  	socklen_t len;
>  	int err, fd;
>  
> -	fd = make_socket(sotype, ip, port, &addr, &len);
> -	if (fd < 0)
> +	err = make_sockaddr(family, ip, port, &addr, &len);
> +	if (err)
>  		return -1;
>  
> -	err = connect(fd, (void *)&addr, len);
> -	if (CHECK(err, "make_client", "connect")) {
> +	fd = connect_to_addr(sotype, &addr, len, NULL);

Nit: same nit about timeout, need to pass options here.

> +	if (CHECK(fd < 0, "connect_to_addr", "connect")) {
>  		log_err("failed to connect client socket");
> -		goto fail;
> +		return -1;
>  	}
>  
>  	return fd;
> -fail:
> -	close(fd);
> -	return -1;
>  }
>  
>  static __u64 socket_cookie(int fd)

Patch

diff --git a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
index 0f2e8a4c1524..e4c983a00511 100644
--- a/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
+++ b/tools/testing/selftests/bpf/prog_tests/sk_lookup.c
@@ -47,8 +47,6 @@ 
 #define INT_IP6		"fd00::2"
 #define INT_PORT	8008
 
-#define IO_TIMEOUT_SEC	3
-
 enum server {
 	SERVER_A = 0,
 	SERVER_B = 1,
@@ -108,40 +106,6 @@  static int attach_reuseport(int sock_fd, struct bpf_program *reuseport_prog)
 	return 0;
 }
 
-static int make_socket(int sotype, const char *ip, int port,
-		       struct sockaddr_storage *addr, socklen_t *len)
-{
-	struct timeval timeo = { .tv_sec = IO_TIMEOUT_SEC };
-	int err, family, fd;
-
-	family = is_ipv6(ip) ? AF_INET6 : AF_INET;
-	err = make_sockaddr(family, ip, port, addr, len);
-	if (CHECK(err, "make_address", "failed\n"))
-		return -1;
-
-	fd = socket(addr->ss_family, sotype, 0);
-	if (CHECK(fd < 0, "socket", "failed\n")) {
-		log_err("failed to make socket");
-		return -1;
-	}
-
-	err = setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, &timeo, sizeof(timeo));
-	if (CHECK(err, "setsockopt(SO_SNDTIMEO)", "failed\n")) {
-		log_err("failed to set SNDTIMEO");
-		close(fd);
-		return -1;
-	}
-
-	err = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &timeo, sizeof(timeo));
-	if (CHECK(err, "setsockopt(SO_RCVTIMEO)", "failed\n")) {
-		log_err("failed to set RCVTIMEO");
-		close(fd);
-		return -1;
-	}
-
-	return fd;
-}
-
 static int setsockopts(int fd, void *opts)
 {
 	struct cb_opts *co = (struct cb_opts *)opts;
@@ -224,24 +188,22 @@  static int make_server(int sotype, const char *ip, int port,
 
 static int make_client(int sotype, const char *ip, int port)
 {
+	int family = is_ipv6(ip) ? AF_INET6 : AF_INET;
 	struct sockaddr_storage addr = {0};
 	socklen_t len;
 	int err, fd;
 
-	fd = make_socket(sotype, ip, port, &addr, &len);
-	if (fd < 0)
+	err = make_sockaddr(family, ip, port, &addr, &len);
+	if (err)
 		return -1;
 
-	err = connect(fd, (void *)&addr, len);
-	if (CHECK(err, "make_client", "connect")) {
+	fd = connect_to_addr(sotype, &addr, len, NULL);
+	if (CHECK(fd < 0, "connect_to_addr", "connect")) {
 		log_err("failed to connect client socket");
-		goto fail;
+		return -1;
 	}
 
 	return fd;
-fail:
-	close(fd);
-	return -1;
 }
 
 static __u64 socket_cookie(int fd)