export send_recv_data
Subsystems (4)
Geliang Tang
reviewerv5 cover export send_recv_data
From: Geliang Tang <[email protected]>
v5:
- address Martin's comments for v4 (thanks).
- update patch 2, use 'return err' instead of 'return -1/0'.
- drop patch 3 in v4.
v4:
- fix a bug in v3, it should be 'if (err)', not 'if (!err)'.
- move "selftests/bpf: Use log_err in network_helpers" out of this series.
v3:
- add two more patches.
- use log_err instead of ASSERT in v3.
- let send_recv_data return int as Martin suggested.
v2:
Address Martin's comments for v1 (thanks.)
- drop patch 1, "export send_byte helper".
- drop "WRITE_ONCE(arg.stop, 0)".
- rebased.
send_recv_data will be re-used in MPTCP bpf tests, but not included in this set because it depends on other patches that have not been in the bpf-next yet. It will be sent as another set soon.
Geliang Tang (2):
selftests/bpf: Add struct send_recv_arg
selftests/bpf: Export send_recv_data helper
tools/testing/selftests/bpf/network_helpers.c | 96 +++++++++++++++++++ tools/testing/selftests/bpf/network_helpers.h | 1 + .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 71 +------------- 3 files changed, 98 insertions(+), 70 deletions(-)
Signature · 1 line
2.40.1
Geliang Tang
reviewerPATCH v5 1/2 selftests/bpf: Add struct send_recv_arg
From: 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 | 34 ++++++++++++------- 1 file changed, 22 insertions(+), 12 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_tcp_ca.c +22 -12
@@ -20,7 +20,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) {
@@ -33,13 +32,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 ;
@@ -52,9 +58,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 ) {
@@ -64,13 +70,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 ;
@@ -79,18 +85,22 @@ 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, + .stop =0 , + };int lfd =-1 , fd =-1 ;pthread_t srv_thread;void *thread_ret;char batch[1500 ];int err; -WRITE_ONCE (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);
@@ -122,12 +132,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 )
@@ -139,7 +149,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 v5 2/2 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 | 96 +++++++++++++++++++ tools/testing/selftests/bpf/network_helpers.h | 1 + .../selftests/bpf/prog_tests/bpf_tcp_ca.c | 81 +--------------- 3 files changed, 98 insertions(+), 80 deletions(-)
tools/testing/selftests/bpf/network_helpers.c +96 -0
@@ -545,3 +545,99 @@ int set_hw_ring_size(char *ifname, struct ethtool_ringparam *ring_param)close (sockfd);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; + } + +if (bytes != a->bytes) +log_err ("Failed to send" ); + +done: +if (fd >=0 ) +close (fd); +if (err) { +WRITE_ONCE (a->stop,1 ); +return ERR_PTR (err); + } +return NULL ; +} + +int 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, + .stop =0 , + }; +pthread_t srv_thread; +void *thread_ret; +char batch[1500 ]; +int err =0 ; + + err =pthread_create (&srv_thread,NULL , send_recv_server, (void *)&arg); +if (err) { +log_err ("Failed to pthread_create" ); +return err; + } + +/* 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 ) { + err = -errno; +break ; + } + bytes += nr_recv; + } + +if (bytes != total_bytes) +log_err ("Failed to recv" ); + +WRITE_ONCE (arg.stop,1 ); +pthread_join (srv_thread, &thread_ret); +if (IS_ERR (thread_ret) && !err) { +log_err ("Failed to thread_ret" ); + err =PTR_ERR (thread_ret); + } + +return err; +}
tools/testing/selftests/bpf/network_helpers.h +1 -0
@@ -76,6 +76,7 @@ struct nstoken;*/ struct nstoken *open_netns (const char *name);void close_netns (struct nstoken *token); +int 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 -80
102 lines not on this page · raw message
Signature · 1 line
2.40.1
Re: [PATCH bpf-next v5 2/2] selftests/bpf: Export send_recv_data helper
Quoted 24 lines · Geliang Tang
tools/testing/selftests/bpf/network_helpers.c +24
-0+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 )
tools/testing/selftests/bpf/network_helpers.c int set_hw_ring_size(char *ifname, struct ethtool_ringparam *ring_param) · line 588
Quoted 10 lines
tools/testing/selftests/bpf/network_helpers.c +10
-0+continue ; +if (nr_sent ==-1 ) { + err = -errno; +break ; + } + bytes += nr_sent; + } + +if (bytes != a->bytes) +log_err ("Failed to send" );
I logged the "bytes" and "a->bytes" here.
Quoted 35 lines
tools/testing/selftests/bpf/network_helpers.c +35
-0+ +done: +if (fd >=0 ) +close (fd); +if (err) { +WRITE_ONCE (a->stop,1 ); +return ERR_PTR (err); + } +return NULL ; +} + +int 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, + .stop =0 , + }; +pthread_t srv_thread; +void *thread_ret; +char batch[1500 ]; +int err =0 ; + + err =pthread_create (&srv_thread,NULL , send_recv_server, (void *)&arg); +if (err) { +log_err ("Failed to pthread_create" ); +return err; + } + +/* 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 )
tools/testing/selftests/bpf/network_helpers.c int set_hw_ring_size(char *ifname, struct ethtool_ringparam *ring_param) · line 633
Quoted 10 lines
tools/testing/selftests/bpf/network_helpers.c +10
-0+continue ; +if (nr_recv ==-1 ) { + err = -errno; +break ; + } + bytes += nr_recv; + } + +if (bytes != total_bytes) +log_err ("Failed to recv" );
Same here.
tools/testing/selftests/bpf/network_helpers.c int set_hw_ring_size(char *ifname, struct ethtool_ringparam *ring_param) · line 637
Quoted 4 lines
tools/testing/selftests/bpf/network_helpers.c +4
-0+ +WRITE_ONCE (arg.stop,1 ); +pthread_join (srv_thread, &thread_ret); +if (IS_ERR (thread_ret) && !err) {
Removed the "&& !err: check. The thread_ret error should always be logged.
Applied. Thanks.
Quoted 6 lines
tools/testing/selftests/bpf/network_helpers.c +6
-0+log_err ("Failed to thread_ret" ); + err =PTR_ERR (thread_ret); + } + +return err; +}
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Martin KaFai Lau <[email protected]>:
Quoted 8 lines · On Thu, 11 Apr 2024 13:43:10 +0800 you wrote:
From: Geliang Tang <[email protected]>
v5:
- address Martin's comments for v4 (thanks).
- update patch 2, use 'return err' instead of 'return -1/0'.
- drop patch 3 in v4.[...]
Here is the summary with links:
- [bpf-next,v5,1/2] selftests/bpf: Add struct send_recv_arg
https://git.kernel.org/bpf/bpf-next/c/68acca6e6f99 - [bpf-next,v5,2/2] selftests/bpf: Export send_recv_data helper https://git.kernel.org/bpf/bpf-next/c/dc34e44ea6a1
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html