export send_byte and send_recv_data
Subsystems (4)
Geliang Tang
reviewercover export send_byte and send_recv_data
From: Geliang Tang <[email protected]>
Export two helpers used by MPTCP BPF selftests.
Geliang Tang (3):
selftests/bpf: Export send_byte helper
selftests/bpf: Add struct send_recv_arg
selftests/bpf: Export send_recv_data helper
tools/testing/selftests/bpf/network_helpers.c | 95 +++++++++++++++++++ tools/testing/selftests/bpf/network_helpers.h | 2 + .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 71 +------------- .../testing/selftests/bpf/prog_tests/mptcp.c | 7 -- .../selftests/bpf/prog_tests/sk_lookup.c | 13 --- .../selftests/bpf/prog_tests/tcp_rtt.c | 7 -- 6 files changed, 98 insertions(+), 97 deletions(-)
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 1/3 selftests/bpf: Export send_byte helper
From: Geliang Tang <[email protected]>
The helper send_byte is defined in mptcp.c, sk_lookup.c and tcp_rtt.c. It makes sense to export it into network_helpers.h to let it can be used for all BPF selftests.
--- tools/testing/selftests/bpf/network_helpers.c | 9 +++++++++ tools/testing/selftests/bpf/network_helpers.h | 1 + tools/testing/selftests/bpf/prog_tests/mptcp.c | 7 ------- tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 13 ------------- tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 7 ------- 5 files changed, 10 insertions(+), 27 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +9 -0
@@ -497,3 +497,12 @@ int get_socket_local_port(int sock_fd)return -1 ; } + +int send_byte (int fd) +{ +char b =0x55 ; + +if (!ASSERT_EQ (write (fd, &b,sizeof (b)),1 ,"send single byte" )) +return -1 ; +return 0 ; +}
tools/testing/selftests/bpf/network_helpers.h +1 -0
@@ -71,6 +71,7 @@ struct nstoken;*/ struct nstoken *open_netns (const char *name);void close_netns (struct nstoken *token); +int send_byte (int fd);static __u16 csum_fold (__u32 csum) {
tools/testing/selftests/bpf/prog_tests/mptcp.c +0 -7
@@ -225,13 +225,6 @@ static void test_base(void)close (cgroup_fd); } -static void send_byte (int fd) -{ -char b =0x55 ; - -ASSERT_EQ (write (fd, &b,sizeof (b)),1 ,"send single byte" ); -} -static int verify_mptcpify (int server_fd,int client_fd) {struct __mptcp_info info;
tools/testing/selftests/bpf/prog_tests/sk_lookup.c +0 -13
@@ -282,19 +282,6 @@ static int fill_sk_lookup_ctx(struct bpf_sk_lookup *ctx, const char *local_ip, _return 0 ; } -static int send_byte (int fd) -{ -ssize_t n; - - errno =0 ; - n =send (fd,"a" ,1 ,0 ); -if (CHECK (n <=0 ,"send_byte" ,"send" )) { -log_err ("failed/partial send" ); -return -1 ; - } -return 0 ; -} -static int recv_byte (int fd) {char buf[1 ];
tools/testing/selftests/bpf/prog_tests/tcp_rtt.c +0 -7
@@ -12,13 +12,6 @@ struct tcp_rtt_storage {__u32 icsk_retransmits; }; -static void send_byte (int fd) -{ -char b =0x55 ; - -ASSERT_EQ (write (fd, &b,sizeof (b)),1 ,"send single byte" ); -} -static int wait_for_ack (int fd,int retries) {struct tcp_info info;
Signature · 1 line
2.40.1
Martin KaFai Lau
reviewerRe: [PATCH bpf-next 1/3] selftests/bpf: Export send_byte helper
Quoted 22 lines · Geliang Tang
From: Geliang Tang <[email protected]>
The helper
send_byteis defined inmptcp.c,sk_lookup.candtcp_rtt.c. It makes sense to export it intonetwork_helpers.hto let it can be used for all BPF selftests.Signed-off-by Geliang Tang <[email protected]>--- tools/testing/selftests/bpf/network_helpers.c | 9 +++++++++ tools/testing/selftests/bpf/network_helpers.h | 1 + tools/testing/selftests/bpf/prog_tests/mptcp.c | 7 ------- tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 13 ------------- tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 7 ------- 5 files changed, 10 insertions(+), 27 deletions(-)tools/testing/selftests/bpf/network_helpers.c +0
-0@@ -497,3 +497,12 @@ int get_socket_local_port(int sock_fd)return -1 ;
tools/testing/selftests/bpf/network_helpers.c int get_socket_local_port(int sock_fd) · line 508
Quoted 10 lines
tools/testing/selftests/bpf/network_helpers.c +9
-0} + +int send_byte (int fd) +{ +char b =0x55 ; + +if (!ASSERT_EQ (write (fd, &b,sizeof (b)),1 ,"send single byte" )) +return -1 ; +return 0 ; +}
I think it is overkill to have a dedicated helper that only does the error checking on the single syscall send/write. I would drop this patch and directly use the syscall send/write instead.
Geliang Tang
reviewerPATCH 2/3 selftests/bpf: Add struct send_recv_arg
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
Avoid setting total_bytes and stop as global variables, this patch adds a new struct named send_recv_arg to pass arguments between threads. Put these two variables together with fd into this struct and pass it to server thread, so that server thread can access these two variables without setting them as global ones.
--- .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 33 ++++++++++++------- 1 file changed, 22 insertions(+), 11 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +22 -11
@@ -21,7 +21,6 @@static const unsigned int total_bytes =10 *1024 *1024 ;static int expected_stg =0xeB9F ; -static int stop;static int settcpca (int fd,const char *tcp_ca) {
@@ -34,13 +33,20 @@ static int settcpca(int fd, const char *tcp_ca)return 0 ; } +struct send_recv_arg { +int fd; +uint32_t bytes; +int stop; +}; +static void *server (void *arg) { -int lfd = (int )(long )arg, err =0 , fd; +struct send_recv_arg *a = (struct send_recv_arg *)arg;ssize_t nr_sent =0 , bytes =0 ;char batch[1500 ]; +int err =0 , fd; - fd =accept (lfd,NULL ,NULL ); + fd =accept (a->fd,NULL ,NULL );while (fd ==-1 ) {if (errno ==EINTR )continue ;
@@ -53,9 +59,9 @@ static void *server(void *arg) goto done; } -while (bytes < total_bytes && !READ_ONCE (stop)) { +while (bytes < a->bytes && !READ_ONCE (a->stop)) { nr_sent =send (fd, &batch, -MIN (total_bytes - bytes,sizeof (batch)),0 ); +MIN (a->bytes - bytes,sizeof (batch)),0 );if (nr_sent ==-1 && errno ==EINTR )continue ;if (nr_sent ==-1 ) {
@@ -65,13 +71,13 @@ static void *server(void *arg) bytes += nr_sent; } -ASSERT_EQ (bytes, total_bytes,"send" ); +ASSERT_EQ (bytes, a->bytes,"send" ); done:if (fd >=0 )close (fd);if (err) { -WRITE_ONCE (stop,1 ); +WRITE_ONCE (a->stop,1 );return ERR_PTR (err); }return NULL ;
@@ -80,18 +86,23 @@ static void *server(void *arg)static void do_test (const char *tcp_ca,const struct bpf_map *sk_stg_map) {ssize_t nr_recv =0 , bytes =0 ; +struct send_recv_arg arg = { + .bytes = total_bytes, + };int lfd =-1 , fd =-1 ;pthread_t srv_thread;void *thread_ret;char batch[1500 ];int err; -WRITE_ONCE (stop,0 ); +WRITE_ONCE (arg.stop,0 ); lfd =start_server (AF_INET6 ,SOCK_STREAM ,NULL ,0 ,0 );if (!ASSERT_NEQ (lfd,-1 ,"socket" ))return ; + arg.fd = lfd; + fd =socket (AF_INET6 ,SOCK_STREAM ,0 );if (!ASSERT_NEQ (fd,-1 ,"socket" )) {close (lfd);
@@ -123,12 +134,12 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map) goto done; } - err =pthread_create (&srv_thread,NULL , server, (void *)(long )lfd); + err =pthread_create (&srv_thread,NULL , server, (void *)&arg);if (!ASSERT_OK (err,"pthread_create" )) goto done;/* recv total_bytes */ -while (bytes < total_bytes && !READ_ONCE (stop)) { +while (bytes < total_bytes && !READ_ONCE (arg.stop)) { nr_recv =recv (fd, &batch,MIN (total_bytes - bytes,sizeof (batch)),0 );if (nr_recv ==-1 && errno ==EINTR )
@@ -140,7 +151,7 @@ static void do_test(const char *tcp_ca, const struct bpf_map *sk_stg_map)ASSERT_EQ (bytes, total_bytes,"recv" ); -WRITE_ONCE (stop,1 ); +WRITE_ONCE (arg.stop,1 );pthread_join (srv_thread, &thread_ret);ASSERT_OK (IS_ERR (thread_ret),"thread_ret" );
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH 3/3 selftests/bpf: Export send_recv_data helper
In reply to Geliang TangFrom: Geliang Tang <[email protected]>
This patch extracts the code to send and receive data into a new helper named send_recv_data() in network_helpers.c and export it in network_helpers.h.
This helper will be used for MPTCP BPF selftests.
--- tools/testing/selftests/bpf/network_helpers.c | 86 +++++++++++++++++++ tools/testing/selftests/bpf/network_helpers.h | 1 + .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 82 +----------------- 3 files changed, 88 insertions(+), 81 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +86 -0
@@ -506,3 +506,89 @@ int send_byte(int fd)return -1 ;return 0 ; } + +struct send_recv_arg { +int fd; +uint32_t bytes; +int stop; +}; + +static void *send_recv_server (void *arg) +{ +struct send_recv_arg *a = (struct send_recv_arg *)arg; +ssize_t nr_sent =0 , bytes =0 ; +char batch[1500 ]; +int err =0 , fd; + + fd =accept (a->fd,NULL ,NULL ); +while (fd ==-1 ) { +if (errno ==EINTR ) +continue ; + err = -errno; + goto done; + } + +if (settimeo (fd,0 )) { + err = -errno; + goto done; + } + +while (bytes < a->bytes && !READ_ONCE (a->stop)) { + nr_sent =send (fd, &batch, +MIN (a->bytes - bytes,sizeof (batch)),0 ); +if (nr_sent ==-1 && errno ==EINTR ) +continue ; +if (nr_sent ==-1 ) { + err = -errno; +break ; + } + bytes += nr_sent; + } + +ASSERT_EQ (bytes, a->bytes,"send" ); + +done: +if (fd >=0 ) +close (fd); +if (err) { +WRITE_ONCE (a->stop,1 ); +return ERR_PTR (err); + } +return NULL ; +} + +void send_recv_data (int lfd,int fd,uint32_t total_bytes) +{ +ssize_t nr_recv =0 , bytes =0 ; +struct send_recv_arg arg = { + .fd = lfd, + .bytes = total_bytes, + }; +pthread_t srv_thread; +void *thread_ret; +char batch[1500 ]; +int err; + +WRITE_ONCE (arg.stop,0 ); + + err =pthread_create (&srv_thread,NULL , send_recv_server, (void *)&arg); +if (!ASSERT_OK (err,"pthread_create" )) +return ; + +/* recv total_bytes */ +while (bytes < total_bytes && !READ_ONCE (arg.stop)) { + nr_recv =recv (fd, &batch, +MIN (total_bytes - bytes,sizeof (batch)),0 ); +if (nr_recv ==-1 && errno ==EINTR ) +continue ; +if (nr_recv ==-1 ) +break ; + bytes += nr_recv; + } + +ASSERT_EQ (bytes, total_bytes,"recv" ); + +WRITE_ONCE (arg.stop,1 ); +pthread_join (srv_thread, &thread_ret); +ASSERT_OK (IS_ERR (thread_ret),"thread_ret" ); +}
tools/testing/selftests/bpf/network_helpers.h +1 -0
@@ -72,6 +72,7 @@ struct nstoken;struct nstoken *open_netns (const char *name);void close_netns (struct nstoken *token);int send_byte (int fd); +void send_recv_data (int lfd,int fd,uint32_t total_bytes);static __u16 csum_fold (__u32 csum) {
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +1 -81
103 lines not on this page · raw message
Signature · 1 line
2.40.1
Martin KaFai Lau
reviewerRe: [PATCH bpf-next 3/3] selftests/bpf: Export send_recv_data helper
Quoted 7 lines · Geliang Tang
From: Geliang Tang <[email protected]>
This patch extracts the code to send and receive data into a new helper named
send_recv_data()innetwork_helpers.cand export it innetwork_helpers.h.This helper will be used for MPTCP BPF selftests.
It is good to see the codes can be reused for the mptcp selftests.
What about the patches for the new mptcp tests? It is not included in this set because it depends on other patches that have not been in the bpf-next yet? It is not mentioned in the cover letter.
Quoted 70 lines
Signed-off-by Geliang Tang <[email protected]>--- tools/testing/selftests/bpf/network_helpers.c | 86 +++++++++++++++++++ tools/testing/selftests/bpf/network_helpers.h | 1 + .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 82 +----------------- 3 files changed, 88 insertions(+), 81 deletions(-)tools/testing/selftests/bpf/network_helpers.c +54
-0@@ -506,3 +506,89 @@ int send_byte(int fd)return -1 ;return 0 ; } + +struct send_recv_arg { +int fd; +uint32_t bytes; +int stop; +}; + +static void *send_recv_server (void *arg) +{ +struct send_recv_arg *a = (struct send_recv_arg *)arg; +ssize_t nr_sent =0 , bytes =0 ; +char batch[1500 ]; +int err =0 , fd; + + fd =accept (a->fd,NULL ,NULL ); +while (fd ==-1 ) { +if (errno ==EINTR ) +continue ; + err = -errno; + goto done; + } + +if (settimeo (fd,0 )) { + err = -errno; + goto done; + } + +while (bytes < a->bytes && !READ_ONCE (a->stop)) { + nr_sent =send (fd, &batch, +MIN (a->bytes - bytes,sizeof (batch)),0 ); +if (nr_sent ==-1 && errno ==EINTR ) +continue ; +if (nr_sent ==-1 ) { + err = -errno; +break ; + } + bytes += nr_sent; + } + +ASSERT_EQ (bytes, a->bytes,"send" ); + +done: +if (fd >=0 ) +close (fd); +if (err) { +WRITE_ONCE (a->stop,1 ); +return ERR_PTR (err); + } +return NULL ; +} + +void send_recv_data (int lfd,int fd,uint32_t total_bytes) +{ +ssize_t nr_recv =0 , bytes =0 ;
tools/testing/selftests/bpf/network_helpers.c int send_byte(int fd) · line 572
Quoted 10 lines
tools/testing/selftests/bpf/network_helpers.c +10
-0+struct send_recv_arg arg = { + .fd = lfd, + .bytes = total_bytes, + }; +pthread_t srv_thread; +void *thread_ret; +char batch[1500 ]; +int err; + +WRITE_ONCE (arg.stop,0 );
nit. It is not needed now because stop is not a global variable which was reused by multiple tests.
Anyway, it has a conflict with the bpf-next tree and requires a re-spin.