From nobody Sat Apr 11 12:44:54 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 630B43AF67D; Fri, 3 Apr 2026 11:30:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775215800; cv=none; b=P3YsQPNhgiVBebBrYBkC7r/rjXtrcJpb6OyHasPlS11+NEW58m6Pvefv/xAzk8IYUeSOLHMyRcHtTdA6eQ6FtNvvtUECSY14x2/jBOiuAvm4QWx97pqk+rihqxkB/Bw0M79FoccTha+qUrA4o6bQmNcSEIAhIkPrUuA01dhLqNU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775215800; c=relaxed/simple; bh=1OnAPENA2MFXmmi1fleaN8fDNv5hNv73y70P39B3O0A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lo2C/icXZcb4b1LgZ/j9O6odo/fODrqUZGPMQbCrg8HhKYuMYbzNOaNwfGJIhYKr2oIsbUo/EbYtmXK6v7zRlmlRIksb/TG5Z6Jvyb1v4f7q4HCxDmoiAlndAf+/SIWeBJXxNixA1KT06XJXdVzsRacLr659t2TsjyrPqYRpayQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WKwhqtuC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WKwhqtuC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 50873C19424; Fri, 3 Apr 2026 11:29:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1775215799; bh=1OnAPENA2MFXmmi1fleaN8fDNv5hNv73y70P39B3O0A=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WKwhqtuCxfDBmUIWyFVeqJg+aWV829JhYhOzsJ/WlyfV3fZrYXY67EqoyaeSrLrat z7ECfxn51FaMirwGQRa75BEtJ2nGab9kwz450unzVdEEj1xfBgzyXVJackvsWMbOe0 1p9Lim5pw7PHBXXYxxsyfZ2s3rWsaZMGo5NVR9g1VDfyrdwO9CyHXn9JoUTG9WUB6C UwjbRxn81TbKZbu8Rn5j2A5E0JUQ2/h7UqoxUmt+CgRtvVZYHJfg70iirxvF5/hNef Rb8XismDdsCqLXlGcGYcgeGGqPAPQi/eiST55RHT9qH6WIiQ6hevZqs0ja8wr8b26O +vgF8WYF4oXWQ== From: "Matthieu Baerts (NGI0)" Date: Fri, 03 Apr 2026 13:29:29 +0200 Subject: [PATCH net-next 3/5] tcp: add recv_should_stop helper Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260403-net-next-mptcp-msg_eor-misc-v1-3-b0b33bea3fed@kernel.org> References: <20260403-net-next-mptcp-msg_eor-misc-v1-0-b0b33bea3fed@kernel.org> In-Reply-To: <20260403-net-next-mptcp-msg_eor-misc-v1-0-b0b33bea3fed@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Geliang Tang X-Mailer: b4 0.15.1 X-Developer-Signature: v=1; a=openpgp-sha256; l=3026; i=matttbe@kernel.org; h=from:subject:message-id; bh=RqCCycHW2v6owPV/xj3gdIsfqbGE+49RDNfHEJrfcLY=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLPL1kd/Suu86QCR83OhBdTauySTm1O7Hq7SzVX9VHkE Yab9ZyOHaUsDGJcDLJiiizSbZH5M59X8ZZ4+VnAzGFlAhnCwMUpABOR3cjwPzZxm9c24RlH/v1O 9hRuuNP5/NiZR5vD6qfyeBluUffY9IqRoetbulJAopJsvdDUBoYvUSxhfxinHF5+zdit6W5woXE bMwA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang Factor out a new helper tcp_recv_should_stop() from tcp_recvmsg_locked() and tcp_splice_read() to check whether to stop receiving. And use this helper in mptcp_recvmsg() and mptcp_splice_read() to reduce redundant code. Suggested-by: Paolo Abeni Acked-by: Mat Martineau Signed-off-by: Geliang Tang Acked-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- To: Neal Cardwell To: Kuniyuki Iwashima To: David Ahern --- include/net/tcp.h | 8 ++++++++ net/ipv4/tcp.c | 9 ++------- net/mptcp/protocol.c | 11 +++-------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 565943c34b7e..6156d1d068e1 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -3077,4 +3077,12 @@ enum skb_drop_reason tcp_inbound_hash(struct sock *s= k, const void *saddr, const void *daddr, int family, int dif, int sdif); =20 +static inline int tcp_recv_should_stop(struct sock *sk) +{ + return sk->sk_err || + sk->sk_state =3D=3D TCP_CLOSE || + (sk->sk_shutdown & RCV_SHUTDOWN) || + signal_pending(current); +} + #endif /* _TCP_H */ diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index bd2c3c4587e1..e57eaffc007a 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -888,9 +888,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *pp= os, release_sock(sk); lock_sock(sk); =20 - if (sk->sk_err || sk->sk_state =3D=3D TCP_CLOSE || - (sk->sk_shutdown & RCV_SHUTDOWN) || - signal_pending(current)) + if (tcp_recv_should_stop(sk)) break; } =20 @@ -2755,10 +2753,7 @@ static int tcp_recvmsg_locked(struct sock *sk, struc= t msghdr *msg, size_t len, =20 if (copied) { if (!timeo || - sk->sk_err || - sk->sk_state =3D=3D TCP_CLOSE || - (sk->sk_shutdown & RCV_SHUTDOWN) || - signal_pending(current)) + tcp_recv_should_stop(sk)) break; } else { if (sock_flag(sk, SOCK_DONE)) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e21e416cd19a..2f4776a4f06a 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2333,11 +2333,8 @@ static int mptcp_recvmsg(struct sock *sk, struct msg= hdr *msg, size_t len, break; =20 if (copied) { - if (sk->sk_err || - sk->sk_state =3D=3D TCP_CLOSE || - (sk->sk_shutdown & RCV_SHUTDOWN) || - !timeo || - signal_pending(current)) + if (tcp_recv_should_stop(sk) || + !timeo) break; } else { if (sk->sk_err) { @@ -4520,9 +4517,7 @@ static ssize_t mptcp_splice_read(struct socket *sock,= loff_t *ppos, release_sock(sk); lock_sock(sk); =20 - if (sk->sk_err || sk->sk_state =3D=3D TCP_CLOSE || - (sk->sk_shutdown & RCV_SHUTDOWN) || - signal_pending(current)) + if (tcp_recv_should_stop(sk)) break; } =20 --=20 2.53.0