Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
Date:   Thu, 14 Dec 2023 19:45:12 +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 RERESEND 08/11] tls/sw: tls_sw_splice_read: always request
 non-blocking I/O
Message-ID: <20fffb097b4d2b328ef16e7353d6829f1ec9efcae.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="72rmbb73vdgn7njt"
Content-Disposition: inline
In-Reply-To: <2cover.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
To:     unlisted-recipients:; (no To-header on input)
Precedence: bulk


--72rmbb73vdgn7njt
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/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 d1fc295b83b5..73d88c6739e8 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -2145,7 +2145,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
@@ -2154,8 +2154,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

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

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

iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmV7TTcACgkQvP0LAY0m
WPFXNw//bqWp3zjX6kgqvex9txAftjMPBVGK4DyG2w6suviic0vY8UgqI08Pnzln
CjHRLMogxUaDG9VCoYWPTvWXZPGDW3ZTd+KcqjLifFc+pqFaYVi+5YJuzykNlLme
U5qWkoJYfcs9IsCFZ4tb51rnWZhTqvQ48Fx1Od7xn8c7MUMwEWuoxdzF2PoVACmx
mtsEwej6W5FV4kdXZGMd9veB57urNZJf+qVJIVG8fyFOOZfYBDyZKeh5q6ZuBVa9
g/ZyDs68FZoQNaaWqGe1CpSuCEIotOg3rsQPP7QpKjUPy83RdCzM7sBJdvfQ5k5Y
xbPsF49h3yfqexL9RvQjcmqmF3WLUJ16IX2vc8CzSsEoJXRjOdJKb36V0Nh18CSK
S7mGyMnoT06Jn/9gqDl/hMUL1F6MYBjmd1ua1UfvRdazH/xc97NkwUJJb4nrm0ll
6giGRxqdWLcKAIsecGWAiqGC+zGfSDt87gUbhOMKDPfC60I5xY8kHg7DE/EoYLm2
idpYyeWUt8bFqxL1CinAYP31xr18W1JV/6oOeWrfHG/8MmfXfDJ6GKvtm+9lgDV6
kSSMnqlSxh47QFtN/s5G3+hohSbYtm0vwp7kEQQPXU7frjCHXBTKBcoXbqxRoPmS
tLcVXGhYyzLNUXe9VH6dzv1zMPOWLX05fhvlG0XxQlLW89BA2CA=
=jf9+
-----END PGP SIGNATURE-----

--72rmbb73vdgn7njt--