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 v5] vsock: enable setting SO_ZEROCOPY
Date: Sat, 1 Jul 2023 09:23:06 +0300 [thread overview]
Message-ID: <20230701062310.3397129-14-AVKrasnov@sberdevices.ru> (raw)
In-Reply-To: <20230701062310.3397129-1-AVKrasnov@sberdevices.ru>
For AF_VSOCK, zerocopy tx mode depends on transport, so this option must
be set in AF_VSOCK implementation where transport is accessible (if
transport is not set during setting SO_ZEROCOPY: for example socket is
not connected, then SO_ZEROCOPY will be enabled, but once transport will
be assigned, support of this type of transmission will be checked).
To handle SO_ZEROCOPY, AF_VSOCK implementation uses SOCK_CUSTOM_SOCKOPT
bit, thus handling SOL_SOCKET option operations, but all of them except
SO_ZEROCOPY will be forwarded to the generic handler by calling
'sock_setsockopt()'.
Signed-off-by: Arseniy Krasnov <AVKrasnov@sberdevices.ru>
---
Changelog:
v4 -> v5:
* This patch is totally reworked. Previous version added check for
PF_VSOCK directly to 'net/core/sock.c', thus allowing to set
SO_ZEROCOPY for AF_VSOCK type of socket. This new version catches
attempt to set SO_ZEROCOPY in 'af_vsock.c'. All other options
except SO_ZEROCOPY are forwarded to generic handler. Only this
option is processed in 'af_vsock.c'. Handling this option includes
access to transport to check that MSG_ZEROCOPY transmission is
supported by the current transport (if it is set, if not - transport
will be checked during 'connect()').
net/vmw_vsock/af_vsock.c | 44 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 42 insertions(+), 2 deletions(-)
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index da22ae0ef477..8acc77981d01 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -1406,8 +1406,18 @@ static int vsock_connect(struct socket *sock, struct sockaddr *addr,
goto out;
}
- if (vsock_msgzerocopy_allow(transport))
+ if (!vsock_msgzerocopy_allow(transport)) {
+ /* If this option was set before 'connect()',
+ * when transport was unknown, check that this
+ * feature is supported here.
+ */
+ if (sock_flag(sk, SOCK_ZEROCOPY)) {
+ err = -EOPNOTSUPP;
+ goto out;
+ }
+ } else {
set_bit(SOCK_SUPPORT_ZC, &sk->sk_socket->flags);
+ }
err = vsock_auto_bind(vsk);
if (err)
@@ -1643,7 +1653,7 @@ static int vsock_connectible_setsockopt(struct socket *sock,
const struct vsock_transport *transport;
u64 val;
- if (level != AF_VSOCK)
+ if (level != AF_VSOCK && level != SOL_SOCKET)
return -ENOPROTOOPT;
#define COPY_IN(_v) \
@@ -1666,6 +1676,34 @@ static int vsock_connectible_setsockopt(struct socket *sock,
transport = vsk->transport;
+ if (level == SOL_SOCKET) {
+ if (optname == SO_ZEROCOPY) {
+ int zc_val;
+
+ /* Use 'int' type here, because variable to
+ * set this option usually has this type.
+ */
+ COPY_IN(zc_val);
+
+ if (zc_val < 0 || zc_val > 1) {
+ err = -EINVAL;
+ goto exit;
+ }
+
+ if (transport && !vsock_msgzerocopy_allow(transport)) {
+ err = -EOPNOTSUPP;
+ goto exit;
+ }
+
+ sock_valbool_flag(sk, SOCK_ZEROCOPY,
+ zc_val ? true : false);
+ goto exit;
+ }
+
+ release_sock(sk);
+ return sock_setsockopt(sock, level, optname, optval, optlen);
+ }
+
switch (optname) {
case SO_VM_SOCKETS_BUFFER_SIZE:
COPY_IN(val);
@@ -2321,6 +2359,8 @@ static int vsock_create(struct net *net, struct socket *sock,
}
}
+ set_bit(SOCK_CUSTOM_SOCKOPT, &sk->sk_socket->flags);
+
vsock_insert_unbound(vsk);
return 0;
--
2.25.1
next prev parent reply other threads:[~2023-07-01 6:39 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-01 6:22 [RFC PATCH v5 00/17] vsock: MSG_ZEROCOPY flag support Arseniy Krasnov
2023-07-01 6:22 ` [RFC PATCH v5 01/17] vsock/virtio: read data from non-linear skb Arseniy Krasnov
2023-07-01 6:22 ` [RFC PATCH v5 02/17] vhost/vsock: " Arseniy Krasnov
2023-07-01 6:22 ` [RFC PATCH v5 03/17] vsock/virtio: support to send " Arseniy Krasnov
2023-07-01 6:22 ` [RFC PATCH v5 04/17] vsock/virtio: non-linear skb handling for tap Arseniy Krasnov
2023-07-01 6:22 ` [RFC PATCH v5 05/17] vsock/virtio: MSG_ZEROCOPY flag support Arseniy Krasnov
2023-07-01 6:22 ` [RFC PATCH v5 06/17] vsock: fix EPOLLERR set on non-empty error queue Arseniy Krasnov
2023-07-01 6:23 ` [RFC PATCH v5 07/17] vsock: read from socket's " Arseniy Krasnov
2023-07-01 6:23 ` [RFC PATCH v5 08/17] vsock: check for MSG_ZEROCOPY support on send Arseniy Krasnov
2023-07-01 6:23 ` [RFC PATCH v5 09/17] vsock: enable SOCK_SUPPORT_ZC bit Arseniy Krasnov
2023-07-01 6:23 ` [RFC PATCH v5 10/17] vhost/vsock: support MSG_ZEROCOPY for transport Arseniy Krasnov
2023-07-01 6:23 ` [RFC PATCH v5 11/17] vsock/virtio: " Arseniy Krasnov
2023-07-01 6:23 ` [RFC PATCH v5 12/17] vsock/loopback: " Arseniy Krasnov
2023-07-01 6:23 ` Arseniy Krasnov [this message]
2023-07-01 6:26 ` [RFC PATCH v5] vsock: enable setting SO_ZEROCOPY Arseniy Krasnov
2023-07-01 6:38 ` Arseniy Krasnov
2023-07-01 6:23 ` [RFC PATCH v5 14/17] docs: net: description of MSG_ZEROCOPY for AF_VSOCK Arseniy Krasnov
2023-07-01 6:23 ` [RFC PATCH v5 15/17] test/vsock: MSG_ZEROCOPY flag tests Arseniy Krasnov
2023-07-01 6:23 ` [RFC PATCH v5 16/17] test/vsock: MSG_ZEROCOPY support for vsock_perf Arseniy Krasnov
2023-07-01 6:23 ` [RFC PATCH v5 17/17] test/vsock: io_uring rx/tx tests Arseniy Krasnov
2023-07-01 6:45 ` [RFC PATCH v5 00/17] vsock: MSG_ZEROCOPY flag support Arseniy Krasnov
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=20230701062310.3397129-14-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).