All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arseny Krasnov <arseny.krasnov@kaspersky.com>
To: Stefan Hajnoczi <stefanha@redhat.com>,
	Stefano Garzarella <sgarzare@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	Jason Wang <jasowang@redhat.com>,
	"David S. Miller" <davem@davemloft.net>,
	Jakub Kicinski <kuba@kernel.org>,
	Arseny Krasnov <arseny.krasnov@kaspersky.com>,
	Jorgen Hansen <jhansen@vmware.com>,
	Andra Paraschiv <andraprs@amazon.com>,
	Colin Ian King <colin.king@canonical.com>,
	Norbert Slusarek <nslusarek@gmx.net>
Cc: <kvm@vger.kernel.org>,
	<virtualization@lists.linux-foundation.org>,
	<netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<stsp2@yandex.ru>, <oxffffaa@gmail.com>
Subject: [RFC PATCH v9 11/19] virtio/vsock: dequeue callback for SOCK_SEQPACKET
Date: Sat, 8 May 2021 19:35:20 +0300	[thread overview]
Message-ID: <20210508163523.3431999-1-arseny.krasnov@kaspersky.com> (raw)
In-Reply-To: <20210508163027.3430238-1-arseny.krasnov@kaspersky.com>

This adds transport callback and it's logic for SEQPACKET dequeue.
Callback fetches RW packets from rx queue of socket until whole record
is copied(if user's buffer is full, user is not woken up). This is done
to not stall sender, because if we wake up user and it leaves syscall,
nobody will send credit update for rest of record, and sender will wait
for next enter of read syscall at receiver's side. So if user buffer is
full, we just send credit update and drop data.

Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
---
 v8 -> v9:
 1) Check for RW packet type is removed from loop(all packet now
    considered RW).
 2) Locking in loop is fixed.
 3) cpu_to_le32()/le32_to_cpu() now used.
 4) MSG_TRUNC handling removed from transport.

 include/linux/virtio_vsock.h            |  5 ++
 net/vmw_vsock/virtio_transport_common.c | 64 +++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
index dc636b727179..02acf6e9ae04 100644
--- a/include/linux/virtio_vsock.h
+++ b/include/linux/virtio_vsock.h
@@ -80,6 +80,11 @@ virtio_transport_dgram_dequeue(struct vsock_sock *vsk,
 			       struct msghdr *msg,
 			       size_t len, int flags);
 
+ssize_t
+virtio_transport_seqpacket_dequeue(struct vsock_sock *vsk,
+				   struct msghdr *msg,
+				   int flags,
+				   bool *msg_ready);
 s64 virtio_transport_stream_has_data(struct vsock_sock *vsk);
 s64 virtio_transport_stream_has_space(struct vsock_sock *vsk);
 
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
index ad0d34d41444..f649a21dd23b 100644
--- a/net/vmw_vsock/virtio_transport_common.c
+++ b/net/vmw_vsock/virtio_transport_common.c
@@ -393,6 +393,58 @@ virtio_transport_stream_do_dequeue(struct vsock_sock *vsk,
 	return err;
 }
 
