mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Arseniy Krasnov <avkrasnov@salutedevices.com>
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@salutedevices.com>
Subject: [PATCH net-next v1 02/12] vsock: read from socket's error queue
Date: Fri, 22 Sep 2023 08:24:18 +0300	[thread overview]
Message-ID: <20230922052428.4005676-3-avkrasnov@salutedevices.com> (raw)
In-Reply-To: <20230922052428.4005676-1-avkrasnov@salutedevices.com>

This adds handling of MSG_ERRQUEUE input flag in receive call. This flag
is used to read socket's error queue instead of data queue. Possible
scenario of error queue usage is receiving completions for transmission
with MSG_ZEROCOPY flag. This patch also adds new defines: 'SOL_VSOCK'
and 'VSOCK_RECVERR'.

Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com>
---
 Changelog:
 v5(big patchset) -> v1:
  * R-b tag removed, due to added defines to 'include/uapi/linux/vsock.h'.
    Both 'SOL_VSOCK' and 'VSOCK_RECVERR' are needed by userspace, so
    they were placed to 'include/uapi/linux/vsock.h'. At the same time,
    the same define for 'SOL_VSOCK' was placed to 'include/linux/socket.h'.
    This is needed because this file contains SOL_XXX defines for different
    types of socket, so it prevents situation when another new SOL_XXX
    will use constant 287.

 include/linux/socket.h     | 1 +
 include/uapi/linux/vsock.h | 9 +++++++++
 net/vmw_vsock/af_vsock.c   | 6 ++++++
 3 files changed, 16 insertions(+)
 create mode 100644 include/uapi/linux/vsock.h

diff --git a/include/linux/socket.h b/include/linux/socket.h
index 39b74d83c7c4..cfcb7e2c3813 100644
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
@@ -383,6 +383,7 @@ struct ucred {
 #define SOL_MPTCP	284
 #define SOL_MCTP	285
 #define SOL_SMC		286
+#define SOL_VSOCK	287
 
 /* IPX options */
 #define IPX_TYPE	1
diff --git a/include/uapi/linux/vsock.h b/include/uapi/linux/vsock.h
new file mode 100644
index 000000000000..b25c1347a3b8
--- /dev/null
+++ b/include/uapi/linux/vsock.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+#ifndef _UAPI_LINUX_VSOCK_H
+#define _UAPI_LINUX_VSOCK_H
+
+#define SOL_VSOCK	287
+
+#define VSOCK_RECVERR	1
+
+#endif /* _UAPI_LINUX_VSOCK_H */
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
index d841f4de33b0..4fd11bf34bc7 100644
--- a/net/vmw_vsock/af_vsock.c
+++ b/net/vmw_vsock/af_vsock.c
@@ -110,6 +110,8 @@
 #include <linux/workqueue.h>
 #include <net/sock.h>
 #include <net/af_vsock.h>
+#include <linux/errqueue.h>
+#include <uapi/linux/vsock.h>
 
 static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr);
 static void vsock_sk_destruct(struct sock *sk);
@@ -2137,6 +2139,10 @@ vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
 	int err;
 
 	sk = sock->sk;
+
+	if (unlikely(flags & MSG_ERRQUEUE))
+		return sock_recv_errqueue(sk, msg, len, SOL_VSOCK, VSOCK_RECVERR);
+
 	vsk = vsock_sk(sk);
 	err = 0;
 
-- 
2.25.1


  parent reply	other threads:[~2023-09-22  5:31 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-22  5:24 [PATCH net-next v1 00/12] vsock/virtio: continue MSG_ZEROCOPY support Arseniy Krasnov
2023-09-22  5:24 ` [PATCH net-next v1 01/12] vsock: fix EPOLLERR set on non-empty error queue Arseniy Krasnov
2023-09-26 12:54   ` Stefano Garzarella
2023-09-22  5:24 ` Arseniy Krasnov [this message]
2023-09-26 12:55   ` [PATCH net-next v1 02/12] vsock: read from socket's " Stefano Garzarella
2023-09-26 19:36     ` Arseniy Krasnov
2023-09-27  7:34       ` Stefano Garzarella
2023-09-27  7:34         ` Arseniy Krasnov
2023-09-22  5:24 ` [PATCH net-next v1 03/12] vsock: check for MSG_ZEROCOPY support on send Arseniy Krasnov
2023-09-22  5:24 ` [PATCH net-next v1 04/12] vsock: enable SOCK_SUPPORT_ZC bit Arseniy Krasnov
2023-09-22  5:24 ` [PATCH net-next v1 05/12] vhost/vsock: support MSG_ZEROCOPY for transport Arseniy Krasnov
2023-09-22  5:24 ` [PATCH net-next v1 06/12] vsock/virtio: " Arseniy Krasnov
2023-09-22  5:24 ` [PATCH net-next v1 07/12] vsock/loopback: " Arseniy Krasnov
2023-09-22  5:24 ` [PATCH net-next v1 08/12] vsock: enable setting SO_ZEROCOPY Arseniy Krasnov
2023-09-26 12:56   ` Stefano Garzarella
2023-09-26 19:38     ` Arseniy Krasnov
2023-09-27  7:35       ` Stefano Garzarella
2023-09-22  5:24 ` [PATCH net-next v1 09/12] docs: net: description of MSG_ZEROCOPY for AF_VSOCK Arseniy Krasnov
2023-09-22  5:24 ` [PATCH net-next v1 10/12] test/vsock: MSG_ZEROCOPY flag tests Arseniy Krasnov
2023-09-26 12:56   ` Stefano Garzarella
2023-09-22  5:24 ` [PATCH net-next v1 11/12] test/vsock: MSG_ZEROCOPY support for vsock_perf Arseniy Krasnov
2023-09-22  5:24 ` [PATCH net-next v1 12/12] test/vsock: io_uring rx/tx tests Arseniy Krasnov
2023-09-26 13:04   ` Stefano Garzarella
2023-09-26 20:00     ` Arseniy Krasnov
2023-09-27  7:37       ` Stefano Garzarella
2023-09-26 13:10 ` [PATCH net-next v1 00/12] vsock/virtio: continue MSG_ZEROCOPY support Stefano Garzarella
2023-09-26 19:40   ` 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=20230922052428.4005676-3-avkrasnov@salutedevices.com \
    --to=avkrasnov@salutedevices.com \
    --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

all inboxes | Powered by JetHome®