use start_server and connect_to helpers
Subsystems (4)
Geliang Tang
reviewercover use start_server and connect_to helpers
From: Geliang Tang <[email protected]>
This patchset uses public helpers start_server_* and connect_to_* defined in network_helpers.c to drop duplicate code.
Geliang Tang (14):
selftests/bpf: Add start_server_addr helper selftests/bpf: Use start_server_addr in cls_redirect selftests/bpf: Use connect_to_addr in cls_redirect selftests/bpf: Use start_server_addr in sk_assign selftests/bpf: Use connect_to_addr in sk_assign selftests/bpf: Use log_err in network_helpers selftests/bpf: Use start_server_addr in test_sock_addr selftests/bpf: Use connect_to_addr in test_sock_addr selftests/bpf: Add function pointer for __start_server selftests/bpf: Add start_server_setsockopt helper selftests/bpf: Use start_server_setsockopt in sockopt_inherit selftests/bpf: Use connect_to_fd in sockopt_inherit selftests/bpf: Use start_server_* in test_tcp_check_syncookie selftests/bpf: Use connect_to_addr in test_tcp_check_syncookie
tools/testing/selftests/bpf/Makefile | 4 +- tools/testing/selftests/bpf/network_helpers.c | 53 +++++++++---- tools/testing/selftests/bpf/network_helpers.h | 4 + .../selftests/bpf/prog_tests/cls_redirect.c | 38 +--------- .../selftests/bpf/prog_tests/sk_assign.c | 53 +------------ .../bpf/prog_tests/sockopt_inherit.c | 64 ++++------------ tools/testing/selftests/bpf/test_sock_addr.c | 74 ++---------------- .../bpf/test_tcp_check_syncookie_user.c | 76 +++---------------- 8 files changed, 85 insertions(+), 281 deletions(-)
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 1/14 selftests/bpf: Add start_server_addr helper
From: Geliang Tang <[email protected]>
In order to pair up with connect_to addr(), this patch adds a new helper start_server_addr(), which is a wrapper of __start_server(), and accepts an argument 'addr' of 'struct sockaddr' type instead of a string type argument like start_server().
--- tools/testing/selftests/bpf/network_helpers.c | 5 +++++ tools/testing/selftests/bpf/network_helpers.h | 1 + 2 files changed, 6 insertions(+)
tools/testing/selftests/bpf/network_helpers.c +5 -0
@@ -185,6 +185,11 @@ int *start_reuseport_server(int family, int type, const char *addr_str,return NULL ; } +int start_server_addr (const struct sockaddr *addr,socklen_t addrlen,int type) +{ +return __start_server (type,0 , addr, addrlen,0 ,0 ); +} +void free_fds (int *fds,unsigned int nr_close_fds) {if (fds) {
tools/testing/selftests/bpf/network_helpers.h +1 -0
@@ -53,6 +53,7 @@ int start_mptcp_server(int family, const char *addr, __u16 port,int *start_reuseport_server (int family,int type,const char *addr_str,__u16 port,int timeout_ms,unsigned int nr_listens); +int start_server_addr (const struct sockaddr *addr,socklen_t addrlen,int type);void free_fds (int *fds,unsigned int nr_close_fds);int connect_to_addr (const struct sockaddr_storage *addr,socklen_t len,int type);int connect_to_fd (int server_fd,int timeout_ms);
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 2/14 selftests/bpf: Use start_server_addr in cls_redirect
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Include network_helpers.h in prog_tests/cls_redirect.c, use the newly added public helper start_server_addr() instead of the local defined function start_server(). This can avoid duplicate code.
--- .../selftests/bpf/prog_tests/cls_redirect.c | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-)
tools/testing/selftests/bpf/prog_tests/cls_redirect.c +2 -18
@@ -10,6 +10,7 @@#include <netinet/tcp.h> #include <test_progs.h> +#include "network_helpers.h" #include "progs/test_cls_redirect.h" #include "test_cls_redirect.skel.h"
@@ -35,23 +36,6 @@ struct tuple {struct addr_port dst; }; -static int start_server (const struct sockaddr *addr,socklen_t len,int type) -{ -int fd =socket (addr->sa_family, type,0 ); -if (CHECK_FAIL (fd ==-1 )) -return -1 ; -if (CHECK_FAIL (bind (fd, addr, len) ==-1 )) - goto err; -if (type ==SOCK_STREAM &&CHECK_FAIL (listen (fd,128 ) ==-1 )) - goto err; - -return fd; - -err: -close (fd); -return -1 ; -} -static int connect_to_server (const struct sockaddr *addr,socklen_t len,int type) {
@@ -98,7 +82,7 @@ static bool set_up_conn(const struct sockaddr *addr, socklen_t len, int type,socklen_t slen =sizeof (ss);struct sockaddr *sa = (struct sockaddr *)&ss; - *server =start_server (addr, len, type); + *server =start_server_addr (addr, len, type);if (*server <0 )return false;
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 3/14 selftests/bpf: Use connect_to_addr in cls_redirect
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses public helper connect_to_addr() exported in network_helpers.h instead of the local defined function connect_to_server() in prog_tests/cls_redirect.c. This can avoid duplicate code.
--- .../selftests/bpf/prog_tests/cls_redirect.c | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-)
tools/testing/selftests/bpf/prog_tests/cls_redirect.c +1 -17
@@ -36,22 +36,6 @@ struct tuple {struct addr_port dst; }; -static int connect_to_server (const struct sockaddr *addr,socklen_t len, -int type) -{ -int fd =socket (addr->sa_family, type,0 ); -if (CHECK_FAIL (fd ==-1 )) -return -1 ; -if (CHECK_FAIL (connect (fd, addr, len))) - goto err; - -return fd; - -err: -close (fd); -return -1 ; -} -static bool fill_addr_port (const struct sockaddr *sa,struct addr_port *ap) {const struct sockaddr_in6 *in6;
@@ -89,7 +73,7 @@ static bool set_up_conn(const struct sockaddr *addr, socklen_t len, int type,if (CHECK_FAIL (getsockname (*server, sa, &slen))) goto close_server; - *conn =connect_to_server (sa, slen, type); + *conn =connect_to_addr ((struct sockaddr_storage *)sa, slen, type);if (*conn <0 ) goto close_server;
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 4/14 selftests/bpf: Use start_server_addr in sk_assign
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Include network_helpers.h in prog_tests/sk_assign.c, use the newly added public helper start_server_addr() instead of the local defined function start_server(). This can avoid duplicate code.
The code set SO_RCVTIMEO timeout as timeo_sec (3s) can be dropped, since start_server_addr() sets default timeout as 3s.
--- .../selftests/bpf/prog_tests/sk_assign.c | 27 ++----------------- 1 file changed, 2 insertions(+), 25 deletions(-)
tools/testing/selftests/bpf/prog_tests/sk_assign.c +2 -25
@@ -15,6 +15,7 @@#include <unistd.h> #include "test_progs.h" +#include "network_helpers.h" #define BIND_PORT 1234#define CONNECT_PORT 4321
@@ -73,30 +74,6 @@ configure_stack(void)return true; } -static int -start_server (const struct sockaddr *addr,socklen_t len,int type) -{ -int fd; - - fd =socket (addr->sa_family, type,0 ); -if (CHECK_FAIL (fd ==-1 )) - goto out; -if (CHECK_FAIL (setsockopt (fd,SOL_SOCKET ,SO_RCVTIMEO , &timeo_sec, - timeo_optlen))) - goto close_out; -if (CHECK_FAIL (bind (fd, addr, len) ==-1 )) - goto close_out; -if (type ==SOCK_STREAM &&CHECK_FAIL (listen (fd,128 ) ==-1 )) - goto close_out; - - goto out; -close_out: -close (fd); - fd =-1 ; -out: -return fd; -} -static int connect_to_server (const struct sockaddr *addr,socklen_t len,int type) {
@@ -310,7 +287,7 @@ void test_sk_assign(void)continue ;prepare_addr (test->addr, test->family,BIND_PORT , false); addr = (const struct sockaddr *)test->addr; - server =start_server (addr, test->len, test->type); + server =start_server_addr (addr, test->len, test->type);if (server ==-1 ) goto close;
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 5/14 selftests/bpf: Use connect_to_addr in sk_assign
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses public helper connect_to_addr() exported in network_helpers.h instead of the local defined function connect_to_server() in prog_tests/sk_assign.c. This can avoid duplicate code.
The code set SO_SNDTIMEO timeout as timeo_sec (3s) can be dropped, since connect_to_addr() sets default timeout as 3s.
--- .../selftests/bpf/prog_tests/sk_assign.c | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-)
tools/testing/selftests/bpf/prog_tests/sk_assign.c +1 -25
@@ -23,8 +23,6 @@#define NS_SELF "/proc/self/ns/net"#define SERVER_MAP_PATH "/sys/fs/bpf/tc/globals/server_map" -static const struct timeval timeo_sec = { .tv_sec =3 }; -static const size_t timeo_optlen =sizeof (timeo_sec);static int stop, duration; static bool
@@ -74,28 +72,6 @@ configure_stack(void)return true; } -static int -connect_to_server (const struct sockaddr *addr,socklen_t len,int type) -{ -int fd =-1 ; - - fd =socket (addr->sa_family, type,0 ); -if (CHECK_FAIL (fd ==-1 )) - goto out; -if (CHECK_FAIL (setsockopt (fd,SOL_SOCKET ,SO_SNDTIMEO , &timeo_sec, - timeo_optlen))) - goto close_out; -if (CHECK_FAIL (connect (fd, addr, len))) - goto close_out; - - goto out; -close_out: -close (fd); - fd =-1 ; -out: -return fd; -} -static in_port_t get_port (int fd) {
@@ -138,7 +114,7 @@ run_test(int server_fd, const struct sockaddr *addr, socklen_t len, int type)in_port_t port;int ret =1 ; - client =connect_to_server (addr, len, type); + client =connect_to_addr ((struct sockaddr_storage *)addr, len, type);if (client ==-1 ) {perror ("Cannot connect to server" ); goto out;
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 6/14 selftests/bpf: Use log_err in network_helpers
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
The helpers ASSERT_OK/GE/OK_PTR should avoid using in public functions. This patch uses log_err() to replace them in network_helpers.c.
And drop '#include "test_progs.h"' in it, include <pthread.h> and <sys/param.h> instead.
--- tools/testing/selftests/bpf/network_helpers.c | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +16 -6
@@ -7,11 +7,13 @@#include <string.h> #include <unistd.h> #include <sched.h> +#include <pthread.h> #include <arpa/inet.h> #include <sys/mount.h> #include <sys/stat.h> #include <sys/un.h> +#include <sys/param.h> #include <linux/err.h> #include <linux/in.h>
@@ -20,7 +22,6 @@#include "bpf_util.h" #include "network_helpers.h" -#include "test_progs.h" #ifndef IPPROTO_MPTCP #define IPPROTO_MPTCP 262
@@ -447,22 +448,30 @@ struct nstoken *open_netns(const char *name)struct nstoken *token; token =calloc (1 ,sizeof (struct nstoken )); -if (!ASSERT_OK_PTR (token,"malloc token" )) +if (!token) { +log_err ("malloc token" );return NULL ; + } token->orig_netns_fd =open ("/proc/self/ns/net" ,O_RDONLY ); -if (!ASSERT_GE (token->orig_netns_fd,0 ,"open /proc/self/ns/net" )) +if (token->orig_netns_fd <=0 ) { +log_err ("open /proc/self/ns/net" ); goto fail; + }snprintf (nspath,sizeof (nspath),"%s/%s" ,"/var/run/netns" , name); nsfd =open (nspath,O_RDONLY |O_CLOEXEC ); -if (!ASSERT_GE (nsfd,0 ,"open netns fd" )) +if (nsfd <=0 ) { +log_err ("open netns fd" ); goto fail; + } err =setns (nsfd,CLONE_NEWNET );close (nsfd); -if (!ASSERT_OK (err,"setns" )) +if (err) { +log_err ("setns" ); goto fail; + }return token; fail:
@@ -475,7 +484,8 @@ void close_netns(struct nstoken *token)if (!token)return ; -ASSERT_OK (setns (token->orig_netns_fd,CLONE_NEWNET ),"setns" ); +if (setns (token->orig_netns_fd,CLONE_NEWNET )) +log_err ("setns" );close (token->orig_netns_fd);free (token); }
Signature · 1 line
2.40.1
Geliang Tang
reviewerRe: [PATCH bpf-next 06/14] selftests/bpf: Use log_err in network_helpers
Quoted 8 lines · Geliang Tang
From: Geliang Tang <[email protected]>
The helpers ASSERT_OK/GE/OK_PTR should avoid using in public functions.
This patch useslog_err()to replace them innetwork_helpers.c.And drop '#include "
test_progs.h"' in it, include <pthread.h> and <sys/param.h> instead.
Sorry, CI complains about this:
network_helpers.c: In function ‘open_netns’:
network_helpers.c:466:25: error: implicit declaration of function
‘open’; did you mean ‘popen’? [-Werror=implicit-function-declaration]
466 | token->orig_netns_fd = open("/proc/self/ns/net", O_RDONLY);
| ^~~~
| popen"test_progs.h" is still needed. I'll update this in v2.
Changes Requested.
-Geliang
Quoted 82 lines
Signed-off-by Geliang Tang <[email protected]>---
tools/testing/selftests/bpf/network_helpers.c | 22 ++++++++++++++--- --1 file changed, 16 insertions(+), 6 deletions(-)tools/testing/selftests/bpf/network_helpers.c +1
-0@@ -7,11 +7,13 @@ #include <string.h> #include <unistd.h> #include <sched.h> +#include <pthread.h>
#include <arpa/inet.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/un.h>
+#include <sys/param.h>
#include <linux/err.h>
#include <linux/in.h>tools/testing/selftests/bpf/network_helpers.c +0
-0@@ -20,7 +22,6 @@
#include "bpf_util.h"
#include "network_helpers.h"
-#include "test_progs.h"
#ifndefIPPROTO_MPTCP
#defineIPPROTO_MPTCP262tools/testing/selftests/bpf/network_helpers.c +0
-0@@ -447,22 +448,30 @@ struct nstoken *open_netns(const char *name) struct nstoken *token;
token =calloc(1, sizeof(struct nstoken));tools/testing/selftests/bpf/network_helpers.c +2
-1-if (!ASSERT_OK_PTR (token,"malloc token" )) +if (!token) { +log_err ("malloc token" );return NULL;
tools/testing/selftests/bpf/network_helpers.c +1
-0+ }
token->orig_netns_fd=open("/proc/self/ns/net", O_RDONLY);tools/testing/selftests/bpf/network_helpers.c +0
-1- if (!ASSERT_GE(token->orig_netns_fd, 0, "open
/proc/self/ns/net"))tools/testing/selftests/bpf/network_helpers.c +2
-0+if (token->orig_netns_fd <=0 ) { +log_err ("open /proc/self/ns/net" );goto fail;
tools/testing/selftests/bpf/network_helpers.c +1
-0+ }
snprintf(nspath, sizeof(nspath), "%s/%s", "/var/run/netns", name);
nsfd =open(nspath, O_RDONLY | O_CLOEXEC);tools/testing/selftests/bpf/network_helpers.c +2
-1-if (!ASSERT_GE (nsfd,0 ,"open netns fd" )) +if (nsfd <=0 ) { +log_err ("open netns fd" );goto fail;
tools/testing/selftests/bpf/network_helpers.c +1
-0+ }
err =setns(nsfd, CLONE_NEWNET);
close(nsfd);tools/testing/selftests/bpf/network_helpers.c +2
-1-if (!ASSERT_OK (err,"setns" )) +if (err) { +log_err ("setns" );goto fail;
tools/testing/selftests/bpf/network_helpers.c +1
-0+ }
return token;
fail:tools/testing/selftests/bpf/network_helpers.c +0
-0@@ -475,7 +484,8 @@ void close_netns(struct nstoken *token) if (!token) return;tools/testing/selftests/bpf/network_helpers.c +0
-1- ASSERT_OK(setns(token->orig_netns_fd, CLONE_NEWNET),"setns");
tools/testing/selftests/bpf/network_helpers.c +2
-0+if (setns (token->orig_netns_fd,CLONE_NEWNET )) +log_err ("setns" );
close(token->orig_netns_fd);
free(token);
}
Geliang Tang
reviewerPATCH 7/14 selftests/bpf: Use start_server_addr in test_sock_addr
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Include network_helpers.h in test_sock_addr.c, use the newly added public helper start_server_addr() instead of the local defined function start_server(). This can avoid duplicate code.
In order to use functions defined in network_helpers.c, Makefile needs to be updated and <Linux/err.h> needs to be included in network_helpers.h to avoid compilation errors.
--- tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/network_helpers.h | 1 + tools/testing/selftests/bpf/test_sock_addr.c | 38 ++----------------- 3 files changed, 7 insertions(+), 35 deletions(-)
tools/testing/selftests/bpf/Makefile +2 -1
@@ -290,11 +290,12 @@ UNPRIV_HELPERS := $(OUTPUT)/unpriv_helpers.o TRACE_HELPERS := $(OUTPUT)/trace_helpers.o JSON_WRITER := $(OUTPUT)/json_writer.o CAP_HELPERS := $(OUTPUT)/cap_helpers.o +NETWORK_HELPERS := $(OUTPUT)/network_helpers.o $(OUTPUT)/test_dev_cgroup: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_skb_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_sock: $(CGROUP_HELPERS) $(TESTING_HELPERS) -$(OUTPUT)/test_sock_addr: $(CGROUP_HELPERS) $(TESTING_HELPERS) +$(OUTPUT)/test_sock_addr: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(NETWORK_HELPERS) $(OUTPUT)/test_sockmap: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(OUTPUT)/test_tcpnotify_user: $(CGROUP_HELPERS) $(TESTING_HELPERS) $(TRACE_HELPERS) $(OUTPUT)/get_cgroup_id_user: $(CGROUP_HELPERS) $(TESTING_HELPERS)
tools/testing/selftests/bpf/network_helpers.h +1 -0
@@ -11,6 +11,7 @@ typedef __u16 __sum16;#include <linux/ipv6.h> #include <linux/ethtool.h> #include <linux/sockios.h> +#include <linux/err.h> #include <netinet/tcp.h> #include <bpf/bpf_endian.h> #include <net/if.h>
tools/testing/selftests/bpf/test_sock_addr.c +4 -34
@@ -19,6 +19,7 @@#include <bpf/libbpf.h> #include "cgroup_helpers.h" +#include "network_helpers.h" #include "testing_helpers.h" #include "bpf_util.h"
@@ -939,37 +940,6 @@ static int cmp_peer_addr(int sock1, const struct sockaddr_storage *addr2)return cmp_sock_addr (getpeername, sock1, addr2,/*cmp_port*/ 1 ); } -static int start_server (int type,const struct sockaddr_storage *addr, -socklen_t addr_len) -{ -int fd; - - fd =socket (addr->ss_family, type,0 ); -if (fd ==-1 ) { -log_err ("Failed to create server socket" ); - goto out; - } - -if (bind (fd, (const struct sockaddr *)addr, addr_len) ==-1 ) { -log_err ("Failed to bind server socket" ); - goto close_out; - } - -if (type ==SOCK_STREAM ) { -if (listen (fd,128 ) ==-1 ) { -log_err ("Failed to listen on server socket" ); - goto close_out; - } - } - - goto out; -close_out: -close (fd); - fd =-1 ; -out: -return fd; -} -static int connect_to_server (int type,const struct sockaddr_storage *addr,socklen_t addr_len) {
@@ -1178,7 +1148,7 @@ static int run_bind_test_case(const struct sock_addr_test *test)if (init_addrs (test, &requested_addr, &expected_addr,NULL )) goto err; - servfd =start_server (test->type, &requested_addr, addr_len); + servfd =start_server_addr ((struct sockaddr *)&requested_addr, addr_len, test->type);if (servfd ==-1 ) goto err;
@@ -1214,7 +1184,7 @@ static int run_connect_test_case(const struct sock_addr_test *test) goto err;/* Prepare server to connect to */ - servfd =start_server (test->type, &expected_addr, addr_len); + servfd =start_server_addr ((struct sockaddr *)&expected_addr, addr_len, test->type);if (servfd ==-1 ) goto err;
@@ -1271,7 +1241,7 @@ static int run_xmsg_test_case(const struct sock_addr_test *test, int max_cmsg) goto err;/* Prepare server to sendmsg to */ - servfd =start_server (test->type, &server_addr, addr_len); + servfd =start_server_addr ((struct sockaddr *)&server_addr, addr_len, test->type);if (servfd ==-1 ) goto err;
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 8/14 selftests/bpf: Use connect_to_addr in test_sock_addr
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses public helper connect_to_addr() exported in network_helpers.h instead of the local defined function connect_to_server() in test_sock_addr.c. This can avoid duplicate code.
--- tools/testing/selftests/bpf/test_sock_addr.c | 36 ++------------------ 1 file changed, 2 insertions(+), 34 deletions(-)
tools/testing/selftests/bpf/test_sock_addr.c +2 -34
@@ -940,38 +940,6 @@ static int cmp_peer_addr(int sock1, const struct sockaddr_storage *addr2)return cmp_sock_addr (getpeername, sock1, addr2,/*cmp_port*/ 1 ); } -static int connect_to_server (int type,const struct sockaddr_storage *addr, -socklen_t addr_len) -{ -int domain; -int fd =-1 ; - - domain = addr->ss_family; - -if (domain !=AF_INET && domain !=AF_INET6 ) { -log_err ("Unsupported address family" ); - goto err; - } - - fd =socket (domain, type,0 ); -if (fd ==-1 ) { -log_err ("Failed to create client socket" ); - goto err; - } - -if (connect (fd, (const struct sockaddr *)addr, addr_len) ==-1 ) { -log_err ("Fail to connect to server" ); - goto err; - } - - goto out; -err: -close (fd); - fd =-1 ; -out: -return fd; -} -int init_pktinfo (int domain,struct cmsghdr *cmsg) {struct in6_pktinfo *pktinfo6;
@@ -1156,7 +1124,7 @@ static int run_bind_test_case(const struct sock_addr_test *test) goto err;/* Try to connect to server just in case */ - clientfd =connect_to_server (test->type, &expected_addr, addr_len); + clientfd =connect_to_addr (&expected_addr, addr_len, test->type);if (clientfd ==-1 ) goto err;
@@ -1188,7 +1156,7 @@ static int run_connect_test_case(const struct sock_addr_test *test)if (servfd ==-1 ) goto err; - clientfd =connect_to_server (test->type, &requested_addr, addr_len); + clientfd =connect_to_addr (&requested_addr, addr_len, test->type);if (clientfd ==-1 ) goto err;
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 9/14 selftests/bpf: Add function pointer for __start_server
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
__start_server() sets SO_REUSPORT through setsockopt() when the parameter 'reuseport' is set. This patch makes it more flexible by accepting a function pointer named setsockopt.
Then the original start_reuseport_server() can be implemented by passing in a newly defined setsockopt_reuse() function pointer to __start_server().
--- tools/testing/selftests/bpf/network_helpers.c | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +13 -9
@@ -80,9 +80,9 @@ int settimeo(int fd, int timeout_ms)#define save_errno_close (fd) ({ int __save = errno; close(fd); errno = __save; })static int __start_server (int type,int protocol,const struct sockaddr *addr, -socklen_t addrlen,int timeout_ms,bool reuseport) +socklen_t addrlen,int timeout_ms, +int *(*setsockopt)(int fd,int val),int val) { -int on =1 ;int fd; fd =socket (addr->sa_family, type, protocol);
@@ -94,9 +94,8 @@ static int __start_server(int type, int protocol, const struct sockaddr *addr,if (settimeo (fd, timeout_ms)) goto error_close; -if (reuseport && -setsockopt (fd,SOL_SOCKET ,SO_REUSEPORT , &on,sizeof (on))) { -log_err ("Failed to set SO_REUSEPORT" ); +if (setsockopt &&setsockopt (fd, val)) { +log_err ("Failed to set sockopt" ); goto error_close; }
@@ -129,7 +128,7 @@ static int start_server_proto(int family, int type, int protocol,return -1 ;return __start_server (type, protocol, (struct sockaddr *)&addr, - addrlen, timeout_ms, false); + addrlen, timeout_ms,NULL ,0 ); } int start_server(int family, int type, const char *addr_str, __u16 port,
@@ -145,6 +144,11 @@ int start_mptcp_server(int family, const char *addr_str, __u16 port, port, timeout_ms); } +static int setsockopt_reuse (int fd,int on) +{ +return setsockopt (fd,SOL_SOCKET ,SO_REUSEPORT , &on,sizeof (on)); +} +int *start_reuseport_server (int family,int type,const char *addr_str,__u16 port,int timeout_ms,unsigned int nr_listens) {
@@ -164,7 +168,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str,return NULL ; fds[0 ] =__start_server (type,0 , (struct sockaddr *)&addr, addrlen, - timeout_ms, true); + timeout_ms, (void *)setsockopt_reuse,1 );if (fds[0 ] ==-1 ) goto close_fds; nr_fds =1 ;
@@ -174,7 +178,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str,for (; nr_fds < nr_listens; nr_fds++) { fds[nr_fds] =__start_server (type,0 , (struct sockaddr *)&addr, - addrlen, timeout_ms, true); + addrlen, timeout_ms, (void *)setsockopt_reuse,1 );if (fds[nr_fds] ==-1 ) goto close_fds; }
@@ -188,7 +192,7 @@ int *start_reuseport_server(int family, int type, const char *addr_str,int start_server_addr (const struct sockaddr *addr,socklen_t addrlen,int type) { -return __start_server (type,0 , addr, addrlen,0 ,0 ); +return __start_server (type,0 , addr, addrlen,0 ,NULL ,0 ); }void free_fds (int *fds,unsigned int nr_close_fds)
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 10/14 selftests/bpf: Add start_server_setsockopt helper
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch adds a new helper start_server_setsockopt(), which is a wrapper of __start_server(), and accepts a function pointer setsockopt as a parameter.
--- tools/testing/selftests/bpf/network_helpers.c | 6 ++++++ tools/testing/selftests/bpf/network_helpers.h | 2 ++ 2 files changed, 8 insertions(+)
tools/testing/selftests/bpf/network_helpers.c +6 -0
@@ -195,6 +195,12 @@ int start_server_addr(const struct sockaddr *addr, socklen_t addrlen, int type)return __start_server (type,0 , addr, addrlen,0 ,NULL ,0 ); } +int start_server_setsockopt (const struct sockaddr *addr,socklen_t addrlen,int type, +int *(*setsockopt)(int fd,int val),int val) +{ +return __start_server (type,0 , addr, addrlen,0 , setsockopt, val); +} +void free_fds (int *fds,unsigned int nr_close_fds) {if (fds) {
tools/testing/selftests/bpf/network_helpers.h +2 -0
@@ -55,6 +55,8 @@ int *start_reuseport_server(int family, int type, const char *addr_str, __u16 port, int timeout_ms, unsigned int nr_listens);int start_server_addr (const struct sockaddr *addr,socklen_t addrlen,int type); +int start_server_setsockopt (const struct sockaddr *addr,socklen_t addrlen,int type, +int *(*setsockopt)(int fd,int val),int val);void free_fds (int *fds,unsigned int nr_close_fds);int connect_to_addr (const struct sockaddr_storage *addr,socklen_t len,int type);int connect_to_fd (int server_fd,int timeout_ms);
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 11/14 selftests/bpf: Use start_server_setsockopt in sockopt_inherit
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Include network_helpers.h in prog_tests/sockopt_inherit.c, use public helpers make_sockaddr() and start_server_setsockopt() instead of the local defined function start_server(). This can avoid duplicate code.
--- .../bpf/prog_tests/sockopt_inherit.c | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-)
tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c +14 -19
@@ -1,6 +1,7 @@// SPDX-License-Identifier: GPL-2.0 #include <test_progs.h> #include "cgroup_helpers.h" +#include "network_helpers.h" #include "sockopt_inherit.skel.h"
@@ -98,23 +99,12 @@ static void *server_thread(void *arg)return (void *)(long )err; } -static int start_server (void ) +static int setsockopt_loop (int fd,int val) { -struct sockaddr_in addr = { - .sin_family =AF_INET , - .sin_addr.s_addr =htonl (INADDR_LOOPBACK ), - };char buf;int err; -int fd;int i; - fd =socket (AF_INET ,SOCK_STREAM ,0 ); -if (fd <0 ) { -log_err ("Failed to create server socket" ); -return -1 ; - } -for (i =CUSTOM_INHERIT1 ; i <=CUSTOM_LISTENER ; i++) { buf =0x01 ; err =setsockopt (fd,SOL_CUSTOM , i, &buf,1 );
@@ -125,13 +115,18 @@ static int start_server(void) } } -if (bind (fd, (const struct sockaddr *)&addr,sizeof (addr)) <0 ) { -log_err ("Failed to bind socket" ); -close (fd); -return -1 ; - } +return 0 ; +} -return fd; +static int start_server_lo (void ) +{ +struct sockaddr_storage addr; +socklen_t addrlen; + +if (make_sockaddr (AF_INET ,"127.0.0.1" ,0 , &addr, &addrlen)) +return -1 ; +return start_server_setsockopt ((struct sockaddr *)&addr, addrlen, +SOCK_STREAM , (void *)setsockopt_loop,0 ); }static void run_test (int cgroup_fd)
@@ -160,7 +155,7 @@ static void run_test(int cgroup_fd)if (!ASSERT_OK_PTR (link_setsockopt,"cg-attach-setsockopt" )) goto close_bpf_object; - server_fd =start_server (); + server_fd =start_server_lo ();if (!ASSERT_GE (server_fd,0 ,"start_server" )) goto close_bpf_object;
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 12/14 selftests/bpf: Use connect_to_fd in sockopt_inherit
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses public helper connect_to_fd() exported in network_helpers.h instead of the local defined function connect_to_server() in prog_tests/sockopt_inherit.c. This can avoid duplicate code.
--- .../bpf/prog_tests/sockopt_inherit.c | 31 +------------------ 1 file changed, 1 insertion(+), 30 deletions(-)
tools/testing/selftests/bpf/prog_tests/sockopt_inherit.c +1 -30
@@ -10,35 +10,6 @@#define CUSTOM_INHERIT2 1#define CUSTOM_LISTENER 2 -static int connect_to_server (int server_fd) -{ -struct sockaddr_storage addr; -socklen_t len =sizeof (addr); -int fd; - - fd =socket (AF_INET ,SOCK_STREAM ,0 ); -if (fd <0 ) { -log_err ("Failed to create client socket" ); -return -1 ; - } - -if (getsockname (server_fd, (struct sockaddr *)&addr, &len)) { -log_err ("Failed to get server addr" ); - goto out; - } - -if (connect (fd, (const struct sockaddr *)&addr, len) <0 ) { -log_err ("Fail to connect to server" ); - goto out; - } - -return fd; - -out: -close (fd); -return -1 ; -} -static int verify_sockopt (int fd,int optname,const char *msg,char expected) {socklen_t optlen =1 ;
@@ -168,7 +139,7 @@ static void run_test(int cgroup_fd)pthread_cond_wait (&server_started, &server_started_mtx);pthread_mutex_unlock (&server_started_mtx); - client_fd =connect_to_server (server_fd); + client_fd =connect_to_fd (server_fd,0 );if (!ASSERT_GE (client_fd,0 ,"connect_to_server" )) goto close_server_fd;
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 13/14 selftests/bpf: Use start_server_* in test_tcp_check_syncookie
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Include network_helpers.h in test_tcp_check_syncookie_user.c, use public helpers start_server_addr() and start_server_setsockopt() in it instead of the local defined function start_server(). This can avoid duplicate code.
In order to use functions defined in network_helpers.c, Makefile needs to be updated to avoid compilation errors.
--- tools/testing/selftests/bpf/Makefile | 1 + .../bpf/test_tcp_check_syncookie_user.c | 50 ++++--------------- 2 files changed, 12 insertions(+), 39 deletions(-)
tools/testing/selftests/bpf/Makefile +1 -0
@@ -309,6 +309,7 @@ $(OUTPUT)/flow_dissector_load: $(TESTING_HELPERS) $(OUTPUT)/test_maps: $(TESTING_HELPERS) $(OUTPUT)/test_verifier: $(TESTING_HELPERS) $(CAP_HELPERS) $(UNPRIV_HELPERS) $(OUTPUT)/xsk.o: $(BPFOBJ) +$(OUTPUT)/test_tcp_check_syncookie_user: $(NETWORK_HELPERS) BPFTOOL ?= $(DEFAULT_BPFTOOL) $(DEFAULT_BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile) \
tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c +11 -39
72 lines not on this page · raw message
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 14/14 selftests/bpf: Use connect_to_addr in test_tcp_check_syncookie
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch uses public helper connect_to_addr() exported in network_helpers.h instead of the local defined function connect_to_server() in test_tcp_check_syncookie_user.c. This can avoid duplicate code.
--- .../bpf/test_tcp_check_syncookie_user.c | 26 +------------------ 1 file changed, 1 insertion(+), 25 deletions(-)
tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c +1 -25
@@ -25,30 +25,6 @@ static int setsockopt_mode(int fd, int dual)return setsockopt (fd,IPPROTO_IPV6 ,IPV6_V6ONLY , (char *)&mode,sizeof (mode)); } -static int connect_to_server (const struct sockaddr *addr,socklen_t len) -{ -int fd =-1 ; - - fd =socket (addr->sa_family,SOCK_STREAM ,0 ); -if (fd ==-1 ) { -log_err ("Failed to create client socket" ); - goto out; - } - -if (connect (fd, (const struct sockaddr *)addr, len) ==-1 ) { -log_err ("Fail to connect to server" ); - goto close_out; - } - - goto out; - -close_out: -close (fd); - fd =-1 ; -out: -return fd; -} -static int get_map_fd_by_prog_id (int prog_id,bool *xdp) {struct bpf_prog_info info = {};
@@ -114,7 +90,7 @@ static int run_test(int server_fd, int results_fd, bool xdp, goto err; } - client =connect_to_server (addr, len); + client =connect_to_addr ((struct sockaddr_storage *)addr, len,SOCK_STREAM );if (client ==-1 ) goto err;
Signature · 1 line
2.40.1
Hi Geliang,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal: Success! ✅
- KVM Validation: debug: Success! ✅
- KVM Validation: btf (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/8635157069
Initiator: Matthieu Baerts (NGI0)
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/338146465227
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=843118
If there are some issues, you can reproduce them using the same environment as the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-normalFor more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a stable tests suite when executed on a public CI like here, it is possible some reported issues are not due to your modifications. Still, do not hesitate to help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)