| Message ID | 20230930210308.2394919-12-avkrasnov@salutedevices.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | vsock/virtio: continue MSG_ZEROCOPY support | expand |
| Context | Check | Description |
|---|---|---|
| netdev/series_format | success | Posting correctly formatted |
| netdev/tree_selection | success | Clearly marked for net-next, async |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 9 this patch: 9 |
| netdev/cc_maintainers | success | CCed 3 of 3 maintainers |
| netdev/build_clang | success | Errors and warnings before: 9 this patch: 9 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/deprecated_api | success | None detected |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 9 this patch: 9 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 220 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
On Sun, Oct 01, 2023 at 12:03:07AM +0300, Arseniy Krasnov wrote: >To use this option pass '--zc' parameter: --zerocopy would be better IMHO > >./vsock_perf --zc --sender <cid> --port <port> --bytes <bytes to send> > >With this option MSG_ZEROCOPY flag will be passed to the 'send()' call. > >Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com> >--- > tools/testing/vsock/vsock_perf.c | 143 +++++++++++++++++++++++++++++-- > 1 file changed, 134 insertions(+), 9 deletions(-) > >diff --git a/tools/testing/vsock/vsock_perf.c b/tools/testing/vsock/vsock_perf.c >index a72520338f84..f0f183f3f9e8 100644 >--- a/tools/testing/vsock/vsock_perf.c >+++ b/tools/testing/vsock/vsock_perf.c >@@ -18,6 +18,8 @@ > #include <poll.h> > #include <sys/socket.h> > #include <linux/vm_sockets.h> >+#include <sys/mman.h> >+#include <linux/errqueue.h> > > #define DEFAULT_BUF_SIZE_BYTES (128 * 1024) > #define DEFAULT_TO_SEND_BYTES (64 * 1024) >@@ -28,9 +30,18 @@ > #define BYTES_PER_GB (1024 * 1024 * 1024ULL) > #define NSEC_PER_SEC (1000000000ULL) > >+#ifndef SOL_VSOCK >+#define SOL_VSOCK 287 >+#endif >+ >+#ifndef VSOCK_RECVERR >+#define VSOCK_RECVERR 1 >+#endif >+ > static unsigned int port = DEFAULT_PORT; > static unsigned long buf_size_bytes = DEFAULT_BUF_SIZE_BYTES; > static unsigned long vsock_buf_bytes = DEFAULT_VSOCK_BUF_BYTES; >+static bool zerocopy; > > static void error(const char *s) > { >@@ -247,15 +258,76 @@ static void run_receiver(unsigned long rcvlowat_bytes) > close(fd); > } > >+static void recv_completion(int fd) >+{ >+ struct sock_extended_err *serr; >+ char cmsg_data[128]; >+ struct cmsghdr *cm; >+ struct msghdr msg = { 0 }; >+ ssize_t ret; >+ >+ msg.msg_control = cmsg_data; >+ msg.msg_controllen = sizeof(cmsg_data); >+ >+ ret = recvmsg(fd, &msg, MSG_ERRQUEUE); >+ if (ret) { >+ fprintf(stderr, "recvmsg: failed to read err: %zi\n", ret); >+ return; >+ } >+ >+ cm = CMSG_FIRSTHDR(&msg); >+ if (!cm) { >+ fprintf(stderr, "cmsg: no cmsg\n"); >+ return; >+ } >+ >+ if (cm->cmsg_level != SOL_VSOCK) { >+ fprintf(stderr, "cmsg: unexpected 'cmsg_level'\n"); >+ return; >+ } >+ >+ if (cm->cmsg_type != VSOCK_RECVERR) { >+ fprintf(stderr, "cmsg: unexpected 'cmsg_type'\n"); >+ return; >+ } >+ >+ serr = (void *)CMSG_DATA(cm); >+ if (serr->ee_origin != SO_EE_ORIGIN_ZEROCOPY) { >+ fprintf(stderr, "serr: wrong origin\n"); >+ return; >+ } >+ >+ if (serr->ee_errno) { >+ fprintf(stderr, "serr: wrong error code\n"); >+ return; >+ } >+ >+ if (zerocopy && (serr->ee_code & SO_EE_CODE_ZEROCOPY_COPIED)) >+ fprintf(stderr, "warning: copy instead of zerocopy\n"); >+} >+ >+static void enable_so_zerocopy(int fd) >+{ >+ int val = 1; >+ >+ if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &val, sizeof(val))) >+ error("setsockopt(SO_ZEROCOPY)"); >+} We use enable_so_zerocopy() in a single place, maybe we can put this code there. Anyway it seems we are copy & paste some codes from util, etc. Would make sense create a new header to use on both tests and perf? >+ > static void run_sender(int peer_cid, unsigned long to_send_bytes) > { > time_t tx_begin_ns; > time_t tx_total_ns; > size_t total_send; >+ time_t time_in_send; > void *data; > int fd; > >- printf("Run as sender\n"); >+ if (zerocopy) >+ printf("Run as sender MSG_ZEROCOPY\n"); >+ else >+ printf("Run as sender\n"); >+ > printf("Connect to %i:%u\n", peer_cid, port); > printf("Send %lu bytes\n", to_send_bytes); > printf("TX buffer %lu bytes\n", buf_size_bytes); >@@ -265,38 +337,82 @@ static void run_sender(int peer_cid, unsigned long to_send_bytes) > if (fd < 0) > exit(EXIT_FAILURE); > >- data = malloc(buf_size_bytes); >+ if (zerocopy) { >+ enable_so_zerocopy(fd); > >- if (!data) { >- fprintf(stderr, "'malloc()' failed\n"); >- exit(EXIT_FAILURE); >+ data = mmap(NULL, buf_size_bytes, PROT_READ | PROT_WRITE, >+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); >+ if (data == MAP_FAILED) { >+ perror("mmap"); >+ exit(EXIT_FAILURE); >+ } >+ } else { >+ data = malloc(buf_size_bytes); >+ >+ if (!data) { >+ fprintf(stderr, "'malloc()' failed\n"); >+ exit(EXIT_FAILURE); >+ } > } > > memset(data, 0, buf_size_bytes); > total_send = 0; >+ time_in_send = 0; > tx_begin_ns = current_nsec(); > > while (total_send < to_send_bytes) { > ssize_t sent; >+ size_t rest_bytes; >+ time_t before; > >- sent = write(fd, data, buf_size_bytes); >+ rest_bytes = to_send_bytes - total_send; >+ >+ before = current_nsec(); >+ sent = send(fd, data, (rest_bytes > buf_size_bytes) ? >+ buf_size_bytes : rest_bytes, >+ zerocopy ? MSG_ZEROCOPY : 0); >+ time_in_send += (current_nsec() - before); > > if (sent <= 0) > error("write"); > > total_send += sent; >+ >+ if (zerocopy) { >+ struct pollfd fds = { 0 }; >+ >+ fds.fd = fd; >+ >+ if (poll(&fds, 1, -1) < 0) { >+ perror("poll"); >+ exit(EXIT_FAILURE); >+ } >+ >+ if (!(fds.revents & POLLERR)) { >+ fprintf(stderr, "POLLERR expected\n"); >+ exit(EXIT_FAILURE); >+ } >+ >+ recv_completion(fd); >+ } > } > > tx_total_ns = current_nsec() - tx_begin_ns; > > printf("total bytes sent: %zu\n", total_send); > printf("tx performance: %f Gbits/s\n", >- get_gbps(total_send * 8, tx_total_ns)); >- printf("total time in 'write()': %f sec\n", >+ get_gbps(total_send * 8, time_in_send)); >+ printf("total time in tx loop: %f sec\n", > (float)tx_total_ns / NSEC_PER_SEC); >+ printf("time in 'send()': %f sec\n", >+ (float)time_in_send / NSEC_PER_SEC); > > close(fd); >- free(data); >+ >+ if (zerocopy) >+ munmap(data, buf_size_bytes); >+ else >+ free(data); > } > > static const char optstring[] = ""; >@@ -336,6 +452,11 @@ static const struct option longopts[] = { > .has_arg = required_argument, > .val = 'R', > }, >+ { >+ .name = "zc", >+ .has_arg = no_argument, >+ .val = 'Z', >+ }, > {}, > }; > >@@ -351,6 +472,7 @@ static void usage(void) > " --help This message\n" > " --sender <cid> Sender mode (receiver default)\n" > " <cid> of the receiver to connect to\n" >+ " --zc Enable zerocopy\n" Should we specify that this is used only in the sender? > " --port <port> Port (default %d)\n" > " --bytes <bytes>KMG Bytes to send (default %d)\n" > " --buf-size <bytes>KMG Data buffer size (default %d). In sender mode\n" >@@ -413,6 +535,9 @@ int main(int argc, char **argv) > case 'H': /* Help. */ > usage(); > break; >+ case 'Z': /* Zerocopy. */ >+ zerocopy = true; >+ break; > default: > usage(); > } >-- >2.25.1 >
diff --git a/tools/testing/vsock/vsock_perf.c b/tools/testing/vsock/vsock_perf.c index a72520338f84..f0f183f3f9e8 100644 --- a/tools/testing/vsock/vsock_perf.c +++ b/tools/testing/vsock/vsock_perf.c @@ -18,6 +18,8 @@ #include <poll.h> #include <sys/socket.h> #include <linux/vm_sockets.h> +#include <sys/mman.h> +#include <linux/errqueue.h> #define DEFAULT_BUF_SIZE_BYTES (128 * 1024) #define DEFAULT_TO_SEND_BYTES (64 * 1024) @@ -28,9 +30,18 @@ #define BYTES_PER_GB (1024 * 1024 * 1024ULL) #define NSEC_PER_SEC (1000000000ULL) +#ifndef SOL_VSOCK +#define SOL_VSOCK 287 +#endif + +#ifndef VSOCK_RECVERR +#define VSOCK_RECVERR 1 +#endif + static unsigned int port = DEFAULT_PORT; static unsigned long buf_size_bytes = DEFAULT_BUF_SIZE_BYTES; static unsigned long vsock_buf_bytes = DEFAULT_VSOCK_BUF_BYTES; +static bool zerocopy; static void error(const char *s) { @@ -247,15 +258,76 @@ static void run_receiver(unsigned long rcvlowat_bytes) close(fd); } +static void recv_completion(int fd) +{ + struct sock_extended_err *serr; + char cmsg_data[128]; + struct cmsghdr *cm; + struct msghdr msg = { 0 }; + ssize_t ret; + + msg.msg_control = cmsg_data; + msg.msg_controllen = sizeof(cmsg_data); + + ret = recvmsg(fd, &msg, MSG_ERRQUEUE); + if (ret) { + fprintf(stderr, "recvmsg: failed to read err: %zi\n", ret); + return; + } + + cm = CMSG_FIRSTHDR(&msg); + if (!cm) { + fprintf(stderr, "cmsg: no cmsg\n"); + return; + } + + if (cm->cmsg_level != SOL_VSOCK) { + fprintf(stderr, "cmsg: unexpected 'cmsg_level'\n"); + return; + } + + if (cm->cmsg_type != VSOCK_RECVERR) { + fprintf(stderr, "cmsg: unexpected 'cmsg_type'\n"); + return; + } + + serr = (void *)CMSG_DATA(cm); + if (serr->ee_origin != SO_EE_ORIGIN_ZEROCOPY) { + fprintf(stderr, "serr: wrong origin\n"); + return; + } + + if (serr->ee_errno) { + fprintf(stderr, "serr: wrong error code\n"); + return; + } + + if (zerocopy && (serr->ee_code & SO_EE_CODE_ZEROCOPY_COPIED)) + fprintf(stderr, "warning: copy instead of zerocopy\n"); +} + +static void enable_so_zerocopy(int fd) +{ + int val = 1; + + if (setsockopt(fd, SOL_SOCKET, SO_ZEROCOPY, &val, sizeof(val))) + error("setsockopt(SO_ZEROCOPY)"); +} + static void run_sender(int peer_cid, unsigned long to_send_bytes) { time_t tx_begin_ns; time_t tx_total_ns; size_t total_send; + time_t time_in_send; void *data; int fd; - printf("Run as sender\n"); + if (zerocopy) + printf("Run as sender MSG_ZEROCOPY\n"); + else + printf("Run as sender\n"); + printf("Connect to %i:%u\n", peer_cid, port); printf("Send %lu bytes\n", to_send_bytes); printf("TX buffer %lu bytes\n", buf_size_bytes); @@ -265,38 +337,82 @@ static void run_sender(int peer_cid, unsigned long to_send_bytes) if (fd < 0) exit(EXIT_FAILURE); - data = malloc(buf_size_bytes); + if (zerocopy) { + enable_so_zerocopy(fd); - if (!data) { - fprintf(stderr, "'malloc()' failed\n"); - exit(EXIT_FAILURE); + data = mmap(NULL, buf_size_bytes, PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + if (data == MAP_FAILED) { + perror("mmap"); + exit(EXIT_FAILURE); + } + } else { + data = malloc(buf_size_bytes); + + if (!data) { + fprintf(stderr, "'malloc()' failed\n"); + exit(EXIT_FAILURE); + } } memset(data, 0, buf_size_bytes); total_send = 0; + time_in_send = 0; tx_begin_ns = current_nsec(); while (total_send < to_send_bytes) { ssize_t sent; + size_t rest_bytes; + time_t before; - sent = write(fd, data, buf_size_bytes); + rest_bytes = to_send_bytes - total_send; + + before = current_nsec(); + sent = send(fd, data, (rest_bytes > buf_size_bytes) ? + buf_size_bytes : rest_bytes, + zerocopy ? MSG_ZEROCOPY : 0); + time_in_send += (current_nsec() - before); if (sent <= 0) error("write"); total_send += sent; + + if (zerocopy) { + struct pollfd fds = { 0 }; + + fds.fd = fd; + + if (poll(&fds, 1, -1) < 0) { + perror("poll"); + exit(EXIT_FAILURE); + } + + if (!(fds.revents & POLLERR)) { + fprintf(stderr, "POLLERR expected\n"); + exit(EXIT_FAILURE); + } + + recv_completion(fd); + } } tx_total_ns = current_nsec() - tx_begin_ns; printf("total bytes sent: %zu\n", total_send); printf("tx performance: %f Gbits/s\n", - get_gbps(total_send * 8, tx_total_ns)); - printf("total time in 'write()': %f sec\n", + get_gbps(total_send * 8, time_in_send)); + printf("total time in tx loop: %f sec\n", (float)tx_total_ns / NSEC_PER_SEC); + printf("time in 'send()': %f sec\n", + (float)time_in_send / NSEC_PER_SEC); close(fd); - free(data); + + if (zerocopy) + munmap(data, buf_size_bytes); + else + free(data); } static const char optstring[] = ""; @@ -336,6 +452,11 @@ static const struct option longopts[] = { .has_arg = required_argument, .val = 'R', }, + { + .name = "zc", + .has_arg = no_argument, + .val = 'Z', + }, {}, }; @@ -351,6 +472,7 @@ static void usage(void) " --help This message\n" " --sender <cid> Sender mode (receiver default)\n" " <cid> of the receiver to connect to\n" + " --zc Enable zerocopy\n" " --port <port> Port (default %d)\n" " --bytes <bytes>KMG Bytes to send (default %d)\n" " --buf-size <bytes>KMG Data buffer size (default %d). In sender mode\n" @@ -413,6 +535,9 @@ int main(int argc, char **argv) case 'H': /* Help. */ usage(); break; + case 'Z': /* Zerocopy. */ + zerocopy = true; + break; default: usage(); }
To use this option pass '--zc' parameter: ./vsock_perf --zc --sender <cid> --port <port> --bytes <bytes to send> With this option MSG_ZEROCOPY flag will be passed to the 'send()' call. Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com> --- tools/testing/vsock/vsock_perf.c | 143 +++++++++++++++++++++++++++++-- 1 file changed, 134 insertions(+), 9 deletions(-)