+static int virtio_transport_seqpacket_do_dequeue(struct vsock_sock *vsk,
+						 struct msghdr *msg,
+						 int flags,
+						 bool *msg_ready)
+{
+	struct virtio_vsock_sock *vvs = vsk->trans;
+	struct virtio_vsock_pkt *pkt;
+	int err = 0;
+	size_t user_buf_len = msg->msg_iter.count;
+
+	*msg_ready = false;
+	spin_lock_bh(&vvs->rx_lock);
+
+	while (!*msg_ready && !list_empty(&vvs->rx_queue) && err >= 0) {
+		size_t bytes_to_copy;
+		size_t pkt_len;
+
+		pkt = list_first_entry(&vvs->rx_queue, struct virtio_vsock_pkt, list);
+		pkt_len = (size_t)le32_to_cpu(pkt->hdr.len);
+		bytes_to_copy = min(user_buf_len, pkt_len);
+
+		if (bytes_to_copy) {
+			/* sk_lock is held by caller so no one else can dequeue.
+			 * Unlock rx_lock since memcpy_to_msg() may sleep.
+			 */
+			spin_unlock_bh(&vvs->rx_lock);
+
+			if (memcpy_to_msg(msg, pkt->buf, bytes_to_copy)) {
+				err = -EINVAL;
+			} else {
+				err += pkt_len;
+				user_buf_len -= bytes_to_copy;
+			}
+
+			spin_lock_bh(&vvs->rx_lock);
+		}
+
+		if (le32_to_cpu(pkt->hdr.flags) & VIRTIO_VSOCK_SEQ_EOR)
+			*msg_ready = true;
+
+		virtio_transport_dec_rx_pkt(vvs, pkt);
+		list_del(&pkt->list);
+		virtio_transport_free_pkt(pkt);
+	}
+
+	spin_unlock_bh(&vvs->rx_lock);
+
+	virtio_transport_send_credit_update(vsk);
+
+	return err;
+}
+
 ssize_t
 virtio_transport_stream_dequeue(struct vsock_sock *vsk,
 				struct msghdr *msg,
@@ -405,6 +457,18 @@ virtio_transport_stream_dequeue(struct vsock_sock *vsk,
 }
 EXPORT_SYMBOL_GPL(virtio_transport_stream_dequeue);
 
+ssize_t
+virtio_transport_seqpacket_dequeue(struct vsock_sock *vsk,
+				   struct msghdr *msg,
+				   int flags, bool *msg_ready)
+{
+	if (flags & MSG_PEEK)
+		return -EOPNOTSUPP;
+
+	return virtio_transport_seqpacket_do_dequeue(vsk, msg, flags, msg_ready);
+}
+EXPORT_SYMBOL_GPL(virtio_transport_seqpacket_dequeue);
+
 int
 virtio_transport_dgram_dequeue(struct vsock_sock *vsk,
 			       struct msghdr *msg,
-- 
2.25.1


  parent reply	other threads:[~2021-05-08 16:35 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-08 16:30 [RFC PATCH v9 00/19] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-05-08 16:32 ` [RFC PATCH v9 01/19] af_vsock: update functions for connectible socket Arseny Krasnov
2021-05-08 16:32 ` [RFC PATCH v9 02/19] af_vsock: separate wait data loop Arseny Krasnov
2021-05-08 16:33 ` [RFC PATCH v9 03/19] af_vsock: separate receive " Arseny Krasnov
2021-05-08 16:33 ` [RFC PATCH v9 04/19] af_vsock: implement SEQPACKET receive loop Arseny Krasnov
2021-05-13 11:37   ` Stefano Garzarella
2021-05-13 11:37     ` Stefano Garzarella
2021-05-13 14:41     ` Arseny Krasnov
2021-05-08 16:33 ` [RFC PATCH v9 05/19] af_vsock: implement send logic for SEQPACKET Arseny Krasnov
2021-05-08 16:33 ` [RFC PATCH v9 06/19] af_vsock: rest of SEQPACKET support Arseny Krasnov
2021-05-13 11:42   ` Stefano Garzarella
2021-05-13 11:42     ` Stefano Garzarella
2021-05-08 16:34 ` [RFC PATCH v9 07/19] af_vsock: update comments for stream sockets Arseny Krasnov
2021-05-08 16:34 ` [RFC PATCH v9 08/19] virtio/vsock: set packet's type in virtio_transport_send_pkt_info() Arseny Krasnov
2021-05-08 16:34 ` [RFC PATCH v9 09/19] virtio/vsock: simplify credit update function API Arseny Krasnov
2021-05-08 16:35 ` [RFC PATCH v9 10/19] virtio/vsock: defines and constants for SEQPACKET Arseny Krasnov
2021-05-13 11:45   ` Stefano Garzarella
2021-05-13 11:45     ` Stefano Garzarella
2021-05-13 14:42     ` Arseny Krasnov
2021-05-08 16:35 ` Arseny Krasnov [this message]
2021-05-13 11:58   ` [RFC PATCH v9 11/19] virtio/vsock: dequeue callback for SOCK_SEQPACKET Stefano Garzarella
2021-05-13 11:58     ` Stefano Garzarella
2021-05-13 14:42     ` Arseny Krasnov
2021-05-13 12:18   ` Stefano Garzarella
2021-05-13 12:18     ` Stefano Garzarella
2021-05-08 16:35 ` [RFC PATCH v9 12/19] virtio/vsock: add SEQPACKET receive logic Arseny Krasnov
2021-05-13 12:14   ` Stefano Garzarella
2021-05-13 12:14     ` Stefano Garzarella
2021-05-13 14:43     ` Arseny Krasnov
2021-05-08 16:35 ` [RFC PATCH v9 13/19] virtio/vsock: rest of SOCK_SEQPACKET support Arseny Krasnov
2021-05-13 12:27   ` Stefano Garzarella
2021-05-13 12:27     ` Stefano Garzarella
2021-05-13 13:03     ` Stefano Garzarella
2021-05-13 13:03       ` Stefano Garzarella
2021-05-08 16:36 ` [RFC PATCH v9 14/19] virtio/vsock: enable SEQPACKET for transport Arseny Krasnov
2021-05-13 12:49   ` Stefano Garzarella
2021-05-13 12:49     ` Stefano Garzarella
2021-05-13 14:44     ` Arseny Krasnov
2021-05-08 16:36 ` [RFC PATCH v9 15/19] vhost/vsock: " Arseny Krasnov
2021-05-13 13:44   ` Stefano Garzarella
2021-05-13 13:44     ` Stefano Garzarella
2021-05-08 16:36 ` [RFC PATCH v9 16/19] vsock/loopback: " Arseny Krasnov
2021-05-08 16:37 ` [RFC PATCH v9 17/19] vsock_test: add SOCK_SEQPACKET tests Arseny Krasnov
2021-05-13 13:47   ` Stefano Garzarella
2021-05-13 13:47     ` Stefano Garzarella
2021-05-08 16:37 ` [RFC PATCH v9 18/19] virtio/vsock: update trace event for SEQPACKET Arseny Krasnov
2021-05-08 16:37 ` [RFC PATCH v9 19/19] af_vsock: serialize writes to shared socket Arseny Krasnov
2021-05-13 14:01   ` Stefano Garzarella
2021-05-13 14:01     ` Stefano Garzarella
2021-05-13 14:45     ` Arseny Krasnov
2021-05-13 14:46     ` Stefano Garzarella
2021-05-13 14:46       ` Stefano Garzarella
2021-05-13 14:48       ` Arseny Krasnov
2021-05-13 15:41         ` Stefano Garzarella
2021-05-13 15:41           ` Stefano Garzarella
2021-05-13 14:51     ` Arseny Krasnov
2021-05-13 14:10 ` [RFC PATCH v9 00/19] virtio/vsock: introduce SOCK_SEQPACKET support Stefano Garzarella
2021-05-13 14:10   ` Stefano Garzarella
2021-05-13 14:46   ` Arseny 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=20210508163523.3431999-1-arseny.krasnov@kaspersky.com \
    --to=arseny.krasnov@kaspersky.com \
    --cc=andraprs@amazon.com \
    --cc=colin.king@canonical.com \
    --cc=davem@davemloft.net \
    --cc=jasowang@redhat.com \
    --cc=jhansen@vmware.com \
    --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=nslusarek@gmx.net \
    --cc=oxffffaa@gmail.com \
    --cc=sgarzare@redhat.com \
    --cc=stefanha@redhat.com \
    --cc=stsp2@yandex.ru \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.