use network helpers, part 7
Subsystems (4)
Geliang Tang
reviewerv2 cover use network helpers, part 7
From: Geliang Tang <[email protected]>
v2:
- update patch 2, extract a new helper start_client.
- drop patch 3, keep must_fail in network_helper_opts.
Drop type and noconnect from network_helper_opts. And use start_server_str in mptcp and test_tcp_check_syncookie_user.
Patches 1-2 address Martin's comments in the previous series.
Geliang Tang (4):
selftests/bpf: Drop type from network_helper_opts selftests/bpf: Drop noconnect from network_helper_opts selftests/bpf: Use start_server_str in mptcp selftests/bpf: Use start_server_str in test_tcp_check_syncookie_user
tools/testing/selftests/bpf/network_helpers.c | 45 +++++++++++++++---- tools/testing/selftests/bpf/network_helpers.h | 7 +-- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 2 +- .../selftests/bpf/prog_tests/cgroup_v1v2.c | 4 +- .../bpf/prog_tests/ip_check_defrag.c | 7 +-- .../testing/selftests/bpf/prog_tests/mptcp.c | 7 +-- .../bpf/test_tcp_check_syncookie_user.c | 29 ++---------- 7 files changed, 49 insertions(+), 52 deletions(-)
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v2 1/4 selftests/bpf: Drop type from network_helper_opts
From: Geliang Tang <[email protected]>
The opts.{type, noconnect, must_fail} is at least a bit non intuitive or unnecessary. The only use case now is in test_bpf_ip_check_defrag_ok which ends up bypassing most (or at least some) of the connect_to_fd_opts() logic. It's much better that test should have its own connect_to_fd_opts() instead.
This patch adds a new "type" parameter for connect_to_fd_opts(), then opts->type can be replaced by "type" parameter in it.
In test_bpf_ip_check_defrag_ok, different types are passed to it. And the strcut member "type" of network_helper_opts can be dropped now.
--- tools/testing/selftests/bpf/network_helpers.c | 11 +++++------ tools/testing/selftests/bpf/network_helpers.h | 4 ++-- tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 2 +- tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c | 4 ++-- .../selftests/bpf/prog_tests/ip_check_defrag.c | 5 ++--- 5 files changed, 12 insertions(+), 14 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +5 -6
@@ -303,21 +303,20 @@ int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t addreturn -1 ; } -int connect_to_fd_opts (int server_fd,const struct network_helper_opts *opts) +int connect_to_fd_opts (int server_fd,int type, +const struct network_helper_opts *opts) {struct sockaddr_storage addr;struct sockaddr_in *addr_in;socklen_t addrlen, optlen; -int fd, type, protocol; +int fd, protocol;if (!opts) opts = &default_opts; optlen =sizeof (type); -if (opts->type) { - type = opts->type; - }else { +if (!type) {if (getsockopt (server_fd,SOL_SOCKET ,SO_TYPE , &type, &optlen)) {log_err ("getsockopt(SOL_TYPE)" );return -1 ;
@@ -370,7 +369,7 @@ int connect_to_fd(int server_fd, int timeout_ms) .timeout_ms = timeout_ms, }; -return connect_to_fd_opts (server_fd, &opts); +return connect_to_fd_opts (server_fd,0 , &opts); }int connect_fd_to_fd (int client_fd,int server_fd,int timeout_ms)
tools/testing/selftests/bpf/network_helpers.h +2 -2
@@ -25,7 +25,6 @@ struct network_helper_opts {int timeout_ms;bool must_fail;bool noconnect; -int type;int proto;int (*post_socket_cb)(int fd,void *opts);void *cb_opts;
@@ -61,7 +60,8 @@ void free_fds(int *fds, unsigned int nr_close_fds);int connect_to_addr (int type,const struct sockaddr_storage *addr,socklen_t len,const struct network_helper_opts *opts);int connect_to_fd (int server_fd,int timeout_ms); -int connect_to_fd_opts (int server_fd,const struct network_helper_opts *opts); +int connect_to_fd_opts (int server_fd,int type, +const struct network_helper_opts *opts);int connect_fd_to_fd (int client_fd,int server_fd,int timeout_ms);int fastopen_connect (int server_fd,const char *data,unsigned int data_len,int timeout_ms);
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +1 -1
@@ -49,7 +49,7 @@ static bool start_test(char *addr_str, goto err;/* connect to server */ - *cli_fd =connect_to_fd_opts (*srv_fd, cli_opts); + *cli_fd =connect_to_fd_opts (*srv_fd,0 , cli_opts);if (!ASSERT_NEQ (*cli_fd,-1 ,"connect_to_fd_opts" )) goto err;
tools/testing/selftests/bpf/prog_tests/cgroup_v1v2.c +2 -2
@@ -32,7 +32,7 @@ static int run_test(int cgroup_fd, int server_fd, bool classid) goto out; } - fd =connect_to_fd_opts (server_fd, &opts); + fd =connect_to_fd_opts (server_fd,0 , &opts);if (fd <0 ) err =-1 ;else
@@ -52,7 +52,7 @@ void test_cgroup_v1v2(void) server_fd =start_server (AF_INET ,SOCK_STREAM ,NULL , port,0 );if (!ASSERT_GE (server_fd,0 ,"server_fd" ))return ; - client_fd =connect_to_fd_opts (server_fd, &opts); + client_fd =connect_to_fd_opts (server_fd,0 , &opts);if (!ASSERT_GE (client_fd,0 ,"client_fd" )) {close (server_fd);return ;
tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c +2 -3
@@ -164,7 +164,6 @@ void test_bpf_ip_check_defrag_ok(bool ipv6) };struct network_helper_opts tx_ops = { .timeout_ms =1000 , - .type =SOCK_RAW , .proto =IPPROTO_RAW , .noconnect = true, };
@@ -201,7 +200,7 @@ void test_bpf_ip_check_defrag_ok(bool ipv6) nstoken =open_netns (NS0 );if (!ASSERT_OK_PTR (nstoken,"setns ns0" )) goto out; - client_tx_fd =connect_to_fd_opts (srv_fd, &tx_ops); + client_tx_fd =connect_to_fd_opts (srv_fd,SOCK_RAW , &tx_ops);close_netns (nstoken);if (!ASSERT_GE (client_tx_fd,0 ,"connect_to_fd_opts" )) goto out;
@@ -210,7 +209,7 @@ void test_bpf_ip_check_defrag_ok(bool ipv6) nstoken =open_netns (NS0 );if (!ASSERT_OK_PTR (nstoken,"setns ns0" )) goto out; - client_rx_fd =connect_to_fd_opts (srv_fd, &rx_opts); + client_rx_fd =connect_to_fd_opts (srv_fd,0 , &rx_opts);close_netns (nstoken);if (!ASSERT_GE (client_rx_fd,0 ,"connect_to_fd_opts" )) goto out;
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v2 2/4 selftests/bpf: Drop noconnect from network_helper_opts
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch extracts a new helper start_client() from connect_to_fd_opts() to create the client socket, but don't connect to the server. Then connect_to_fd_opts() can be implemented using start_client() and connect_fd_to_addr().
In test_bpf_ip_check_defrag_ok(), the new helper can be used to replace connect_to_fd_opts() with "noconnect" opts, and the strcut member "noconnect" of network_helper_opts can be dropped now.
--- tools/testing/selftests/bpf/network_helpers.c | 38 ++++++++++++++++--- tools/testing/selftests/bpf/network_helpers.h | 3 +- .../bpf/prog_tests/ip_check_defrag.c | 6 +-- 3 files changed, 37 insertions(+), 10 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +33 -5
@@ -303,8 +303,8 @@ int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t addreturn -1 ; } -int connect_to_fd_opts (int server_fd,int type, -const struct network_helper_opts *opts) +int start_client (int server_fd,int type, +const struct network_helper_opts *opts) {struct sockaddr_storage addr;struct sockaddr_in *addr_in;
@@ -352,9 +352,37 @@ int connect_to_fd_opts(int server_fd, int type, opts->post_socket_cb(fd, opts->cb_opts)) goto error_close; -if (!opts->noconnect) -if (connect_fd_to_addr (fd, &addr, addrlen, opts->must_fail)) - goto error_close; +return fd; + +error_close: +save_errno_close (fd); +return -1 ; +} + +int connect_to_fd_opts (int server_fd,int type, +const struct network_helper_opts *opts) +{ +struct sockaddr_storage addr; +socklen_t addrlen; +int fd; + +if (!opts) + opts = &default_opts; + + addrlen =sizeof (addr); +if (getsockname (server_fd, (struct sockaddr *)&addr, &addrlen)) { +log_err ("Failed to get server addr" ); +return -1 ; + } + + fd =start_client (server_fd, type, opts); +if (fd <0 ) { +log_err ("Failed to create client socket" ); +return -1 ; + } + +if (connect_fd_to_addr (fd, &addr, addrlen, opts->must_fail)) + goto error_close;return fd;
tools/testing/selftests/bpf/network_helpers.h +2 -1
@@ -24,7 +24,6 @@ typedef __u16 __sum16;struct network_helper_opts {int timeout_ms;bool must_fail; -bool noconnect;int proto;int (*post_socket_cb)(int fd,void *opts);void *cb_opts;
@@ -60,6 +59,8 @@ void free_fds(int *fds, unsigned int nr_close_fds);int connect_to_addr (int type,const struct sockaddr_storage *addr,socklen_t len,const struct network_helper_opts *opts);int connect_to_fd (int server_fd,int timeout_ms); +int start_client (int server_fd,int type, +const struct network_helper_opts *opts);int connect_to_fd_opts (int server_fd,int type,const struct network_helper_opts *opts);int connect_fd_to_fd (int client_fd,int server_fd,int timeout_ms);
tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c +2 -4
@@ -160,12 +160,10 @@ void test_bpf_ip_check_defrag_ok(bool ipv6) {struct network_helper_opts rx_opts = { .timeout_ms =1000 , - .noconnect = true, };struct network_helper_opts tx_ops = { .timeout_ms =1000 , .proto =IPPROTO_RAW , - .noconnect = true, };struct sockaddr_storage caddr;struct ip_check_defrag *skel;
@@ -200,7 +198,7 @@ void test_bpf_ip_check_defrag_ok(bool ipv6) nstoken =open_netns (NS0 );if (!ASSERT_OK_PTR (nstoken,"setns ns0" )) goto out; - client_tx_fd =connect_to_fd_opts (srv_fd,SOCK_RAW , &tx_ops); + client_tx_fd =start_client (srv_fd,SOCK_RAW , &tx_ops);close_netns (nstoken);if (!ASSERT_GE (client_tx_fd,0 ,"connect_to_fd_opts" )) goto out;
@@ -209,7 +207,7 @@ void test_bpf_ip_check_defrag_ok(bool ipv6) nstoken =open_netns (NS0 );if (!ASSERT_OK_PTR (nstoken,"setns ns0" )) goto out; - client_rx_fd =connect_to_fd_opts (srv_fd,0 , &rx_opts); + client_rx_fd =start_client (srv_fd,0 , &rx_opts);close_netns (nstoken);if (!ASSERT_GE (client_rx_fd,0 ,"connect_to_fd_opts" )) goto out;
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v2 3/4 selftests/bpf: Use start_server_str in mptcp
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Since start_server_str() is added now, it can be used in mptcp.c in start_mptcp_server() instead of using helpers make_sockaddr() and start_server_addr() to simplify the code.
--- tools/testing/selftests/bpf/prog_tests/mptcp.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
tools/testing/selftests/bpf/prog_tests/mptcp.c +1 -6
@@ -89,13 +89,8 @@ static int start_mptcp_server(int family, const char *addr_str, __u16 port, .timeout_ms = timeout_ms, .proto = IPPROTO_MPTCP, }; -struct sockaddr_storage addr; -socklen_t addrlen; -if (make_sockaddr (family, addr_str, port, &addr, &addrlen)) -return -1 ; - -return start_server_addr (SOCK_STREAM , &addr, addrlen, &opts); +return start_server_str (family,SOCK_STREAM , addr_str, port, &opts); }static int verify_tsk (int map_fd,int client_fd)
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v2 4/4 selftests/bpf: Use start_server_str in test_tcp_check_syncookie_user
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Since start_server_str() is added now, it can be used in script test_tcp_check_syncookie_user.c instead of start_server_addr() to simplify the code.
--- .../bpf/test_tcp_check_syncookie_user.c | 29 ++----------------- 1 file changed, 3 insertions(+), 26 deletions(-)
tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c +3 -26
@@ -156,10 +156,6 @@ static int v6only_false(int fd, void *opts)int main (int argc,char **argv) {struct network_helper_opts opts = {0 }; -struct sockaddr_in addr4; -struct sockaddr_in6 addr6; -struct sockaddr_in addr4dual; -struct sockaddr_in6 addr6dual;int server =-1 ;int server_v6 =-1 ;int server_dual =-1 ;
@@ -181,36 +177,17 @@ int main(int argc, char **argv) goto err; } -memset (&addr4,0 ,sizeof (addr4)); - addr4.sin_family =AF_INET ; - addr4.sin_addr.s_addr =htonl (INADDR_LOOPBACK ); - addr4.sin_port =0 ; -memcpy (&addr4dual, &addr4,sizeof (addr4dual)); - -memset (&addr6,0 ,sizeof (addr6)); - addr6.sin6_family =AF_INET6 ; - addr6.sin6_addr = in6addr_loopback; - addr6.sin6_port =0 ; - -memset (&addr6dual,0 ,sizeof (addr6dual)); - addr6dual.sin6_family =AF_INET6 ; - addr6dual.sin6_addr = in6addr_any; - addr6dual.sin6_port =0 ; - - server =start_server_addr (SOCK_STREAM , (struct sockaddr_storage *)&addr4, -sizeof (addr4),NULL ); + server =start_server_str (AF_INET ,SOCK_STREAM ,"127.0.0.1" ,0 ,NULL );if (server ==-1 ) goto err; opts.post_socket_cb = v6only_true; - server_v6 =start_server_addr (SOCK_STREAM , (struct sockaddr_storage *)&addr6, -sizeof (addr6), &opts); + server_v6 =start_server_str (AF_INET6 ,SOCK_STREAM ,"::1" ,0 , &opts);if (server_v6 ==-1 ) goto err; opts.post_socket_cb = v6only_false; - server_dual =start_server_addr (SOCK_STREAM , (struct sockaddr_storage *)&addr6dual, -sizeof (addr6dual), &opts); + server_dual =start_server_str (AF_INET6 ,SOCK_STREAM ,"::0" ,0 , &opts);if (server_dual ==-1 ) goto err;
Signature · 1 line
2.43.0
Geliang Tang
reviewerSuperseded, will send a v3 soon.
Thanks,
-Geliang
Quoted 29 lines · Geliang Tang
From: Geliang Tang <[email protected]>
v2:
- update patch 2, extract a new helperstart_client.
- drop patch 3, keepmust_failinnetwork_helper_opts.Drop type and noconnect from
network_helper_opts. And usestart_server_str
in mptcp andtest_tcp_check_syncookie_user.Patches 1-2 address Martin's comments in the previous series.
Geliang Tang (4):
selftests/bpf: Drop type fromnetwork_helper_optsselftests/bpf: Drop noconnect fromnetwork_helper_optsselftests/bpf: Usestart_server_strin mptcp selftests/bpf: Usestart_server_strintest_tcp_check_syncookie_usertools/testing/selftests/bpf/network_helpers.c | 45 +++++++++++++++-- --
tools/testing/selftests/bpf/network_helpers.h | 7 +-- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 2 +- .../selftests/bpf/prog_tests/cgroup_v1v2.c | 4 +- .../bpf/prog_tests/ip_check_defrag.c | 7 +-- .../testing/selftests/bpf/prog_tests/mptcp.c | 7 +-- .../bpf/test_tcp_check_syncookie_user.c | 29 ++----------7 files changed, 49 insertions(+), 52 deletions(-)