netdev.vger.kernel.org archive mirror
 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>,
	Norbert Slusarek <nslusarek@gmx.net>,
	Colin Ian King <colin.king@canonical.com>,
	Andra Paraschiv <andraprs@amazon.com>
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 v5 12/19] virtio/vsock: fetch length for SEQPACKET record
Date: Thu, 18 Feb 2021 08:39:58 +0300	[thread overview]
Message-ID: <20210218054001.1068305-1-arseny.krasnov@kaspersky.com> (raw)
In-Reply-To: <20210218053347.1066159-1-arseny.krasnov@kaspersky.com>

This adds transport callback which tries to fetch record begin marker
from socket's rx queue. It is called from af_vsock.c before reading data
packets of record.

Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
---
 include/linux/virtio_vsock.h            |  1 +
 net/vmw_vsock/virtio_transport_common.c | 53 +++++++++++++++++++++++++
 2 files changed, 54 insertions(+)

diff --git a/include/linux/virtio_vsock.h b/include/linux/virtio_vsock.h
index 003d06ae4a85..022667d57884 100644
--- a/include/linux/virtio_vsock.h
+++ b/include/linux/virtio_vsock.h
@@ -85,6 +85,7 @@ virtio_transport_dgram_dequeue(struct vsock_sock *vsk,
 			       struct msghdr *msg,
 			       size_t len, int flags);
 
+size_t virtio_transport_seqpacket_seq_get_len(struct vsock_sock *vsk);
 int
 virtio_transport_seqpacket_dequeue(struct vsock_sock *vsk,
 				   struct msghdr *msg,
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
index d8ec2dfa2315..e9a2de72ebbf 100644
--- a/net/vmw_vsock/virtio_transport_common.c
+++ b/net/vmw_vsock/virtio_transport_common.c
@@ -399,6 +399,59 @@ static inline void virtio_transport_remove_pkt(struct virtio_vsock_pkt *pkt)
 	virtio_transport_free_pkt(pkt);
 }
 
+static size_t virtio_transport_drop_until_seq_begin(struct virtio_vsock_sock *vvs)
+{
+	struct virtio_vsock_pkt *pkt, *n;
+	size_t bytes_dropped = 0;
+
+	list_for_each_entry_safe(pkt, n, &vvs->rx_queue, list) {
+		if (le16_to_cpu(pkt->hdr.op) == VIRTIO_VSOCK_OP_SEQ_BEGIN)
+			break;
+
+		bytes_dropped += le32_to_cpu(pkt->hdr.len);
+		virtio_transport_dec_rx_pkt(vvs, pkt);
+		virtio_transport_remove_pkt(pkt);
+	}
+
+	return bytes_dropped;
+}
+
+size_t virtio_transport_seqpacket_seq_get_len(struct vsock_sock *vsk)
+{
+	struct virtio_vsock_seq_hdr *seq_hdr;
+	struct virtio_vsock_sock *vvs;
+	struct virtio_vsock_pkt *pkt;
+	size_t bytes_dropped;
+
+	vvs = vsk->trans;
+
+	spin_lock_bh(&vvs->rx_lock);
+
+	/* Fetch all orphaned 'RW' packets and send credit update. */
+	bytes_dropped = virtio_transport_drop_until_seq_begin(vvs);
+
+	if (list_empty(&vvs->rx_queue))
+		goto out;
+
+	pkt = list_first_entry(&vvs->rx_queue, struct virtio_vsock_pkt, list);
+
+	vvs->user_read_copied = 0;
+
+	seq_hdr = (struct virtio_vsock_seq_hdr *)pkt->buf;
+	vvs->user_read_seq_len = le32_to_cpu(seq_hdr->msg_len);
+	vvs->curr_rx_msg_cnt = le32_to_cpu(seq_hdr->msg_cnt);
+	virtio_transport_dec_rx_pkt(vvs, pkt);
+	virtio_transport_remove_pkt(pkt);
+out:
+	spin_unlock_bh(&vvs->rx_lock);
+
+	if (bytes_dropped)
+		virtio_transport_send_credit_update(vsk);
+
+	return vvs->user_read_seq_len;
+}
+EXPORT_SYMBOL_GPL(virtio_transport_seqpacket_seq_get_len);
+
 static int virtio_transport_seqpacket_do_dequeue(struct vsock_sock *vsk,
 						 struct msghdr *msg,
 						 bool *msg_ready)
