Received-SPF: pass (google.com: domain of linux-kernel+bounces-7777-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Thu, 21 Dec 2023 04:09:00 +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, 
	Wenjia Zhang <wenjia@linux.ibm.com>, Jan Karcher <jaka@linux.ibm.com>, 
	"D. Wythe" <alibuda@linux.alibaba.com>, Tony Lu <tonylu@linux.alibaba.com>, 
	Wen Gu <guwen@linux.alibaba.com>, "David S. Miller" <davem@davemloft.net>, 
	Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, 
	Paolo Abeni <pabeni@redhat.com>, linux-s390@vger.kernel.org, netdev@vger.kernel.org, 
	linux-kernel@vger.kernel.org
Subject: [PATCH v2 04/11] net/smc: smc_splice_read: always request
 MSG_DONTWAIT
Message-ID: <38e20a4939603718232859ee2170f54d8bcd8ddf.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="bmqh3eyp5rhgpey6"
Content-Disposition: inline
In-Reply-To: <cover.1703126594.git.nabijaczleweli@nabijaczleweli.xyz>
User-Agent: NeoMutt/20231103-116-3b855e-dirty


--bmqh3eyp5rhgpey6
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 this meant that splice(smc -> pipe) with no data
would hold the pipe lock, and any open/read/write/close on the pipe
would enter uninterruptible sleep.

Signed-off-by: Ahelenia Ziemia=C5=84ska <nabijaczleweli@nabijaczleweli.xyz>
---
 net/smc/af_smc.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 73eebddbbf41..a11a966d031a 100644
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -3248,12 +3248,8 @@ static ssize_t smc_splice_read(struct socket *sock, =
loff_t *ppos,
 			rc =3D -ESPIPE;
 			goto out;
 		}
-		if (flags & SPLICE_F_NONBLOCK)
-			flags =3D MSG_DONTWAIT;
-		else
-			flags =3D 0;
 		SMC_STAT_INC(smc, splice_cnt);
-		rc =3D smc_rx_recvmsg(smc, NULL, pipe, len, flags);
+		rc =3D smc_rx_recvmsg(smc, NULL, pipe, len, MSG_DONTWAIT);
 	}
 out:
 	release_sock(sk);
--=20
2.39.2

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

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

iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmWDrEsACgkQvP0LAY0m
WPHWuhAAjBNRcDIE5tqe5dn6viHRf+J38xzJmiW1UeKuoS4vl73xjhxZ8+FP1MCO
/UYzkaGPyfeBZ1hvgvyG0Wtnoc48pO5/kcnzmPk1i1fS/C8ubR1U/6cTOTiTQXth
z/Idsc2ZDlIJzIem9vNNYshMJ/UFyQuBTl6X6j4SYWmOjjufrK6O+AWEyEywEApD
Cr2erQ7TMqpRIQy1DgraU9BWxXGQcGsUMe4yO04MyzJgpOcK6DgNcWedkuQLxcpA
4NuB/h8T7JF3wZ3fYsBXqB22u+Vi55yF3sC6hHqgmRKZU8pVfhfxZdqj4PctbLJ+
E4f1zju9PI2guFUqgbEYCdzHpN6InUoUa2niRCdHd7htscw9ohwibXEK/YKCdUfD
qgAtApWAJmPQ7xAo+SzvJDm2QMEL7Flfdcw91lsurE/IJ4JF9XgPHqtLNXV5zE9P
kbEkNQ5+DOG2oXdRHYDerSJfus7CuoDDap7148K7MrwWiU8elE6CstdgyY2TM9Ur
/vF8tCc8H31/ayTz9/aS2wyuwTFJJEZ4ks+pWocdRAk2JhMP21/LVmV98Kfs3+Pj
KhrUqjBUN03PAdoAsFFuaLYRaTr57tl0bO841WOxoE18kSw7lvUn5CT6/IdxvRhc
sreyrKQOARx2ElYMBh+RBq7vKzj4r1GQDY2hDJXesHB3jv+VT5w=
=Rvm3
-----END PGP SIGNATURE-----

--bmqh3eyp5rhgpey6--