From: Stefano Garzarella <sgarzare@redhat.com>
To: Arseny Krasnov <arseny.krasnov@kaspersky.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
Jorgen Hansen <jhansen@vmware.com>,
Andra Paraschiv <andraprs@amazon.com>,
Colin Ian King <colin.king@canonical.com>,
Norbert Slusarek <nslusarek@gmx.net>,
Alexander Popov <alex.popov@linux.com>,
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: Re: [RFC PATCH v7 12/22] virtio/vsock: fetch length for SEQPACKET record
Date: Thu, 25 Mar 2021 11:08:10 +0100 [thread overview]
Message-ID: <20210325100810.ygmg6vqb2f7rxoyx@steredhat> (raw)
In-Reply-To: <20210323131258.2461163-1-arseny.krasnov@kaspersky.com>
On Tue, Mar 23, 2021 at 04:12:55PM +0300, Arseny Krasnov wrote:
>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>
>---
> v6 -> v7:
> 1) Now 'virtio_transport_seqpacket_seq_get_len()' returns 0, if rx
> queue of socket is empty. Else it returns length of current message
> to handle.
> 2) If dequeue callback is called, but there is no detected length of
> message to dequeue, EAGAIN is returned, and outer loop restarts
> receiving.
>
> net/vmw_vsock/virtio_transport_common.c | 61 +++++++++++++++++++++++++
> 1 file changed, 61 insertions(+)
>
>diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c
>index a8f4326e45e8..41f05034593e 100644
>--- a/net/vmw_vsock/virtio_transport_common.c
>+++ b/net/vmw_vsock/virtio_transport_common.c
>@@ -399,6 +399,62 @@ 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;
>+}
>+
>+static 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 = 0;
>+
>+ vvs = vsk->trans;
>+
>+ spin_lock_bh(&vvs->rx_lock);
>+
>+ /* Have some record to process, return it's length. */
>+ if (vvs->seq_state.user_read_seq_len)
>+ goto out;
>+
>+ /* 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->seq_state.user_read_copied = 0;
>+
>+ seq_hdr = (struct virtio_vsock_seq_hdr *)pkt->buf;
>+ vvs->seq_state.user_read_seq_len = le32_to_cpu(seq_hdr->msg_len);
>+ vvs->seq_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->seq_state.user_read_seq_len;
>+}
>+
> static int virtio_transport_seqpacket_do_dequeue(struct vsock_sock *vsk,
> struct msghdr *msg,
> bool *msg_ready)
>@@ -522,6 +578,11 @@ virtio_transport_seqpacket_dequeue(struct vsock_sock *vsk,
> if (flags & MSG_PEEK)
> return -EOPNOTSUPP;
>
>+ *msg_len = virtio_transport_seqpacket_seq_get_len(vsk);
>+
>+ if (*msg_len == 0)
>+ return -EAGAIN;
>+
Okay, I see now, I think you can move this patch before the previous one
or merge them in a single patch, it is better to review and to bisect.
As mentioned, I think we can return msg_len if
virtio_transport_seqpacket_do_dequeue() does not fail, otherwise the
error.
I mean something like this:
static ssize_t virtio_transport_seqpacket_do_dequeue(...)
{
size_t msg_len;
ssize_t ret;
msg_len = virtio_transport_seqpacket_seq_get_len(vsk);
if (msg_len == 0)
return -EAGAIN;
ret = virtio_transport_seqpacket_do_dequeue(vsk, msg, msg_ready);
if (ret < 0)
return ret;
return msg_len;
}
> return virtio_transport_seqpacket_do_dequeue(vsk, msg, msg_ready);
> }
> EXPORT_SYMBOL_GPL(virtio_transport_seqpacket_dequeue);
>-- 2.25.1
>
next prev parent reply other threads:[~2021-03-25 10:09 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-23 13:07 [RFC PATCH v7 00/22] virtio/vsock: introduce SOCK_SEQPACKET support Arseny Krasnov
2021-03-23 13:08 ` [RFC PATCH v7 01/22] af_vsock: update functions for connectible socket Arseny Krasnov
2021-03-23 13:09 ` [RFC PATCH v7 02/22] af_vsock: separate wait data loop Arseny Krasnov
2021-03-23 13:09 ` [RFC PATCH v7 03/22] af_vsock: separate receive " Arseny Krasnov
2021-03-25 9:06 ` Stefano Garzarella
2021-03-23 13:10 ` [RFC PATCH v7 04/22] af_vsock: implement SEQPACKET receive loop Arseny Krasnov
2021-03-25 9:34 ` Stefano Garzarella
2021-03-25 16:01 ` Arseny Krasnov
2021-03-23 13:10 ` [RFC PATCH v7 05/22] af_vsock: separate wait space loop Arseny Krasnov
2021-03-25 9:37 ` Stefano Garzarella
2021-03-23 13:10 ` [RFC PATCH v7 06/22] af_vsock: implement send logic for SEQPACKET Arseny Krasnov
2021-03-25 9:42 ` Stefano Garzarella
2021-03-23 13:11 ` [RFC PATCH v7 07/22] af_vsock: rest of SEQPACKET support Arseny Krasnov
2021-03-23 13:11 ` [RFC PATCH v7 08/22] af_vsock: update comments for stream sockets Arseny Krasnov
2021-03-23 13:11 ` [RFC PATCH v7 09/22] virtio/vsock: set packet's type in virtio_transport_send_pkt_info() Arseny Krasnov
2021-03-23 13:12 ` [RFC PATCH v7 10/22] virtio/vsock: simplify credit update function API Arseny Krasnov
2021-03-23 13:12 ` [RFC PATCH v7 11/22] virtio/vsock: dequeue callback for SOCK_SEQPACKET Arseny Krasnov
2021-03-25 9:56 ` Stefano Garzarella
2021-03-25 16:02 ` Arseny Krasnov
2021-03-23 13:12 ` [RFC PATCH v7 12/22] virtio/vsock: fetch length for SEQPACKET record Arseny Krasnov
2021-03-25 10:08 ` Stefano Garzarella [this message]
2021-03-25 16:02 ` Arseny Krasnov
2021-03-23 13:13 ` [RFC PATCH v7 13/22] virtio/vsock: add SEQPACKET receive logic Arseny Krasnov
2021-03-25 10:09 ` Stefano Garzarella
2021-03-23 13:13 ` [RFC PATCH v7 14/22] virtio/vsock: rest of SOCK_SEQPACKET support Arseny Krasnov
2021-03-25 10:18 ` Stefano Garzarella
2021-03-25 16:03 ` Arseny Krasnov
2021-03-23 13:13 ` [RFC PATCH v7 15/22] virtio/vsock: SEQPACKET support feature bit Arseny Krasnov
2021-03-25 10:26 ` Stefano Garzarella
2021-03-25 16:04 ` Arseny Krasnov
2021-03-23 13:14 ` [RFC PATCH v7 16/22] virtio/vsock: setup SEQPACKET ops for transport Arseny Krasnov
2021-03-25 10:39 ` Stefano Garzarella
2021-03-25 16:04 ` Arseny Krasnov
2021-03-23 13:14 ` [RFC PATCH v7 17/22] vhost/vsock: " Arseny Krasnov
2021-03-25 10:42 ` Stefano Garzarella
2021-03-25 16:04 ` Arseny Krasnov
2021-03-23 13:14 ` [RFC PATCH v7 18/22] vsock/loopback: " Arseny Krasnov
2021-03-25 10:48 ` Stefano Garzarella
2021-03-23 13:14 ` [RFC PATCH v7 19/22] vhost/vsock: SEQPACKET feature bit support Arseny Krasnov
2021-03-23 13:15 ` [RFC PATCH v7 20/22] virtio/vsock: " Arseny Krasnov
2021-03-23 13:15 ` [RFC PATCH v7 21/22] vsock_test: add SOCK_SEQPACKET tests Arseny Krasnov
2021-03-23 13:15 ` [RFC PATCH v7 22/22] virtio/vsock: update trace event for SEQPACKET Arseny Krasnov
2021-03-25 10:52 ` [RFC PATCH v7 00/22] virtio/vsock: introduce SOCK_SEQPACKET support Stefano Garzarella
2021-03-25 16:05 ` 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=20210325100810.ygmg6vqb2f7rxoyx@steredhat \
--to=sgarzare@redhat.com \
--cc=alex.popov@linux.com \
--cc=andraprs@amazon.com \
--cc=arseny.krasnov@kaspersky.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=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).