-- 
2.25.1


  parent reply	other threads:[~2021-02-18  5:50 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-18  5:33 [RFC PATCH v5 00/19] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-02-18  5:36 ` [RFC PATCH v5 01/19] af_vsock: update functions for connectible socket Arseny Krasnov
2021-02-22 10:50   ` Stefano Garzarella
2021-02-22 10:58     ` Arseny Krasnov
2021-02-22 11:09       ` Stefano Garzarella
2021-02-18  5:36 ` [RFC PATCH v5 02/19] af_vsock: separate wait data loop Arseny Krasnov
2021-02-22 11:29   ` Stefano Garzarella
2021-02-25 14:24   ` Jorgen Hansen
2021-02-25 17:01     ` Arseny Krasnov
2021-02-18  5:36 ` [RFC PATCH v5 03/19] af_vsock: separate receive " Arseny Krasnov
2021-02-22 11:43   ` Stefano Garzarella
2021-02-18  5:37 ` [RFC PATCH v5 04/19] af_vsock: implement SEQPACKET receive loop Arseny Krasnov
2021-02-22 11:53   ` Stefano Garzarella
2021-02-25 16:27   ` Jorgen Hansen
2021-02-25 17:00     ` Arseny Krasnov
2021-02-18  5:37 ` [RFC PATCH v5 05/19] af_vsock: separate wait space loop Arseny Krasnov
2021-02-22 12:06   ` Stefano Garzarella
2021-02-18  5:38 ` [RFC PATCH v5 06/19] af_vsock: implement send logic for SEQPACKET Arseny Krasnov
2021-02-18  5:38 ` [RFC PATCH v5 07/19] af_vsock: rest of SEQPACKET support Arseny Krasnov
2021-02-22 14:12   ` Stefano Garzarella
2021-02-18  5:38 ` [RFC PATCH v5 08/19] af_vsock: update comments for stream sockets Arseny Krasnov
2021-02-22 14:18   ` Stefano Garzarella
2021-02-18  5:39 ` [RFC PATCH v5 09/19] virtio/vsock: set packet's type in send Arseny Krasnov
2021-02-23 13:42   ` Stefano Garzarella
2021-02-18  5:39 ` [RFC PATCH v5 10/19] virtio/vsock: simplify credit update function API Arseny Krasnov
2021-02-23 13:49   ` Stefano Garzarella
2021-02-18  5:39 ` [RFC PATCH v5 11/19] virtio/vsock: dequeue callback for SOCK_SEQPACKET Arseny Krasnov
2021-02-23 14:15   ` Stefano Garzarella
2021-02-23 14:17   ` Michael S. Tsirkin
2021-02-24  5:07     ` Arseny Krasnov
2021-02-24  6:41       ` Michael S. Tsirkin
2021-02-24  8:31         ` Stefano Garzarella
2021-02-27  8:58         ` Arseny Krasnov
2021-02-18  5:39 ` Arseny Krasnov [this message]
2021-02-18  5:40 ` [RFC PATCH v5 13/19] virtio/vsock: add SEQPACKET receive logic Arseny Krasnov
2021-02-18  5:40 ` [RFC PATCH v5 14/19] virtio/vsock: rest of SOCK_SEQPACKET support Arseny Krasnov
2021-02-18  5:40 ` [RFC PATCH v5 15/19] virtio/vsock: setup SEQPACKET ops for transport Arseny Krasnov
2021-02-18  5:41 ` [RFC PATCH v5 16/19] vhost/vsock: " Arseny Krasnov
2021-02-18  5:41 ` [RFC PATCH v5 17/19] vsock/loopback: " Arseny Krasnov
2021-02-18  5:42 ` [RFC PATCH v5 18/19] vsock_test: add SOCK_SEQPACKET tests Arseny Krasnov
2021-02-18  5:42 ` [RFC PATCH v5 19/19] virtio/vsock: update trace event for SEQPACKET Arseny Krasnov
2021-03-02 22:25   ` Steven Rostedt
2021-03-03 10:42     ` Arseny Krasnov
2021-02-22 14:23 ` [RFC PATCH v5 00/19] virtio/vsock: introduce SOCK_SEQPACKET support Stefano Garzarella
2021-02-23 14:50   ` Stefano Garzarella
2021-02-24  4:29     ` Arseny Krasnov
2021-02-24  8:23       ` Stefano Garzarella
2021-02-24  8:28         ` Arseny Krasnov
2021-02-24  8:35           ` Stefano Garzarella
2021-02-24  8:36             ` 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=20210218054001.1068305-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 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).