add more features to the zcrx benchmark
cover add more features to the zcrx benchmark
The patchset adds options for binding to a device and for filling with a pattern for data verification. Also, improve warning and error messages.
Pavel Begunkov (4):
examples/send-zc: warn about data reordering examples/send-zc: option to bind socket to device examples/send-zc: optionally fill data with a pattern examples/zcrx: be more verbose on verification failure
examples/send-zerocopy.c | 72 +++++++++++++++++++++++++++++++--------- examples/zcrx.c | 3 +- 2 files changed, 58 insertions(+), 17 deletions(-)
Signature · 1 line
2.48.1
PATCH 1/4 examples/send-zc: warn about data reordering
Data can be reordered if there are multiple outstanding write requests for the same stream / TCP socket. That's fine for a benchmark, but warn about it.
--- examples/send-zerocopy.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
examples/send-zerocopy.c +13 -9
@@ -501,6 +501,7 @@ static void usage(const char *filepath)static void parse_opts (int argc,char **argv) { +const char *cfg_test;const int max_payload_len =IP_MAXPACKET -sizeof (struct ipv6hdr ) - sizeof(struct tcphdr) -
@@ -573,10 +574,22 @@ static void parse_opts(int argc, char **argv) } } + cfg_test = argv[argc -1 ]; +if (!strcmp (cfg_test,"tcp" )) + cfg_type =SOCK_STREAM ; +else if (!strcmp (cfg_test,"udp" )) + cfg_type =SOCK_DGRAM ; +else +t_error (1 ,0 ,"unknown cfg_test %s" , cfg_test); +if (cfg_nr_reqs >MAX_SUBMIT_NR )t_error (1 ,0 ,"-n: submit batch nr exceeds max (%d)" ,MAX_SUBMIT_NR );if (cfg_payload_len > max_payload_len)t_error (1 ,0 ,"-s: payload exceeds max (%d)" , max_payload_len); +if (!cfg_nr_reqs) +t_error (1 ,0 ,"-n: submit batch can't be zero" ); +if (cfg_nr_reqs >1 && cfg_type ==SOCK_STREAM ) +printf ("warning: submit batching >1 with TCP sockets will cause data reordering" ); str_addr = daddr;
@@ -589,7 +602,6 @@ int main(int argc, char **argv)unsigned long long tsum =0 ;unsigned long long packets =0 , bytes =0 ;struct thread_data *td; -const char *cfg_test;unsigned int i;void *res;
@@ -607,14 +619,6 @@ int main(int argc, char **argv) } } - cfg_test = argv[argc -1 ]; -if (!strcmp (cfg_test,"tcp" )) - cfg_type =SOCK_STREAM ; -else if (!strcmp (cfg_test,"udp" )) - cfg_type =SOCK_DGRAM ; -else -t_error (1 ,0 ,"unknown cfg_test %s" , cfg_test); -pthread_barrier_init (&barrier,NULL , cfg_nr_threads);for (i =0 ; i <IP_MAXPACKET ; i++)
Signature · 1 line
2.48.1
PATCH 2/4 examples/send-zc: option to bind socket to device
In reply to Pavel BegunkovLet the user to specify the interface for tx.
--- examples/send-zerocopy.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-)
examples/send-zerocopy.c +17 -1
@@ -68,6 +68,7 @@ static bool cfg_defer_taskrun = 0;static int cfg_cpu =-1 ;static bool cfg_rx =0 ;static unsigned cfg_nr_threads =1 ; +static const char *cfg_ifname;static int cfg_family =PF_UNSPEC ;static int cfg_type =0 ;
@@ -343,6 +344,16 @@ static void do_tx(struct thread_data *td, int domain, int type, int protocol)if (fd ==-1 )t_error (1 , errno,"socket t" ); +if (cfg_ifname) { +struct ifreq ifr; + +memset (&ifr,0 ,sizeof (ifr)); +snprintf (ifr.ifr_name,sizeof (ifr.ifr_name), cfg_ifname); + +if (setsockopt (fd,SOL_SOCKET ,SO_BINDTODEVICE , &ifr,sizeof (ifr)) <0 ) +t_error (1 , errno,"Binding to device failed\n" ); + } +if (connect (fd, (void *)&td->dst_addr, cfg_alen))t_error (1 , errno,"connect, idx %i" , td->idx);
@@ -516,7 +527,7 @@ static void parse_opts(int argc, char **argv) cfg_payload_len = max_payload_len; -while ((c =getopt (argc, argv,"46D:p:s:t:n:z:b:l:dC:T:Ry" )) !=-1 ) { +while ((c =getopt (argc, argv,"46D:p:s:t:n:z:I:b:l:dC:T:Ry" )) !=-1 ) {switch (c) {case '4' :if (cfg_family !=PF_UNSPEC )
@@ -530,6 +541,9 @@ static void parse_opts(int argc, char **argv) cfg_family =PF_INET6 ; cfg_alen =sizeof (struct sockaddr_in6 );break ; +case 'I' : + cfg_ifname = optarg; +break ;case 'D' : daddr = optarg;break ;
@@ -588,6 +602,8 @@ static void parse_opts(int argc, char **argv)t_error (1 ,0 ,"-s: payload exceeds max (%d)" , max_payload_len);if (!cfg_nr_reqs)t_error (1 ,0 ,"-n: submit batch can't be zero" ); +if (cfg_ifname && cfg_rx) +t_error (1 ,0 ,"Interface can only be specified for tx" );if (cfg_nr_reqs >1 && cfg_type ==SOCK_STREAM )printf ("warning: submit batching >1 with TCP sockets will cause data reordering" );
Signature · 1 line
2.48.1
PATCH 3/4 examples/send-zc: optionally fill data with a pattern
In reply to Pavel Begunkov-v option tells to make the outgoing traffic to follow a pattern, which is repeating all lower case letters. zcrx already has an option to verify received data.
--- examples/send-zerocopy.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-)
examples/send-zerocopy.c +28 -8
@@ -76,11 +76,12 @@ static int cfg_payload_len;static int cfg_port =8000 ;static int cfg_runtime_ms =4200 ;static bool cfg_rx_poll = false; +static bool cfg_verify;static socklen_t cfg_alen;static char *str_addr =NULL ; -static char payload_buf[IP_MAXPACKET] __attribute__((aligned(4096))); +static char payload_buf[IP_MAXPACKET + 26] __attribute__((aligned(4096)));static char *payload;static struct thread_data threads[MAX_THREADS ];static pthread_barrier_t barrier;
@@ -376,7 +377,7 @@ static void do_tx(struct thread_data *td, int domain, int type, int protocol) } iov.iov_base = payload; - iov.iov_len = cfg_payload_len; + iov.iov_len = cfg_payload_len +26 ; ret =io_uring_register_buffers (&ring, &iov,1 );if (ret)
@@ -403,13 +404,18 @@ static void do_tx(struct thread_data *td, int domain, int type, int protocol)unsigned msg_flags =MSG_WAITALL ;for (i =0 ; i < cfg_nr_reqs; i++) { +char *buf = payload; + +if (cfg_verify && cfg_type ==SOCK_STREAM ) + buf += td->bytes %26 ; + sqe =io_uring_get_sqe (&ring);if (!cfg_zc) -io_uring_prep_send (sqe, fd, payload, +io_uring_prep_send (sqe, fd, buf, cfg_payload_len,0 );else { -io_uring_prep_send_zc (sqe, fd, payload, +io_uring_prep_send_zc (sqe, fd, buf, cfg_payload_len, msg_flags,0 );if (cfg_fixed_buf) { sqe->ioprio |=IORING_RECVSEND_FIXED_BUF ;
@@ -527,7 +533,7 @@ static void parse_opts(int argc, char **argv) cfg_payload_len = max_payload_len; -while ((c =getopt (argc, argv,"46D:p:s:t:n:z:I:b:l:dC:T:Ry" )) !=-1 ) { +while ((c =getopt (argc, argv,"46D:p:s:t:n:z:I:b:l:dC:T:Ryv" )) !=-1 ) {switch (c) {case '4' :if (cfg_family !=PF_UNSPEC )
@@ -582,12 +588,19 @@ static void parse_opts(int argc, char **argv)case 'R' : cfg_rx =1 ;break ; +case 'v' : + cfg_verify = true; +break ;case 'y' : cfg_rx_poll =1 ;break ; } } + available_buffer_len = cfg_payload_len; +if (cfg_verify) + available_buffer_len +=26 ; + cfg_test = argv[argc -1 ];if (!strcmp (cfg_test,"tcp" )) cfg_type =SOCK_STREAM ;
@@ -604,8 +617,13 @@ static void parse_opts(int argc, char **argv)t_error (1 ,0 ,"-n: submit batch can't be zero" );if (cfg_ifname && cfg_rx)t_error (1 ,0 ,"Interface can only be specified for tx" ); -if (cfg_nr_reqs >1 && cfg_type ==SOCK_STREAM ) +if (cfg_nr_reqs >1 && cfg_type ==SOCK_STREAM ) {printf ("warning: submit batching >1 with TCP sockets will cause data reordering" ); +if (cfg_verify) +t_error (1 ,0 ,"can't verify data because of reordering" ); + } +if (cfg_rx && cfg_verify) +t_error (1 ,0 ,"Server mode doesn't support data verification" ); str_addr = daddr;
@@ -637,8 +655,10 @@ int main(int argc, char **argv)pthread_barrier_init (&barrier,NULL , cfg_nr_threads); -for (i =0 ; i <IP_MAXPACKET ; i++) - payload[i] ='a' + (i %26 ); +if (cfg_verify) { +for (i =0 ; i < available_buffer_len +26 ; i++) + payload[i] ='a' + (i %26 ); + }for (i =0 ; i < cfg_nr_threads; i++) { td = &threads[i];
Signature · 1 line
2.48.1
PATCH 4/4 examples/zcrx: be more verbose on verification failure
In reply to Pavel BegunkovPrint additional info if data verification fails.
--- examples/zcrx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
examples/zcrx.c +2 -1
@@ -216,7 +216,8 @@ static void verify_data(char *data, size_t size, unsigned long seq)char expected ='a' + (seq + i) %26 ;if (data[i] != expected) -t_error (1 ,0 ,"payload mismatch at %i" , i); +t_error (1 ,0 ,"payload mismatch at %i: expected %i vs got %i, seq %li" , + i, expected, data[i], seq); } }
Signature · 1 line
2.48.1
Jens Axboe
maintainerRe: [PATCH liburing 3/4] examples/send-zc: optionally fill data with a pattern
In reply to Pavel BegunkovQuoted 7 lines
examples/send-zerocopy.c +3
-0@@ -582,12 +588,19 @@ static void parse_opts(int argc, char **argv)case 'R' : cfg_rx =1 ;break ; +case 'v' : + cfg_verify = true; +break ;
examples/send-zerocopy.c static void parse_opts(int argc, char **argv) · line 603
Quoted 10 lines
examples/send-zerocopy.c +4
-0case 'y' : cfg_rx_poll =1 ;break ; } } + available_buffer_len = cfg_payload_len; +if (cfg_verify) + available_buffer_len +=26 ; +
This variable is nowhere to be found?
Signature · 1 line
Jens Axboe
Re: [PATCH liburing 3/4] examples/send-zc: optionally fill data with a pattern
Quoted 13 lines · Jens Axboe
Quoted 13 lines
examples/send-zerocopy.c +3
-0@@ -582,12 +588,19 @@ static void parse_opts(int argc, char **argv)case 'R' : cfg_rx =1 ;break ; +case 'v' : + cfg_verify = true; +break ;case 'y' : cfg_rx_poll =1 ;break ; } }
Quoted 6 lines
examples/send-zerocopy.c static void parse_opts(int argc, char **argv) · line 603
Quoted 4 lines
examples/send-zerocopy.c +4
-0+ available_buffer_len = cfg_payload_len; +if (cfg_verify) + available_buffer_len +=26 ; +This variable is nowhere to be found
And it shouldn't be there in the first place, I'll resend
Signature · 1 line
Pavel Begunkov