Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
Date:   Thu, 14 Dec 2023 19:45:09 +0100
From:   Ahelenia =?utf-8?Q?Ziemia=C5=84ska?= 
        <nabijaczleweli@nabijaczleweli.xyz>
Cc:     Jens Axboe <axboe@kernel.dk>,
        Christian Brauner <brauner@kernel.org>,
        Alexander Viro <viro@zeniv.linux.org.uk>,
        linux-fsdevel@vger.kernel.org,
        "David S. Miller" <davem@davemloft.net>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>,
        David Howells <dhowells@redhat.com>,
        Shigeru Yoshida <syoshida@redhat.com>,
        Kuniyuki Iwashima <kuniyu@amazon.com>,
        Cong Wang <cong.wang@bytedance.com>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH RERESEND 07/11] kcm: kcm_splice_read: always request
 MSG_DONTWAIT
Message-ID: <2b5a634f5fe1a89d42a7a4f91316f888b02ca576f.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
User-Agent: NeoMutt/20231103
References: <2cover.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="whdhopzeizlay4jq"
Content-Disposition: inline
In-Reply-To: <2cover.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
To:     unlisted-recipients:; (no To-header on input)
Precedence: bulk


--whdhopzeizlay4jq
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.

Also: don't pass the SPLICE_F_*-style flags argument to
skb_recv_datagram(), which expects MSG_*-style flags.
This fixes SPLICE_F_NONBLOCK not having worked.

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

diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c
index dd1d8ffd5f59..de70156869e6 100644
--- a/net/kcm/kcmsock.c
+++ b/net/kcm/kcmsock.c
@@ -1028,7 +1028,7 @@ static ssize_t kcm_splice_read(struct socket *sock, l=
off_t *ppos,
=20
 	/* Only support splice for SOCKSEQPACKET */
=20
-	skb =3D skb_recv_datagram(sk, flags, &err);
+	skb =3D skb_recv_datagram(sk, MSG_DONTWAIT, &err);
 	if (!skb)
 		goto err_out;
=20
--=20
2.39.2

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

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

iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmV7TTUACgkQvP0LAY0m
WPHlwQ//Z1SpUyd3i9HJEevrtGYu6vrIyvz8NnBPwd657S56twXuwqKd+hgld+4P
cYHt6vu27crsAwv/hivAaGShsh3hORw1h7Z1kyPqFLfyuQAQi4pip1T3bS9l+A+8
/rBfRtAEn8BCYnGLvGxHxjq5I98eL1N3nFHh1RkFw6culEj1nfc4mdsW0rCgevuO
nr5kqd9KkutZjCAtZ6RM9N9tDnyY71xCc9LuuXsRL2q4XJz0rlucuDxZO0/7QIYc
FpruH3+IUV2KLpAVjMSNt8v0r3K0WLXvnEqNME34lxFOXTqKcncZxXdF6JCriw8O
NIeuYiUrgtxoizN3oyMJFwODyQZF6g6wTCtgtxZnQFPXqy03WyY2Hg6rce7haweB
gTp4tZ4s3pvQ0S/w4E6L/GNTX4LUvrsG6b/W+kSOBUEFjoayecg519J6dyOtMbkY
x8hHm3puLKkb5Oimv6cOf6oUdB81N05F7khX18z1Df50Tv5q9N0lzAx5kWD4lSQ3
yWn31DDV4zBXoAgKhi0Am1InQfYXijJIA7t9f/6y+sPzLoHT86y7Yq5ZmUnyAcYC
D+4mkFPbQqvEMtO3KoJtRk4VCDVXbXa6meIUdJnnJ1sHZz3YMotg+eBgipYKgb5/
6VHtR8j0UghYOM/evvHzEouT9dyO2G1etqo9iAAijU1h6yQ/yyQ=
=2w/s
-----END PGP SIGNATURE-----

--whdhopzeizlay4jq--