Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Mon, 16 Oct 2023 22:35:52 +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>,
        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 07/11] kcm: kcm_splice_read: always request MSG_DONTWAIT
Message-ID: <b5a634f5fe1a89d42a7a4f91316f888b02ca576f.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="3nezagrfhxjugaiu"
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


--3nezagrfhxjugaiu
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

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

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

iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmUtnqcACgkQvP0LAY0m
WPFfPg/7BLf4GfCFFFQnpfm/hNBXK7uaqDIVht6nNEUVcBLk74rgK5ueYbLfqUVp
Kc+0lhKL1+bSUMuzrMJaSJVSWK3Vvz49OoZsSSOS9B0myJ7+LCuqbleTpWDtVkZV
WxLWS/bOHIrTJfgFuK01+sQ6pPd351OPUhPe1eDp6wEFdJpx+AjChB+OSqbgQUlT
W3PUhTzFHxgpxMbK0E9DGtOtbDJEqdmV4yfJznxKuIt6fKILfpDalFW8UoYbyVpp
N4KWofvUTi2SvIvye5IZgZsQwLdGHBkoKbBjZHZxEvBLf3T7YLfDu74DddOIST64
/HUsRAQcrilssrrLjvHZ0UmXtHlL15K+TkDpt6a9+6l+osqHz/uM861MH2W7qeFg
OxJLZL/gMs7NGk7m+EsCMbz+FKzA3s+nNyPSyL0cOYyPJ+Huo4Zau86MyV4jqabt
HwtUGgF8OX7JQRKlna+mOYsmFeRvPNet748OgwlAuIgRtg78lkSxN0Z44n4CaEzY
gPTQd21aElCxkWflX6DC4T1tIjOg0dVY07sgELYd3ge6CU01rmreyOnbXc6B9ZOG
i+QN4JZR0BkYXEs5j/vlI/s5jICilO3iqdjzFG6Sot/gQCysfazj3mL7X8wLWYKI
RhYSUaF6QMc/siOJZnazRBhjNKuzPyiYGrQpDUZqwp6LIaNyuVo=
=zW1r
-----END PGP SIGNATURE-----

--3nezagrfhxjugaiu--