From: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
To: Stefan Hajnoczi <stefanha@redhat.com>,
Stefano Garzarella <sgarzare@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Bobby Eshleman <bobby.eshleman@bytedance.com>
Cc: <kvm@vger.kernel.org>,
<virtualization@lists.linux-foundation.org>,
<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<kernel@sberdevices.ru>, <oxffffaa@gmail.com>,
<avkrasnov@sberdevices.ru>,
Arseniy Krasnov <AVKrasnov@sberdevices.ru>
Subject: [RFC PATCH v4 16/17] test/vsock: MSG_ZEROCOPY support for vsock_perf
Date: Sat, 3 Jun 2023 23:49:38 +0300 [thread overview]
Message-ID: <20230603204939.1598818-17-AVKrasnov@sberdevices.ru> (raw)
In-Reply-To: <20230603204939.1598818-1-AVKrasnov@sberdevices.ru>
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@sberdevices.ru>
---
tools/testing/vsock/vsock_perf.c | 139 +++++++++++++++++++++++++++++--
1 file changed, 130 insertions(+), 9 deletions(-)
diff --git a/tools/testing/vsock/vsock_perf.c b/tools/testing/vsock/vsock_perf.c
index a72520338f84..7fd76f7a3c16 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,14 @@
#define BYTES_PER_GB (1024 * 1024 * 1024ULL)
#define NSEC_PER_SEC (1000000000ULL)
+#ifndef SOL_VSOCK
+#define SOL_VSOCK 287
+#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 +254,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) {
+ 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 +333,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 +448,11 @@ static const struct option longopts[] = {
.has_arg = required_argument,
.val = 'R',
},
+ {
+ .name = "zc",
+ .has_arg = no_argument,
+ .val = 'Z',
+ },
{},
};
@@ -351,6 +468,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 +531,9 @@ int main(int argc, char **argv)
case 'H': /* Help. */
usage();
break;
+ case 'Z': /* Zerocopy. */
+ zerocopy = true;
+ break;
default:
usage();
}
--
2.25.1
next prev parent reply other threads:[~2023-06-03 20:55 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-03 20:49 [RFC PATCH v4 00/17] vsock: MSG_ZEROCOPY flag support Arseniy Krasnov
2023-06-03 20:49 ` [RFC PATCH v4 01/17] vsock/virtio: read data from non-linear skb Arseniy Krasnov
2023-06-12 17:43 ` Bobby Eshleman
2023-06-26 15:20 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 02/17] vhost/vsock: " Arseniy Krasnov
2023-06-12 17:53 ` Bobby Eshleman
2023-06-26 15:24 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 03/17] vsock/virtio: support to send " Arseniy Krasnov
2023-06-12 18:30 ` Bobby Eshleman
2023-06-26 15:36 ` Stefano Garzarella
2023-06-27 4:39 ` Arseniy Krasnov
2023-06-27 7:49 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 04/17] vsock/virtio: non-linear skb handling for tap Arseniy Krasnov
2023-06-26 15:43 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 05/17] vsock/virtio: MSG_ZEROCOPY flag support Arseniy Krasnov
2023-06-26 16:03 ` Stefano Garzarella
2023-06-27 4:41 ` Arseniy Krasnov
2023-06-27 7:50 ` Stefano Garzarella
2023-06-27 8:22 ` Arseniy Krasnov
2023-06-29 12:32 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 06/17] vsock: check error queue to set EPOLLERR Arseniy Krasnov
2023-06-26 16:04 ` Stefano Garzarella
2023-06-27 4:44 ` Arseniy Krasnov
2023-06-27 7:53 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 07/17] vsock: read from socket's error queue Arseniy Krasnov
2023-06-26 16:08 ` Stefano Garzarella
2023-06-27 4:49 ` Arseniy Krasnov
2023-06-27 7:58 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 08/17] vsock: check for MSG_ZEROCOPY support on send Arseniy Krasnov
2023-06-03 20:49 ` [RFC PATCH v4 09/17] vsock: enable SOCK_SUPPORT_ZC bit Arseniy Krasnov
2023-06-03 20:49 ` [RFC PATCH v4 10/17] vhost/vsock: support MSG_ZEROCOPY for transport Arseniy Krasnov
2023-06-26 16:10 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 11/17] vsock/virtio: " Arseniy Krasnov
2023-06-26 16:11 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 12/17] vsock/loopback: " Arseniy Krasnov
2023-06-26 16:14 ` Stefano Garzarella
2023-06-03 20:49 ` [RFC PATCH v4 13/17] net/sock: enable setting SO_ZEROCOPY for PF_VSOCK Arseniy Krasnov
2023-06-03 20:49 ` [RFC PATCH v4 14/17] docs: net: description of MSG_ZEROCOPY for AF_VSOCK Arseniy Krasnov
2023-06-03 20:49 ` [RFC PATCH v4 15/17] test/vsock: MSG_ZEROCOPY flag tests Arseniy Krasnov
2023-06-03 20:49 ` Arseniy Krasnov [this message]
2023-06-03 20:49 ` [RFC PATCH v4 17/17] test/vsock: io_uring rx/tx tests Arseniy Krasnov
2023-06-12 17:20 ` [RFC PATCH v4 00/17] vsock: MSG_ZEROCOPY flag support Bobby Eshleman
2023-06-14 5:39 ` Arseniy Krasnov
2023-06-26 16:15 ` Stefano Garzarella
2023-06-27 4:55 ` Arseniy Krasnov
2023-06-27 8:01 ` Stefano Garzarella
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230603204939.1598818-17-AVKrasnov@sberdevices.ru \
--to=avkrasnov@sberdevices.ru \
--cc=bobby.eshleman@bytedance.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=jasowang@redhat.com \
--cc=kernel@sberdevices.ru \
--cc=kuba@kernel.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=oxffffaa@gmail.com \
--cc=pabeni@redhat.com \
--cc=sgarzare@redhat.com \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).