From: Jorgen Hansen <jhansen@vmware.com>
To: Arseny Krasnov <arseny.krasnov@kaspersky.com>
Cc: 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>,
Andra Paraschiv <andraprs@amazon.com>,
Colin Ian King <colin.king@canonical.com>,
Norbert Slusarek <nslusarek@gmx.net>,
"kvm@vger.kernel.org" <kvm@vger.kernel.org>,
"virtualization@lists.linux-foundation.org"
<virtualization@lists.linux-foundation.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"stsp2@yandex.ru" <stsp2@yandex.ru>,
"oxffffaa@gmail.com" <oxffffaa@gmail.com>
Subject: Re: [RFC PATCH v5 02/19] af_vsock: separate wait data loop
Date: Thu, 25 Feb 2021 14:24:17 +0000 [thread overview]
Message-ID: <E5526501-3A87-4349-8D7F-61782AA1F513@vmware.com> (raw)
In-Reply-To: <20210218053637.1066959-1-arseny.krasnov@kaspersky.com>
> On 18 Feb 2021, at 06:36, Arseny Krasnov <arseny.krasnov@kaspersky.com> wrote:
>
> This moves wait loop for data to dedicated function, because later
> it will be used by SEQPACKET data receive loop.
>
> Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
> ---
> net/vmw_vsock/af_vsock.c | 155 +++++++++++++++++++++------------------
> 1 file changed, 83 insertions(+), 72 deletions(-)
>
> diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
> index 656370e11707..6cf7bb977aa1 100644
> --- a/net/vmw_vsock/af_vsock.c
> +++ b/net/vmw_vsock/af_vsock.c
> @@ -1832,6 +1832,68 @@ static int vsock_connectible_sendmsg(struct socket *sock, struct msghdr *msg,
> return err;
> }
>
> +static int vsock_wait_data(struct sock *sk, struct wait_queue_entry *wait,
> + long timeout,
> + struct vsock_transport_recv_notify_data *recv_data,
> + size_t target)
> +{
> + const struct vsock_transport *transport;
> + struct vsock_sock *vsk;
> + s64 data;
> + int err;
> +
> + vsk = vsock_sk(sk);
> + err = 0;
> + transport = vsk->transport;
> + prepare_to_wait(sk_sleep(sk), wait, TASK_INTERRUPTIBLE);
> +
> + while ((data = vsock_stream_has_data(vsk)) == 0) {
In the original code, the prepare_to_wait() is called for each iteration of the while loop. In this
version, it is only called once. So if we do multiple iterations, the thread would be in the
TASK_RUNNING state, and subsequent schedule_timeout() will return immediately. So
looks like the prepare_to_wait() should be move here, in case we have a spurious wake_up.
> + if (sk->sk_err != 0 ||
> + (sk->sk_shutdown & RCV_SHUTDOWN) ||
> + (vsk->peer_shutdown & SEND_SHUTDOWN)) {
> + break;
> + }
> +
> + /* Don't wait for non-blocking sockets. */
> + if (timeout == 0) {
> + err = -EAGAIN;
> + break;
> + }
> +
> + if (recv_data) {
> + err = transport->notify_recv_pre_block(vsk, target, recv_data);
> + if (err < 0)
> + break;
> + }
> +
> + release_sock(sk);
> + timeout = schedule_timeout(timeout);
> + lock_sock(sk);
> +
> + if (signal_pending(current)) {
> + err = sock_intr_errno(timeout);
> + break;
> + } else if (timeout == 0) {
> + err = -EAGAIN;
> + break;
> + }
> + }
> +
> + finish_wait(sk_sleep(sk), wait);
> +
> + if (err)
> + return err;
> +
> + /* Internal transport error when checking for available
> + * data. XXX This should be changed to a connection
> + * reset in a later change.
> + */
> + if (data < 0)
> + return -ENOMEM;
> +
> + return data;
> +}
> +
> static int
> vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
> int flags)
> @@ -1911,85 +1973,34 @@ vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
>
>
> while (1) {
> - s64 ready;
> -
> - prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
> - ready = vsock_stream_has_data(vsk);
> -
> - if (ready == 0) {
> - if (sk->sk_err != 0 ||
> - (sk->sk_shutdown & RCV_SHUTDOWN) ||
> - (vsk->peer_shutdown & SEND_SHUTDOWN)) {
> - finish_wait(sk_sleep(sk), &wait);
> - break;
> - }
> - /* Don't wait for non-blocking sockets. */
> - if (timeout == 0) {
> - err = -EAGAIN;
> - finish_wait(sk_sleep(sk), &wait);
> - break;
> - }
> + ssize_t read;
>
> - err = transport->notify_recv_pre_block(
> - vsk, target, &recv_data);
> - if (err < 0) {
> - finish_wait(sk_sleep(sk), &wait);
> - break;
> - }
> - release_sock(sk);
> - timeout = schedule_timeout(timeout);
> - lock_sock(sk);
> + err = vsock_wait_data(sk, &wait, timeout, &recv_data, target);
> + if (err <= 0)
> + break;
>
> - if (signal_pending(current)) {
> - err = sock_intr_errno(timeout);
> - finish_wait(sk_sleep(sk), &wait);
> - break;
> - } else if (timeout == 0) {
> - err = -EAGAIN;
> - finish_wait(sk_sleep(sk), &wait);
> - break;
> - }
> - } else {
> - ssize_t read;
> -
> - finish_wait(sk_sleep(sk), &wait);
> -
> - if (ready < 0) {
> - /* Invalid queue pair content. XXX This should
> - * be changed to a connection reset in a later
> - * change.
> - */
> -
> - err = -ENOMEM;
> - goto out;
> - }
> -
> - err = transport->notify_recv_pre_dequeue(
> - vsk, target, &recv_data);
> - if (err < 0)
> - break;
> + err = transport->notify_recv_pre_dequeue(vsk, target,
> + &recv_data);
> + if (err < 0)
> + break;
>
> - read = transport->stream_dequeue(
> - vsk, msg,
> - len - copied, flags);
> - if (read < 0) {
> - err = -ENOMEM;
> - break;
> - }
> + read = transport->stream_dequeue(vsk, msg, len - copied, flags);
> + if (read < 0) {
> + err = -ENOMEM;
> + break;
> + }
>
> - copied += read;
> + copied += read;
>
> - err = transport->notify_recv_post_dequeue(
> - vsk, target, read,
> - !(flags & MSG_PEEK), &recv_data);
> - if (err < 0)
> - goto out;
> + err = transport->notify_recv_post_dequeue(vsk, target, read,
> + !(flags & MSG_PEEK), &recv_data);
> + if (err < 0)
> + goto out;
>
> - if (read >= target || flags & MSG_PEEK)
> - break;
> + if (read >= target || flags & MSG_PEEK)
> + break;
>
> - target -= read;
> - }
> + target -= read;
> }
>
> if (sk->sk_err)
> --
> 2.25.1
>
next prev parent reply other threads:[~2021-02-25 14:25 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 [this message]
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 ` [RFC PATCH v5 12/19] virtio/vsock: fetch length for SEQPACKET record Arseny Krasnov
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=E5526501-3A87-4349-8D7F-61782AA1F513@vmware.com \
--to=jhansen@vmware.com \
--cc=andraprs@amazon.com \
--cc=arseny.krasnov@kaspersky.com \
--cc=colin.king@canonical.com \
--cc=davem@davemloft.net \
--cc=jasowang@redhat.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).