Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
Date:   Mon, 16 Oct 2023 22:35:39 +0200
From:   Ahelenia =?utf-8?Q?Ziemia=C5=84ska?= 
        <nabijaczleweli@nabijaczleweli.xyz>
Cc:     "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        Kuniyuki Iwashima <kuniyu@amazon.com>,
        David Howells <dhowells@redhat.com>,
        Alexander Mikhalitsyn <alexander@mihalicyn.com>,
        Kirill Tkhai <tkhai@ya.ru>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH 02/11] af_unix: unix_stream_splice_read: always request
 MSG_DONTWAIT
Message-ID: <8db45d00902da22ae25aa16a0c28bb41002fc039.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
References: <cover.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="rszd4xwxhzlr2ybj"
Content-Disposition: inline
In-Reply-To: <cover.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
User-Agent: NeoMutt/20231006
To:     unlisted-recipients:; (no To-header on input)
Precedence: bulk


--rszd4xwxhzlr2ybj
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Otherwise we risk sleeping with the pipe locked for indeterminate
lengths of time.

Link: https://lore.kernel.org/linux-fsdevel/qk6hjuam54khlaikf2ssom6custxf5i=
s2ekkaequf4hvode3ls@zgf7j5j4ubvw/t/#u
Signed-off-by: Ahelenia Ziemia=C5=84ska <nabijaczleweli@nabijaczleweli.xyz>
---
 net/unix/af_unix.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 3e8a04a13668..9489b9bda753 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2889,15 +2889,12 @@ static ssize_t unix_stream_splice_read(struct socke=
t *sock,  loff_t *ppos,
 		.pipe =3D pipe,
 		.size =3D size,
 		.splice_flags =3D flags,
+		.flags =3D MSG_DONTWAIT,
 	};
=20
 	if (unlikely(*ppos))
 		return -ESPIPE;
=20
-	if (sock->file->f_flags & O_NONBLOCK ||
-	    flags & SPLICE_F_NONBLOCK)
-		state.flags =3D MSG_DONTWAIT;
-
 	return unix_stream_read_generic(&state, false);
 }
=20
--=20
2.39.2

--rszd4xwxhzlr2ybj
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmUtnpsACgkQvP0LAY0m
WPFuFQ//RSJgctb0QfmDrNoHt0l9fqCJ7qs2IRUfTmE3JBSnwvfKCm8Jelz7qzp6
xIgixDpRNfjQi9fxf3mqnkV2vlSoktUE7uJQ43x742uVLD6PI3ZATjZuocMZpOgL
0HFJQhN5y+C7KKFmQPmgapK+uwyMNDDl4tfwS9JPrucOcfKfehhsHPZ+G94ZyiR8
4J9gmpdoHZrcJQeQth0v249B3P95wimjvYY4Ryb0Jx+/5Zt7eGcoJMDvcRAfKDps
5qRCQ2665+uqWToA0FQ3zIaoAwfCn4/mzO5CZXf+yks8MNFMnmqWPioCBoT8nErN
YiXMESTrVOTVTJNaqCR/9uw5L/SNiwV7paUGfzwHgcuPeSeQ/h+QScGqufRHZ6c9
5iawZ349lBkypA+vfPmt+KDVn66eGeP2/z/LD0fKetzTz4DBIkVa8InPO+2kecqe
zbKDrptCqTD+JYfdoKveZ1rEs+1dIzRjH88RVcsWxj3fu9vX8SDvuXeoBQa3CIuI
QEuaJlBz58whkkL6c5HVBHxy5SGgAQ+U6PkH0DeMXQ6/QuqgsqLVE7MlueT3lExY
Y2KOZDA8YKLHkxGPw8LmIJM9TdZYoHRjGKDVaBxtfSJ4Iwu0x94kOQNfqXRIDuMB
hUAAJoo5YVbMOGqPYhESksdb6XPtLVLONwlrPu+4qyF4eCvxiMs=
=dGfn
-----END PGP SIGNATURE-----

--rszd4xwxhzlr2ybj--