use network helpers, part 7
Subsystems (4)
Geliang Tang
reviewerv6 cover use network helpers, part 7
From: Geliang Tang <[email protected]>
v6:
- update ASSERT strings in patch 4 as Eduard suggested. (thanks)
v5:
- update patch 1, add getsockopt(SO_PROTOCOL) in connect_to_fd() to
fix errors reported by CI.
v4:
- fix errors reported by CI.
v3:
- rename start_client to client_socket
- Use connect_to_addr in connect_to_fd_opt
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-4 address Martin's comments in the previous series.
Geliang Tang (6):
selftests/bpf: Drop type from network_helper_opts selftests/bpf: Use connect_to_addr in connect_to_fd_opt selftests/bpf: Add client_socket helper
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 | 100 +++++++++--------- tools/testing/selftests/bpf/network_helpers.h | 6 +- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 2 +- .../selftests/bpf/prog_tests/cgroup_v1v2.c | 4 +- .../bpf/prog_tests/ip_check_defrag.c | 14 ++- .../testing/selftests/bpf/prog_tests/mptcp.c | 7 +- .../bpf/test_tcp_check_syncookie_user.c | 29 +---- 7 files changed, 64 insertions(+), 98 deletions(-)
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v6 1/6 selftests/bpf: Drop type from network_helper_opts
From: Geliang Tang <[email protected]>
The opts.{type, noconnect} 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 and getsockopt(SO_TYPE) can be replaced by "type" parameter in it.
In connect_to_fd(), use getsockopt(SO_TYPE) to get "type" value and pass it to connect_to_fd_opts().
In bpf_tcp_ca.c and cgroup_v1v2.c, "SOCK_STREAM" types are passed to connect_to_fd_opts(), and in ip_check_defrag.c, different types "SOCK_RAW" and "SOCK_DGRAM" are passed to it.
With these changes, the strcut member "type" of network_helper_opts can be dropped now.
--- tools/testing/selftests/bpf/network_helpers.c | 45 +++++++++---------- tools/testing/selftests/bpf/network_helpers.h | 3 +- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 2 +- .../selftests/bpf/prog_tests/cgroup_v1v2.c | 4 +- .../bpf/prog_tests/ip_check_defrag.c | 5 +-- 5 files changed, 26 insertions(+), 33 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +20 -25
@@ -303,36 +303,16 @@ 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; +socklen_t addrlen; +int fd;if (!opts) opts = &default_opts; - optlen =sizeof (type); - -if (opts->type) { - type = opts->type; - }else { -if (getsockopt (server_fd,SOL_SOCKET ,SO_TYPE , &type, &optlen)) { -log_err ("getsockopt(SOL_TYPE)" ); -return -1 ; - } - } - -if (opts->proto) { - protocol = opts->proto; - }else { -if (getsockopt (server_fd,SOL_SOCKET ,SO_PROTOCOL , &protocol, &optlen)) { -log_err ("getsockopt(SOL_PROTOCOL)" ); -return -1 ; - } - } - addrlen =sizeof (addr);if (getsockname (server_fd, (struct sockaddr *)&addr, &addrlen)) {log_err ("Failed to get server addr" );
@@ -340,7 +320,7 @@ int connect_to_fd_opts(int server_fd, const struct network_helper_opts *opts) } addr_in = (struct sockaddr_in *)&addr; - fd =socket (addr_in->sin_family, type, protocol); + fd =socket (addr_in->sin_family, type, opts->proto);if (fd <0 ) {log_err ("Failed to create client socket" );return -1 ;
@@ -369,8 +349,23 @@ int connect_to_fd(int server_fd, int timeout_ms)struct network_helper_opts opts = { .timeout_ms = timeout_ms, }; +int type, protocol; +socklen_t optlen; + + optlen =sizeof (type); +if (getsockopt (server_fd,SOL_SOCKET ,SO_TYPE , &type, &optlen)) { +log_err ("getsockopt(SOL_TYPE)" ); +return -1 ; + } + + optlen =sizeof (protocol); +if (getsockopt (server_fd,SOL_SOCKET ,SO_PROTOCOL , &protocol, &optlen)) { +log_err ("getsockopt(SOL_PROTOCOL)" ); +return -1 ; + } + opts.proto = protocol; -return connect_to_fd_opts (server_fd, &opts); +return connect_to_fd_opts (server_fd, type, &opts); }int connect_fd_to_fd (int client_fd,int server_fd,int timeout_ms)
tools/testing/selftests/bpf/network_helpers.h +1 -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,7 @@ 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,SOCK_STREAM , 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,SOCK_STREAM , &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,SOCK_STREAM , &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,SOCK_DGRAM , &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 v6 2/6 selftests/bpf: Use connect_to_addr in connect_to_fd_opt
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch moves "post_socket_cb" and "noconnect" into connect_to_addr(), then connect_to_fd_opts() can be implemented by getsockname() and connect_to_addr(). This change makes connect_to_* interfaces more unified.
--- tools/testing/selftests/bpf/network_helpers.c | 33 ++++--------------- 1 file changed, 7 insertions(+), 26 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +7 -26
@@ -293,9 +293,14 @@ int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t addif (settimeo (fd, opts->timeout_ms)) goto error_close; -if (connect_fd_to_addr (fd, addr, addrlen, opts->must_fail)) +if (opts->post_socket_cb && + 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:
@@ -306,9 +311,7 @@ int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t addint 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; -int fd;if (!opts) opts = &default_opts;
@@ -319,29 +322,7 @@ int connect_to_fd_opts(int server_fd, int type, const struct network_helper_optsreturn -1 ; } - addr_in = (struct sockaddr_in *)&addr; - fd =socket (addr_in->sin_family, type, opts->proto); -if (fd <0 ) { -log_err ("Failed to create client socket" ); -return -1 ; - } - -if (settimeo (fd, opts->timeout_ms)) - goto error_close; - -if (opts->post_socket_cb && - 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 ; +return connect_to_addr (type, &addr, addrlen, opts); }int connect_to_fd (int server_fd,int timeout_ms)
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v6 3/6 selftests/bpf: Add client_socket helper
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch extracts a new helper client_socket() 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 client_socket() and connect_fd_to_addr(). This helper can be used in connect_to_addr() too, and make "noconnect" opts useless.
--- tools/testing/selftests/bpf/network_helpers.c | 37 +++++++++++++++---- tools/testing/selftests/bpf/network_helpers.h | 2 + 2 files changed, 31 insertions(+), 8 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +29 -8
@@ -249,6 +249,34 @@ int fastopen_connect(int server_fd, const char *data, unsigned int data_len,return -1 ; } +int client_socket (int family,int type, +const struct network_helper_opts *opts) +{ +int fd; + +if (!opts) + opts = &default_opts; + + fd =socket (family, type, opts->proto); +if (fd <0 ) { +log_err ("Failed to create client socket" ); +return -1 ; + } + +if (settimeo (fd, opts->timeout_ms)) + goto error_close; + +if (opts->post_socket_cb && + opts->post_socket_cb (fd, opts->cb_opts)) + goto error_close; + +return fd; + +error_close: +save_errno_close (fd); +return -1 ; +} +static int connect_fd_to_addr (int fd,const struct sockaddr_storage *addr,socklen_t addrlen,const bool must_fail)
@@ -284,19 +312,12 @@ int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t addif (!opts) opts = &default_opts; - fd =socket (addr->ss_family, type, opts->proto); + fd =client_socket (addr->ss_family, type, opts);if (fd <0 ) {log_err ("Failed to create client socket" );return -1 ; } -if (settimeo (fd, opts->timeout_ms)) - goto error_close; - -if (opts->post_socket_cb && - 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;
tools/testing/selftests/bpf/network_helpers.h +2 -0
@@ -57,6 +57,8 @@ int *start_reuseport_server(int family, int type, const char *addr_str,int start_server_addr (int type,const struct sockaddr_storage *addr,socklen_t len,const struct network_helper_opts *opts);void free_fds (int *fds,unsigned int nr_close_fds); +int client_socket (int family,int type, +const struct network_helper_opts *opts);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);
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v6 4/6 selftests/bpf: Drop noconnect from network_helper_opts
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
In test_bpf_ip_check_defrag_ok(), the new helper client_socket() 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, always connect to server in connect_to_fd_opts().
--- tools/testing/selftests/bpf/network_helpers.c | 5 ++--- tools/testing/selftests/bpf/network_helpers.h | 1 - .../selftests/bpf/prog_tests/ip_check_defrag.c | 13 ++++++------- 3 files changed, 8 insertions(+), 11 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +2 -3
@@ -318,9 +318,8 @@ int connect_to_addr(int type, const struct sockaddr_storage *addr, socklen_t addreturn -1 ; } -if (!opts->noconnect) -if (connect_fd_to_addr (fd, addr, addrlen, opts->must_fail)) - goto error_close; +if (connect_fd_to_addr (fd, addr, addrlen, opts->must_fail)) + goto error_close;return fd;
tools/testing/selftests/bpf/network_helpers.h +0 -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;
tools/testing/selftests/bpf/prog_tests/ip_check_defrag.c +6 -7
@@ -158,14 +158,13 @@ static int send_frags6(int client)void test_bpf_ip_check_defrag_ok (bool ipv6) { +int family = ipv6 ?AF_INET6 :AF_INET ;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;
@@ -191,7 +190,7 @@ void test_bpf_ip_check_defrag_ok(bool ipv6) nstoken =open_netns (NS1 );if (!ASSERT_OK_PTR (nstoken,"setns ns1" )) goto out; - srv_fd =start_server (ipv6 ?AF_INET6 :AF_INET ,SOCK_DGRAM ,NULL ,SERVER_PORT ,0 ); + srv_fd =start_server (family,SOCK_DGRAM ,NULL ,SERVER_PORT ,0 );close_netns (nstoken);if (!ASSERT_GE (srv_fd,0 ,"start_server" )) goto out;
@@ -200,18 +199,18 @@ 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 =client_socket (family,SOCK_RAW , &tx_ops);close_netns (nstoken); -if (!ASSERT_GE (client_tx_fd,0 ,"connect_to_fd_opts" )) +if (!ASSERT_GE (client_tx_fd,0 ,"client_socket" )) goto out;/* Open rx socket in ns0 */ nstoken =open_netns (NS0 );if (!ASSERT_OK_PTR (nstoken,"setns ns0" )) goto out; - client_rx_fd =connect_to_fd_opts (srv_fd,SOCK_DGRAM , &rx_opts); + client_rx_fd =client_socket (family,SOCK_DGRAM , &rx_opts);close_netns (nstoken); -if (!ASSERT_GE (client_rx_fd,0 ,"connect_to_fd_opts" )) +if (!ASSERT_GE (client_rx_fd,0 ,"client_socket" )) goto out;/* Bind rx socket to a premeditated port */
Signature · 1 line
2.43.0
Geliang Tang
reviewerPATCH v6 5/6 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 v6 6/6 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
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Alexei Starovoitov <[email protected]>:
Quoted 10 lines · On Fri, 21 Jun 2024 10:15:57 +0800 you wrote:
From: Geliang Tang <[email protected]>
v6:
- update ASSERT strings in patch 4 as Eduard suggested. (thanks)v5:
- update patch 1, addgetsockopt(SO_PROTOCOL)inconnect_to_fd()to
fix errors reported by CI.[...]
Here is the summary with links:
- [bpf-next,v6,1/6] selftests/bpf: Drop type from network_helper_opts
https://git.kernel.org/bpf/bpf-next/c/34ad6ec97252 - [bpf-next,v6,2/6] selftests/bpf: Use connect_to_addr in connect_to_fd_opt https://git.kernel.org/bpf/bpf-next/c/08a5206240d3 - [bpf-next,v6,3/6] selftests/bpf: Add client_socket helper https://git.kernel.org/bpf/bpf-next/c/bbca57aa378b - [bpf-next,v6,4/6] selftests/bpf: Drop noconnect from network_helper_opts https://git.kernel.org/bpf/bpf-next/c/7f0d5140a6d6 - [bpf-next,v6,5/6] selftests/bpf: Use start_server_str in mptcp https://git.kernel.org/bpf/bpf-next/c/fb69f71cf585 - [bpf-next,v6,6/6] selftests/bpf: Use start_server_str in test_tcp_check_syncookie_user https://git.kernel.org/bpf/bpf-next/c/8cab7cdcf5ae
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html