Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
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>,
        Colin Ian King <colin.king@canonical.com>,
        Andra Paraschiv <andraprs@amazon.com>,
        Alexander Popov <alex.popov@linux.com>,
        "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 v4 02/17] af_vsock: separate wait data loop
Thread-Topic: [RFC PATCH v4 02/17] af_vsock: separate wait data loop
Thread-Index: AQHW/WQCwqS0yBcnrEK6IKbM45zX3qpTFHoA
Date:   Thu, 11 Feb 2021 15:11:07 +0000
Message-ID: <4094442C-C2A1-49D6-9901-7F3C73FABFC9@vmware.com>
References: <20210207151259.803917-1-arseny.krasnov@kaspersky.com>
 <20210207151451.804498-1-arseny.krasnov@kaspersky.com>
In-Reply-To: <20210207151451.804498-1-arseny.krasnov@kaspersky.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-ID: <A15A07775C85CF43BD670CCB0D4EB204@namprd05.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: ec2e6bee-83ed-4807-9375-08d8ce9f41d2
X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Feb 2021 15:11:07.1736
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: NZSNAxYHhyj6WqMwyWYmfeZJ4169ljmGpm+1Vr6f0G7rekNY0DMW2WoHb/kiqe2hLK3O2ZmanB+x2Puq8OaHPQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR05MB4137
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


> On 7 Feb 2021, at 16:14, Arseny Krasnov <arseny.krasnov@kaspersky.com> wr=
ote:
>=20
> This moves wait loop for data to dedicated function, because later
> it will be used by SEQPACKET data receive loop.
>=20
> Signed-off-by: Arseny Krasnov <arseny.krasnov@kaspersky.com>
> ---
> net/vmw_vsock/af_vsock.c | 158 +++++++++++++++++++++------------------
> 1 file changed, 86 insertions(+), 72 deletions(-)
>=20
> diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c
> index f4fabec50650..38927695786f 100644
> --- a/net/vmw_vsock/af_vsock.c
> +++ b/net/vmw_vsock/af_vsock.c
> @@ -1833,6 +1833,71 @@ static int vsock_connectible_sendmsg(struct socket=
 *sock, struct msghdr *msg,
> 	return err;
> }
>=20
> +static int vsock_wait_data(struct sock *sk, struct wait_queue_entry *wai=
t,
> +			   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 =3D vsock_sk(sk);
> +	err =3D 0;
> +	transport =3D vsk->transport;
> +	prepare_to_wait(sk_sleep(sk), wait, TASK_INTERRUPTIBLE);
> +
> +	while ((data =3D vsock_stream_has_data(vsk)) =3D=3D 0) {
> +		if (sk->sk_err !=3D 0 ||
> +		    (sk->sk_shutdown & RCV_SHUTDOWN) ||
> +		    (vsk->peer_shutdown & SEND_SHUTDOWN)) {
> +			goto out;
> +		}
> +
> +		/* Don't wait for non-blocking sockets. */
> +		if (timeout =3D=3D 0) {
> +			err =3D -EAGAIN;
> +			goto out;
> +		}
> +
> +		if (recv_data) {
> +			err =3D transport->notify_recv_pre_block(vsk, target, recv_data);
> +			if (err < 0)
> +				goto out;
> +		}
> +
> +		release_sock(sk);
> +		timeout =3D schedule_timeout(timeout);
> +		lock_sock(sk);
> +
> +		if (signal_pending(current)) {
> +			err =3D sock_intr_errno(timeout);
> +			goto out;
> +		} else if (timeout =3D=3D 0) {
> +			err =3D -EAGAIN;
> +			goto out;
> +		}
> +	}
> +
> +	finish_wait(sk_sleep(sk), wait);
> +
> +	/* Invalid queue pair content. XXX This should
> +	 * be changed to a connection reset in a later
> +	 * change.
> +	 */

Since you are here, could you update this comment to something like:

/* 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;
> +
> +	/* Have some data, return. */
> +	if (data)
> +		return data;
> +
> +out:
> +	finish_wait(sk_sleep(sk), wait);
> +	return err;
> +}

I agree with Stefanos suggestion to get rid of the out: part  and just have=
 the single finish_wait().

> +
> static int
> vsock_connectible_recvmsg(struct socket *sock, struct msghdr *msg, size_t=
 len,
> 			  int flags)
> @@ -1912,85 +1977,34 @@ vsock_connectible_recvmsg(struct socket *sock, st=
ruct msghdr *msg, size_t len,
>=20
>=20
> 	while (1) {
> -		s64 ready;
> +		ssize_t read;
>=20
> -		prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
> -		ready =3D vsock_stream_has_data(vsk);
> -
> -		if (ready =3D=3D 0) {
> -			if (sk->sk_err !=3D 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 =3D=3D 0) {
> -				err =3D -EAGAIN;
> -				finish_wait(sk_sleep(sk), &wait);
> -				break;
> -			}
> -
> -			err =3D transport->notify_recv_pre_block(
> -					vsk, target, &recv_data);
> -			if (err < 0) {
> -				finish_wait(sk_sleep(sk), &wait);
> -				break;
> -			}
> -			release_sock(sk);
> -			timeout =3D schedule_timeout(timeout);
> -			lock_sock(sk);
> -
> -			if (signal_pending(current)) {
> -				err =3D sock_intr_errno(timeout);
> -				finish_wait(sk_sleep(sk), &wait);
> -				break;
> -			} else if (timeout =3D=3D 0) {
> -				err =3D -EAGAIN;
> -				finish_wait(sk_sleep(sk), &wait);
> -				break;
> -			}
> -		} else {
> -			ssize_t read;
> +		err =3D vsock_wait_data(sk, &wait, timeout, &recv_data, target);
> +		if (err <=3D 0)
> +			break;

There is a small change in the behaviour here if vsock_stream_has_data(vsk)
returned something < 0. Since you just do a break, the err value can be upd=
ated
if there is an sk->sk_err, a receive shutdown has been performed or data ha=
s
already been copied. That should be ok, though.

> -			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 =3D -ENOMEM;
> -				goto out;
> -			}
> -
> -			err =3D transport->notify_recv_pre_dequeue(
> -					vsk, target, &recv_data);
> -			if (err < 0)
> -				break;
> +		err =3D transport->notify_recv_pre_dequeue(vsk, target,
> +							 &recv_data);
> +		if (err < 0)
> +			break;
>=20
> -			read =3D transport->stream_dequeue(
> -					vsk, msg,
> -					len - copied, flags);
> -			if (read < 0) {
> -				err =3D -ENOMEM;
> -				break;
> -			}
> +		read =3D transport->stream_dequeue(vsk, msg, len - copied, flags);
> +		if (read < 0) {
> +			err =3D -ENOMEM;
> +			break;
> +		}
>=20
> -			copied +=3D read;
> +		copied +=3D read;
>=20
> -			err =3D transport->notify_recv_post_dequeue(
> -					vsk, target, read,
> -					!(flags & MSG_PEEK), &recv_data);
> -			if (err < 0)
> -				goto out;
> +		err =3D transport->notify_recv_post_dequeue(vsk, target, read,
> +						!(flags & MSG_PEEK), &recv_data);
> +		if (err < 0)
> +			goto out;
>=20
> -			if (read >=3D target || flags & MSG_PEEK)
> -				break;
> +		if (read >=3D target || flags & MSG_PEEK)
> +			break;
>=20
> -			target -=3D read;
> -		}
> +		target -=3D read;
> 	}
>=20
> 	if (sk->sk_err)
> --=20
> 2.25.1
>=20