Received-SPF: pass (google.com: domain of linux-kernel+bounces-7778-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Thu, 21 Dec 2023 04:09:03 +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>, Peilin Ye <peilin.ye@bytedance.com>, netdev@vger.kernel.org, 
	linux-kernel@vger.kernel.org
Subject: [PATCH v2 05/11] kcm: kcm_splice_read: always request MSG_DONTWAIT
Message-ID: <0d8847df2f13e0831ee2f5504d06d5d12036d8f9.1703126594.git.nabijaczleweli@nabijaczleweli.xyz>
References: <cover.1703126594.git.nabijaczleweli@nabijaczleweli.xyz>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
	protocol="application/pgp-signature"; boundary="5o6qkbs6x2rmqla5"
Content-Disposition: inline
In-Reply-To: <cover.1703126594.git.nabijaczleweli@nabijaczleweli.xyz>
User-Agent: NeoMutt/20231103-116-3b855e-dirty


--5o6qkbs6x2rmqla5
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 =E2=80=92 given:
	cat > kcm.c <<^D
	#define _GNU_SOURCE
	#include <fcntl.h>
	#include <sys/socket.h>
	#include <netinet/in.h>
	#include <linux/kcm.h>
	int main()
	{
		int kcm =3D socket(AF_KCM, SOCK_SEQPACKET, KCMPROTO_CONNECTED);
		for (;;)
			splice(kcm, 0, 1, 0, 128 * 1024 * 1024, 0);
	}
	^D
	cc kcm.c -o kcm
	mkfifo fifo
	./kcm > fifo &
	read -r _ < fifo &
	sleep 0.1
	echo zupa > fifo
kcm used to sleep in splice and the shell used to enter an
uninterruptible sleep in open("fifo");
now the splice returns -EAGAIN and the whole program completes.

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.

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 65d1f6755f98..ccfc46f31891 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

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

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

iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmWDrE4ACgkQvP0LAY0m
WPEftBAAobcH1Stzc1ZSZysDN16RiUErj0K8RwIdXVmaDF043DDg8UQjFpEioV5/
MrWCvh+4waj1JsLJudS3d1LcPa8slRE8OuqS8KKmQWwo16nVktvvgskIqEXlrSYH
tsCYFSoN7F9NVWjLV43B7G0ZE8WfJrSONfjiyYaxt6L5ifNmTEQrWQcIDuG/SFVR
nNgnkz07szyhZj3EWiXAnY4WgUaip+bDuUYpftrvQ4+kcDqYc14rUWNwxyykQGda
Octdnl/hL+DCrl+75gjT4QoHHGDapY2Zdj2uBNRaTEI3K2qWGhmsW5Tubzp5+Co9
ViY/kfXxg98M0ZW0p7vgWP6XH5QJZ8ePzPiNhT/2LSogJHyGfdw2vuj060x0T5JE
BEZfzRmGJeYOvTxKP+0gMcpXehwi0sHvJ9iUFkpcdUNbDLGYmah963eiuPaw6AQ/
4OfHnWLLSpuKQ0trL7pcbJQvlcX3qeSSoGMxkDRGo5wrMhoht8kKdqG+FoMX1WRU
eZcCzntt3HlzEIKgld346Wl34vXhzCnIyX9sB/f99VJC31ve6xGEesGjmdaUN18P
wP2WuHBIaQpWxP5HBaiu8nB7F381mTSHfMl78eeRIuILQvrQR/2Np4A8sV+qfDba
bxYZ0TWeWEX12Zs9T5v+h0prIOmhgxeolyACPrAgMPnHWLy6rJ4=
=nrSb
-----END PGP SIGNATURE-----

--5o6qkbs6x2rmqla5--