Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <3fa06f06727d8742a76fac9553e623095b7c7099.camel@xry111.site>
Subject: Re: [PATCH v2] splice, net: Fix splice_to_socket() for O_NONBLOCK
 socket
From:   Xi Ruoyao <xry111@xry111.site>
To:     Jan Stancek <jstancek@redhat.com>, dhowells@redhat.com,
        kuba@kernel.org, netdev@vger.kernel.org
Cc:     linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org,
        brauner@kernel.org, viro@zeniv.linux.org.uk
Date:   Wed, 26 Jul 2023 19:42:47 +0800
In-Reply-To: <023c0e21e595e00b93903a813bc0bfb9a5d7e368.1690219914.git.jstancek@redhat.com>
References: <023c0e21e595e00b93903a813bc0bfb9a5d7e368.1690219914.git.jstancek@redhat.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
User-Agent: Evolution 3.48.4 
MIME-Version: 1.0
Precedence: bulk

On Mon, 2023-07-24 at 19:39 +0200, Jan Stancek wrote:
> LTP sendfile07 [1], which expects sendfile() to return EAGAIN when
> transferring data from regular file to a "full" O_NONBLOCK socket,
> started failing after commit 2dc334f1a63a ("splice, net: Use
> sendmsg(MSG_SPLICE_PAGES) rather than ->sendpage()").
> sendfile() no longer immediately returns, but now blocks.
>=20
> Removed sock_sendpage() handled this case by setting a MSG_DONTWAIT
> flag, fix new splice_to_socket() to do the same for O_NONBLOCK sockets.
>=20
> [1] https://github.com/linux-test-project/ltp/blob/master/testcases/kerne=
l/syscalls/sendfile/sendfile07.c
>=20
> Fixes: 2dc334f1a63a ("splice, net: Use sendmsg(MSG_SPLICE_PAGES) rather t=
han ->sendpage()")
> Acked-by: David Howells <dhowells@redhat.com>
> Signed-off-by: Jan Stancek <jstancek@redhat.com>

This issue caused the "test_asyncio" test in Python 3 test suite to hang
indefinitely.  I can confirm this patch fixes the issue.

Tested-by: Xi Ruoyao <xry111@xry111.site>

> ---
> Changes in v2:
> - add David's Acked-by
> - add netdev list
>=20
> =C2=A0fs/splice.c | 2 ++
> =C2=A01 file changed, 2 insertions(+)
>=20
> diff --git a/fs/splice.c b/fs/splice.c
> index 004eb1c4ce31..3e2a31e1ce6a 100644
> --- a/fs/splice.c
> +++ b/fs/splice.c
> @@ -876,6 +876,8 @@ ssize_t splice_to_socket(struct pipe_inode_info *pipe=
, struct file *out,
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0msg=
.msg_flags |=3D MSG_MORE;
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0if (remain && pipe_occupancy(pipe->head, tail) > 0)
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0msg=
.msg_flags |=3D MSG_MORE;
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0if (out->f_flags & O_NONBLOCK)
> +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0msg.msg_f=
lags |=3D MSG_DONTWAIT;
> =C2=A0
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, bvec, bc,
> =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=
=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=
=A0=C2=A0=C2=A0=C2=A0=C2=A0 len - remain);

--=20
Xi Ruoyao <xry111@xry111.site>
School of Aerospace Science and Technology, Xidian University