Received-SPF: pass (google.com: domain of linux-kernel+bounces-7779-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Thu, 21 Dec 2023 04:09:05 +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, 
	Boris Pismenny <borisp@nvidia.com>, John Fastabend <john.fastabend@gmail.com>, 
	Jakub Kicinski <kuba@kernel.org>, "David S. Miller" <davem@davemloft.net>, 
	Eric Dumazet <edumazet@google.com>, Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org, 
	linux-kernel@vger.kernel.org
Subject: [PATCH v2 06/11] tls/sw: tls_sw_splice_read: always request
 non-blocking I/O
Message-ID: <f14a9bee9658d8aced8cd0a951bbc962c6a7bd5b.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="ol5qyjq3wpi4gz2a"
Content-Disposition: inline
In-Reply-To: <cover.1703126594.git.nabijaczleweli@nabijaczleweli.xyz>
User-Agent: NeoMutt/20231103-116-3b855e-dirty


--ol5qyjq3wpi4gz2a
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 > tls_sw.c <<^D
	#define _GNU_SOURCE
	#include <fcntl.h>
	#include <unistd.h>
	#include <sys/socket.h>
	#include <netinet/in.h>
	#include <netinet/tcp.h>
	#include <linux/tls.h>
	int main()
	{
		int s =3D socket(AF_INET, SOCK_STREAM, 0);
		struct sockaddr_in addr =3D {
			.sin_family =3D AF_INET,
			.sin_addr =3D { htonl(INADDR_LOOPBACK) },
			.sin_port =3D htons(getpid() % (0xFFFF - 1000) + 1000)
		};
		bind(s, &addr, sizeof(addr));
		listen(s, 1);
		if (!fork()) {
			connect(socket(AF_INET, SOCK_STREAM, 0), &addr, sizeof(addr));
			sleep(100);
			return 0;
		}

		s =3D accept(s, NULL, NULL);
		setsockopt(s, SOL_TCP, TCP_ULP, "tls", sizeof("tls"));
		setsockopt(s, SOL_TLS, TLS_RX,
			   &(struct tls12_crypto_info_aes_gcm_128){
				   .info.version =3D TLS_1_2_VERSION,
				   .info.cipher_type =3D TLS_CIPHER_AES_GCM_128 },
			   sizeof(struct tls12_crypto_info_aes_gcm_128));

		for (;;)
			splice(s, 0, 1, 0, 128 * 1024 * 1024, 0);
	}
	^D
	cc tls_sw.c -o tls_sw
	mkfifo fifo
	./tls_sw > fifo &
	read -r _ < fifo &
	sleep 0.1
	echo zupa > fifo
tls_sw 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.

Signed-off-by: Ahelenia Ziemia=C5=84ska <nabijaczleweli@nabijaczleweli.xyz>
---
 net/tls/tls_sw.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index e37b4d2e2acd..3f474deed94d 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -2157,7 +2157,7 @@ ssize_t tls_sw_splice_read(struct socket *sock,  loff=
_t *ppos,
 	int chunk;
 	int err;
=20
-	err =3D tls_rx_reader_lock(sk, ctx, flags & SPLICE_F_NONBLOCK);
+	err =3D tls_rx_reader_lock(sk, ctx, true);
 	if (err < 0)
 		return err;
=20
@@ -2166,8 +2166,7 @@ ssize_t tls_sw_splice_read(struct socket *sock,  loff=
_t *ppos,
 	} else {
 		struct tls_decrypt_arg darg;
=20
-		err =3D tls_rx_rec_wait(sk, NULL, flags & SPLICE_F_NONBLOCK,
-				      true);
+		err =3D tls_rx_rec_wait(sk, NULL, true, true);
 		if (err <=3D 0)
 			goto splice_read_end;
=20
--=20
2.39.2

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

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

iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmWDrFEACgkQvP0LAY0m
WPG5yBAAiSaEIPGtJWTxMcMY0+EBT2H2t4VUmUJY/LDInj1PKpoOfALLGu5pWbmQ
YTVboZCg+8LuhF1QENmND/uqQde8kDs5fxsH+4AslkjhonKQe7EB4PDOfuM4lYbS
BUJce2K4XxZw2EYadWEK9Y64b7aqZEC7eU/KF6RFn1KbN1jsI4HCwuzK2iiLIrAK
MWOvkOcumfldoRnpY+/1HNa4HDO1OV0zmLh+kI1spW+m633L3aDNIkKfx5Oj+t8R
h/XHNHV9Kd4NF7B9UQcvnmtZhOZaWDrbiKBbdIckZKvH/Lxikd5X2tlnbEn/AGg9
++12+Pni38KjYuVQiPtIslY36nmb6FgItrNtoVcuIV1Y7H9PwR/PKPudhQypzp98
5zz3O/sNGT90/ijkml7ogMVvxQ+lOi2LTQjyvghqn7elfSrEShq2cXLSPHP6OxJx
g+urvgQqBA8CgLAL8FF7cqkypBUnK30l53iyAW+yCDJcu/aP4Ic/5csNoNsAF/f0
ldLitD0a9ycWqU4zvc/yK3cS/2EAWAYFoMIeh3ADfX1IHHDTArU8Eoo45/gbLA9T
FKETvEq9TnnnkCBznidKcJ2iD23EBx7Yp+pmhlH2mvhnugq38auiN8UnIddAteDh
WQqdpqxOq1dDNRaOUSwX2BVknuVYfg3p+5iWlTavMh2K9dECYxo=
=qGBH
-----END PGP SIGNATURE-----

--ol5qyjq3wpi4gz2a--