use network helpers, part 8
Subsystems (3)
v2 cover use network helpers, part 8
From: Geliang Tang <[email protected]>
v2:
- address Eduard's comments in v1. (thanks)
- fix errors reported by CI.
This patch set uses network helpers in sockmap_ktls and sk_lookup, and drop three local helpers tcp_server(), inetaddr_len() and make_socket() in them.
Geliang Tang (7):
selftests/bpf: Use start_server in sockmap_ktls selftests/bpf: Use connect_to_fd in sockmap_ktls selftests/bpf: Use start_server_str in sk_lookup selftests/bpf: Use connect_to_fd in sk_lookup selftests/bpf: Use connect_to_addr in sk_lookup selftests/bpf: Drop inetaddr_len in sk_lookup selftests/bpf: Drop make_socket in sk_lookup
.../selftests/bpf/prog_tests/sk_lookup.c | 138 ++++++------------ .../selftests/bpf/prog_tests/sockmap_ktls.c | 32 +--- 2 files changed, 52 insertions(+), 118 deletions(-)
Signature · 1 line
2.43.0
PATCH v2 1/7 selftests/bpf: Use start_server in sockmap_ktls
From: Geliang Tang <[email protected]>
Include network_helpers.h in prog_tests/sockmap_ktls.c, use public network helper start_server() instead of the local defined function tcp_server(). This can avoid duplicate code.
Technically, this is not a one-for-one replacement, as start_server() also does bind() and it's listen backlog is 1, not SOMAXCONN. But the difference does not seem to matter.
--- .../selftests/bpf/prog_tests/sockmap_ktls.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c +2 -16
@@ -6,25 +6,11 @@#include <netinet/tcp.h> #include "test_progs.h" +#include "network_helpers.h" #define MAX_TEST_NAME 80#define TCP_ULP 31 -static int tcp_server (int family) -{ -int err, s; - - s =socket (family,SOCK_STREAM ,0 ); -if (!ASSERT_GE (s,0 ,"socket" )) -return -1 ; - - err =listen (s,SOMAXCONN ); -if (!ASSERT_OK (err,"listen" )) -return -1 ; - -return s; -} -static int disconnect (int fd) {struct sockaddr unspec = {AF_UNSPEC };
@@ -39,7 +25,7 @@ static void test_sockmap_ktls_disconnect_after_delete(int family, int map)socklen_t len =sizeof (addr);int err, cli, srv, zero =0 ; - srv =tcp_server (family); + srv =start_server (family,SOCK_STREAM ,NULL ,0 ,0 );if (srv ==-1 )return ;
Signature · 1 line
2.43.0
PATCH v2 2/7 selftests/bpf: Use connect_to_fd in sockmap_ktls
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Use public network helper connect_to_fd() instead of open-coding it in prog_tests/sockmap_ktls.c. This can avoid duplicate code.
--- .../selftests/bpf/prog_tests/sockmap_ktls.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
tools/testing/selftests/bpf/prog_tests/sockmap_ktls.c +2 -12
@@ -21,26 +21,16 @@ static int disconnect(int fd)/* Disconnect (unhash) a kTLS socket after removing it from sockmap. */ static void test_sockmap_ktls_disconnect_after_delete (int family,int map) { -struct sockaddr_storage addr = {0 }; -socklen_t len =sizeof (addr);int err, cli, srv, zero =0 ; srv =start_server (family,SOCK_STREAM ,NULL ,0 ,0 );if (srv ==-1 )return ; - err =getsockname (srv, (struct sockaddr *)&addr, &len); -if (!ASSERT_OK (err,"getsockopt" )) - goto close_srv; - - cli =socket (family,SOCK_STREAM ,0 ); -if (!ASSERT_GE (cli,0 ,"socket" )) + cli =connect_to_fd (srv,0 ); +if (!ASSERT_GE (cli,0 ,"connect_to_fd" )) goto close_srv; - err =connect (cli, (struct sockaddr *)&addr, len); -if (!ASSERT_OK (err,"connect" )) - goto close_cli; - err =bpf_map_update_elem (map, &zero, &cli,0 );if (!ASSERT_OK (err,"bpf_map_update_elem" )) goto close_cli;
Signature · 1 line
2.43.0
PATCH v2 3/7 selftests/bpf: Use start_server_str in sk_lookup
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses public helper start_server_addr() in make_server() in prog_tests/sk_lookup.c to avoid duplicate code.
Add a helper setsockopts() to set SOL_CUSTOM sockopt looply, set it to setsockopt pointer of struct network_helper_opts, and pass it to start_server_addr().
--- .../selftests/bpf/prog_tests/sk_lookup.c | 57 +++++++++++-------- 1 file changed, 33 insertions(+), 24 deletions(-)
tools/testing/selftests/bpf/prog_tests/sk_lookup.c +33 -24
@@ -77,6 +77,12 @@ struct test {bool reuseport_has_conns;/* Add a connected socket to reuseport group */ }; +struct cb_opts { +int family; +int sotype; +bool reuseport; +}; +static __u32 duration;/* for CHECK macro */ static bool is_ipv6 (const char *ip)
@@ -142,19 +148,14 @@ static int make_socket(int sotype, const char *ip, int port,return fd; } -static int make_server (int sotype,const char *ip,int port, -struct bpf_program *reuseport_prog) +static int setsockopts (int fd,void *opts) { -struct sockaddr_storage addr = {0 }; +struct cb_opts *co = (struct cb_opts *)opts;const int one =1 ; -int err, fd =-1 ; - - fd =make_socket (sotype, ip, port, &addr); -if (fd <0 ) -return -1 ; +int err =0 ;/* Enabled for UDPv6 sockets for IPv4-mapped IPv6 to work. */ -if (sotype ==SOCK_DGRAM ) { +if (co->sotype ==SOCK_DGRAM ) { err =setsockopt (fd,SOL_IP ,IP_RECVORIGDSTADDR , &one,sizeof (one));if (CHECK (err,"setsockopt(IP_RECVORIGDSTADDR)" ,"failed\n" )) {
@@ -163,7 +164,7 @@ static int make_server(int sotype, const char *ip, int port, } } -if (sotype ==SOCK_DGRAM && addr.ss_family ==AF_INET6 ) { +if (co->sotype ==SOCK_DGRAM && co->family ==AF_INET6 ) { err =setsockopt (fd,SOL_IPV6 ,IPV6_RECVORIGDSTADDR , &one,sizeof (one));if (CHECK (err,"setsockopt(IPV6_RECVORIGDSTADDR)" ,"failed\n" )) {
@@ -172,7 +173,7 @@ static int make_server(int sotype, const char *ip, int port, } } -if (sotype ==SOCK_STREAM ) { +if (co->sotype ==SOCK_STREAM ) { err =setsockopt (fd,SOL_SOCKET ,SO_REUSEADDR , &one,sizeof (one));if (CHECK (err,"setsockopt(SO_REUSEADDR)" ,"failed\n" )) {
@@ -181,7 +182,7 @@ static int make_server(int sotype, const char *ip, int port, } } -if (reuseport_prog) { +if (co->reuseport) { err =setsockopt (fd,SOL_SOCKET ,SO_REUSEPORT , &one,sizeof (one));if (CHECK (err,"setsockopt(SO_REUSEPORT)" ,"failed\n" )) {
@@ -190,19 +191,27 @@ static int make_server(int sotype, const char *ip, int port, } } - err =bind (fd, (void *)&addr,inetaddr_len (&addr)); -if (CHECK (err,"bind" ,"failed\n" )) { -log_err ("failed to bind listen socket" ); - goto fail; - } +fail: +return err; +} -if (sotype ==SOCK_STREAM ) { - err =listen (fd,SOMAXCONN ); -if (CHECK (err,"make_server" ,"listen" )) { -log_err ("failed to listen on port %d" , port); - goto fail; - } - } +static int make_server (int sotype,const char *ip,int port, +struct bpf_program *reuseport_prog) +{ +struct cb_opts cb_opts = { + .family =is_ipv6 (ip) ?AF_INET6 :AF_INET , + .sotype = sotype, + .reuseport = reuseport_prog, + }; +struct network_helper_opts opts = { + .post_socket_cb = setsockopts, + .cb_opts = &cb_opts, + }; +int err, fd =-1 ; + + fd =start_server_str (cb_opts.family, sotype, ip, port, &opts); +if (CHECK (fd <0 ,"start_server_addr" ,"failed\n" )) +return -1 ;/* Late attach reuseport prog so we can have one init path */ if (reuseport_prog) {
Signature · 1 line
2.43.0
PATCH v2 4/7 selftests/bpf: Use connect_to_fd in sk_lookup
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses public helper connect_to_fd() exported in network_helpers.h instead of using make_socket() and connect() in prog_tests/sk_lookup.c. This can simplify the code.
--- .../testing/selftests/bpf/prog_tests/sk_lookup.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
tools/testing/selftests/bpf/prog_tests/sk_lookup.c +6 -10
@@ -873,7 +873,6 @@ static void test_redirect_lookup(struct test_sk_lookup *skel)static void drop_on_lookup (const struct test *t) { -struct sockaddr_storage dst = {};int client_fd, server_fd, err;struct bpf_link *lookup_link;ssize_t n;
@@ -887,12 +886,11 @@ static void drop_on_lookup(const struct test *t)if (server_fd <0 ) goto detach; - client_fd =make_socket (t->sotype, t->connect_to.ip, - t->connect_to.port, &dst); + client_fd =connect_to_fd (server_fd,IO_TIMEOUT_SEC );if (client_fd <0 ) goto close_srv; - err =connect (client_fd, (void *)&dst,inetaddr_len (&dst)); + err =0 ;if (t->sotype ==SOCK_DGRAM ) { err =send_byte (client_fd);if (err)
@@ -987,7 +985,6 @@ static void test_drop_on_lookup(struct test_sk_lookup *skel)static void drop_on_reuseport (const struct test *t) { -struct sockaddr_storage dst = {0 };int client, server1, server2, err;struct bpf_link *lookup_link;ssize_t n;
@@ -1011,12 +1008,11 @@ static void drop_on_reuseport(const struct test *t)if (server2 <0 ) goto close_srv1; - client =make_socket (t->sotype, t->connect_to.ip, - t->connect_to.port, &dst); + client =connect_to_fd (server2,IO_TIMEOUT_SEC );if (client <0 ) goto close_srv2; - err =connect (client, (void *)&dst,inetaddr_len (&dst)); + err =0 ;if (t->sotype ==SOCK_DGRAM ) { err =send_byte (client);if (err)
@@ -1163,7 +1159,7 @@ static void run_sk_assign_connected(struct test_sk_lookup *skel,if (server_fd <0 )return ; - connected_fd =make_client (sotype,EXT_IP4 ,EXT_PORT ); + connected_fd =connect_to_fd (server_fd,IO_TIMEOUT_SEC );if (connected_fd <0 ) goto out_close_server;
@@ -1177,7 +1173,7 @@ static void run_sk_assign_connected(struct test_sk_lookup *skel, goto out_close_connected;/* Try to redirect TCP SYN / UDP packet to a connected socket */ - client_fd =make_client (sotype,EXT_IP4 ,EXT_PORT ); + client_fd =connect_to_fd (server_fd,IO_TIMEOUT_SEC );if (client_fd <0 ) goto out_unlink_prog;if (sotype ==SOCK_DGRAM ) {
Signature · 1 line
2.43.0
PATCH v2 5/7 selftests/bpf: Use connect_to_addr in sk_lookup
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Use public network helpers make_sockaddr() and connect_to_addr() instead of using the local defined function make_socket() and connect().
This make_socket() can be dropped latter.
--- .../selftests/bpf/prog_tests/sk_lookup.c | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-)
tools/testing/selftests/bpf/prog_tests/sk_lookup.c +7 -13
@@ -230,23 +230,17 @@ 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 network_helper_opts opts = { + .timeout_ms =IO_TIMEOUT_SEC , + };struct sockaddr_storage addr = {0 }; -int err, fd; +socklen_t len; - fd =make_socket (sotype, ip, port, &addr); -if (fd <0 ) +if (make_sockaddr (family, ip, port, &addr, &len))return -1 ; - err =connect (fd, (void *)&addr,inetaddr_len (&addr)); -if (CHECK (err,"make_client" ,"connect" )) { -log_err ("failed to connect client socket" ); - goto fail; - } - -return fd; -fail: -close (fd); -return -1 ; +return connect_to_addr (sotype, &addr, len, &opts); }static __u64 socket_cookie (int fd)
Signature · 1 line
2.43.0
PATCH v2 6/7 selftests/bpf: Drop inetaddr_len in sk_lookup
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch adds a new parameter "len" for make_socket() to get the length of the address by make_sockaddr(), then local helper inetaddr_len() can be dropped.
--- .../testing/selftests/bpf/prog_tests/sk_lookup.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
tools/testing/selftests/bpf/prog_tests/sk_lookup.c +5 -10
@@ -108,20 +108,14 @@ static int attach_reuseport(int sock_fd, struct bpf_program *reuseport_prog)return 0 ; } -static socklen_t inetaddr_len (const struct sockaddr_storage *addr) -{ -return (addr->ss_family ==AF_INET ?sizeof (struct sockaddr_in ) : - addr->ss_family ==AF_INET6 ?sizeof (struct sockaddr_in6 ) :0 ); -} -static int make_socket (int sotype,const char *ip,int port, -struct sockaddr_storage *addr) +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,NULL ); + err =make_sockaddr (family, ip, port, addr, len);if (CHECK (err,"make_address" ,"failed\n" ))return -1 ;
@@ -1220,6 +1214,7 @@ static void run_multi_prog_lookup(const struct test_multi_prog *t)int map_fd, server_fd, client_fd;struct bpf_link *link1, *link2;int prog_idx, done, err; +socklen_t len; map_fd =bpf_map__fd (t->run_map);
@@ -1249,11 +1244,11 @@ static void run_multi_prog_lookup(const struct test_multi_prog *t)if (err) goto out_close_server; - client_fd =make_socket (SOCK_STREAM ,EXT_IP4 ,EXT_PORT , &dst); + client_fd =make_socket (SOCK_STREAM ,EXT_IP4 ,EXT_PORT , &dst, &len);if (client_fd <0 ) goto out_close_server; - err =connect (client_fd, (void *)&dst,inetaddr_len (&dst)); + err =connect (client_fd, (void *)&dst, len);if (CHECK (err && !t->expect_errno,"connect" ,"unexpected error %d\n" , errno)) goto out_close_client;
Signature · 1 line
2.43.0
PATCH v2 7/7 selftests/bpf: Drop make_socket in sk_lookup
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Use local helper make_client() instead of using make_socket() and connect(). Then make_socket() can be dropped now.
--- .../selftests/bpf/prog_tests/sk_lookup.c | 40 +------------------ 1 file changed, 2 insertions(+), 38 deletions(-)
tools/testing/selftests/bpf/prog_tests/sk_lookup.c +2 -38
@@ -108,40 +108,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;
@@ -1210,11 +1176,9 @@ struct test_multi_prog {static void run_multi_prog_lookup (const struct test_multi_prog *t) { -struct sockaddr_storage dst = {};int map_fd, server_fd, client_fd;struct bpf_link *link1, *link2;int prog_idx, done, err; -socklen_t len; map_fd =bpf_map__fd (t->run_map);
@@ -1244,11 +1208,11 @@ static void run_multi_prog_lookup(const struct test_multi_prog *t)if (err) goto out_close_server; - client_fd =make_socket (SOCK_STREAM ,EXT_IP4 ,EXT_PORT , &dst, &len); + client_fd =make_client (SOCK_STREAM ,EXT_IP4 ,EXT_PORT );if (client_fd <0 ) goto out_close_server; - err =connect (client_fd, (void *)&dst, len); + err =0 ;if (CHECK (err && !t->expect_errno,"connect" ,"unexpected error %d\n" , errno)) goto out_close_client;
Signature · 1 line
2.43.0