kvm.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>,
	Andra Paraschiv <andraprs@amazon.com>,
	Norbert Slusarek <nslusarek@gmx.net>,
	Colin Ian King <colin.king@canonical.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 v6 12/22] virtio/vsock: fetch length for SEQPACKET record
Date: Sun, 7 Mar 2021 21:02:31 +0300	[thread overview]
Message-ID: <20210307180235.3465973-1-arseny.krasnov@kaspersky.com> (raw)
In-Reply-To: <20210307175722.3464068-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 466a5832d2f5..d7edcfeb4cd2 100644
--- a/include/linux/virtio_vsock.h
+++ b/include/linux/virtio_vsock.h
@@ -88,6 +88,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 5f1e283e43f3..6fc78fec41c0 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->seqpacket_state.user_read_copied = 0;
+
+	seq_hdr = (struct virtio_vsock_seq_hdr *)pkt->buf;
+	vvs->seqpacket_state.user_read_seq_len = le32_to_cpu(seq_hdr->msg_len);
+	vvs->seqpacket_state.curr_rx_msg_id = le32_to_cpu(seq_hdr->msg_id);
+	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->seqpacket_state.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-03-07 18:03 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-07 17:57 [RFC PATCH v6 00/22] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-03-07 17:58 ` [RFC PATCH v6 01/22] af_vsock: update functions for connectible socket Arseny Krasnov
2021-03-12 14:38   ` Stefano Garzarella
2021-03-07 17:59 ` [RFC PATCH v6 02/22] af_vsock: separate wait data loop Arseny Krasnov
2021-03-12 14:40   ` Stefano Garzarella
2021-03-07 17:59 ` [RFC PATCH v6 03/22] af_vsock: separate receive " Arseny Krasnov
2021-03-07 17:59 ` [RFC PATCH v6 04/22] af_vsock: implement SEQPACKET receive loop Arseny Krasnov
2021-03-12 15:01   ` Stefano Garzarella
2021-03-12 15:17   ` Stefano Garzarella
2021-03-15  7:49     ` Arseny Krasnov
2021-03-07 17:59 ` [RFC PATCH v6 05/22] af_vsock: separate wait space loop Arseny Krasnov
2021-03-07 18:00 ` [RFC PATCH v6 06/22] af_vsock: implement send logic for SEQPACKET Arseny Krasnov
2021-03-12 15:10   ` Stefano Garzarella
2021-03-15  7:49     ` Arseny Krasnov
2021-03-07 18:00 ` [RFC PATCH v6 07/22] af_vsock: rest of SEQPACKET support Arseny Krasnov
2021-03-12 15:28   ` Stefano Garzarella
2021-03-07 18:01 ` [RFC PATCH v6 08/22] af_vsock: update comments for stream sockets Arseny Krasnov
2021-03-12 15:29   ` Stefano Garzarella
2021-03-07 18:01 ` [RFC PATCH v6 09/22] virtio/vsock: set packet's type in virtio_transport_send_pkt_info() Arseny Krasnov
2021-03-12 15:31   ` Stefano Garzarella
2021-03-07 18:01 ` [RFC PATCH v6 10/22] virtio/vsock: simplify credit update function API Arseny Krasnov
2021-03-12 15:33   ` Stefano Garzarella
2021-03-07 18:02 ` [RFC PATCH v6 11/22] virtio/vsock: dequeue callback for SOCK_SEQPACKET Arseny Krasnov
2021-03-15 11:02   ` Stefano Garzarella
2021-03-07 18:02 ` Arseny Krasnov [this message]
2021-03-12 15:20   ` [RFC PATCH v6 12/22] virtio/vsock: fetch length for SEQPACKET record Stefano Garzarella
2021-03-15  7:49     ` Arseny Krasnov
2021-03-07 18:02 ` [RFC PATCH v6 13/22] virtio/vsock: add SEQPACKET receive logic Arseny Krasnov
2021-03-15 11:15   ` Stefano Garzarella
2021-03-07 18:03 ` [RFC PATCH v6 14/22] virtio/vsock: rest of SOCK_SEQPACKET support Arseny Krasnov
2021-03-15 11:25   ` Stefano Garzarella
2021-03-07 18:03 ` [RFC PATCH v6 15/22] virtio/vsock: SEQPACKET support feature bit Arseny Krasnov
2021-03-07 18:03 ` [RFC PATCH v6 16/22] vhost/vsock: SEQPACKET feature bit support Arseny Krasnov
2021-03-15 11:28   ` Stefano Garzarella
2021-03-07 18:04 ` [RFC PATCH v6 17/22] virtio/vsock: " Arseny Krasnov
2021-03-15 11:29   ` Stefano Garzarella
2021-03-07 18:04 ` [RFC PATCH v6 18/22] virtio/vsock: setup SEQPACKET ops for transport Arseny Krasnov
2021-03-07 18:04 ` [RFC PATCH v6 19/22] vhost/vsock: " Arseny Krasnov
2021-03-07 18:04 ` [RFC PATCH v6 20/22] vsock/loopback: " Arseny Krasnov
2021-03-07 18:05 ` [RFC PATCH v6 21/22] vsock_test: add SOCK_SEQPACKET tests Arseny Krasnov
2021-03-07 18:05 ` [RFC PATCH v6 22/22] virtio/vsock: update trace event for SEQPACKET Arseny Krasnov
2021-03-10 10:06 ` [RFC PATCH v6 00/22] virtio/vsock: introduce SOCK_SEQPACKET support Stefano Garzarella
2021-03-10 10:13   ` Arseny Krasnov
2021-03-15 11:40 ` Stefano Garzarella
2021-03-15 15:22   ` Arseny Krasnov
2021-03-16  3:37     ` Arseny Krasnov
2021-03-16  8:08       ` 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=20210307180235.3465973-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).