From nobody Thu Nov 27 14:02:35 2025 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 2AFF12F531C for ; Mon, 24 Nov 2025 09:13:06 +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=1763975587; cv=none; b=FCL+DMk84ulW/oiLuddZgB22QfWHgJTD1P0hKRJ52Se5mYtNOFPt6eJVkfAM4jAE+9V2KjyWznAd3v3FVvZHDJd+CRDckgLYvbpLCmSbRr1ja+EtgI0raoi6UeW0SNZ9bK1R9AqejMxSqCejlMCMxYBxgEnsNd85wFc2SEp2ON0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763975587; c=relaxed/simple; bh=ssv3JcOqjvqatsXN5b9vlm4K3B9pTJKKzeVyU/PlFx0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aUZ9cADyNYGOJRKWsfFTIta/lrOKAn7SvoKuIZZXPhMsARidfoGN/TWQNSrKKp4gF3VrnUPU/wWVxfNa3xINYoABYC2mOwZzUjYr6mly1GTFe/AY1qt1N3IU0ceUqv51bBoiOB1iSt2KA49ILKmHduKcGyF7h4WPnwdWk+0bvb0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rHx24Pon; 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="rHx24Pon" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 533ABC4CEF1; Mon, 24 Nov 2025 09:13:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763975586; bh=ssv3JcOqjvqatsXN5b9vlm4K3B9pTJKKzeVyU/PlFx0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rHx24PonS9ZUoXYJ3S8EH/R4XpmJTBvY2Yllw/QuV5OdWLPb3L3pMxhSGNFYgTUJn egjU1IqpNQDkdiv06DPTzA0+//Ryitjl6CWkHGrNob19wY5R5vr04nRBKPRFzKThER rV0Pm5eZNnxd/3TAwCFkGDaifl9f3mCviEyGV0taI9XukilI7B7At2hDg57IrP6pX7 yBM+I04QrweyzomfJtqNAqcuVriJMRC91Y7SfuB68aPEGd+OskqMkcU9Qno/LjUIjz gfFzmXzk/FWszW8umsJ506gxO6xWjvy0cRDI53ej7DmN8rQ25e7WA1DOaSGrHz3H3X OtjjDr/XJaFkw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Paolo Abeni Subject: [PATCH mptcp-next v14 3/8] tcp: add recv_should_stop helper Date: Mon, 24 Nov 2025 17:12:48 +0800 Message-ID: <67d9afa587bcd654db6e63350d9cba395d7778fd.1763974740.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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. It will be used for MPTCP too. Suggested-by: Paolo Abeni Signed-off-by: Geliang Tang --- include/net/tcp.h | 23 +++++++++++++++ net/ipv4/tcp.c | 73 ++++++++--------------------------------------- 2 files changed, 35 insertions(+), 61 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 0deb5e9dd911..94a50a9daf65 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -2942,4 +2942,27 @@ 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, long timeo) +{ + if (sock_flag(sk, SOCK_DONE)) + return -ENETDOWN; + + if (sk->sk_err) + return sock_error(sk); + + if (sk->sk_shutdown & RCV_SHUTDOWN) + return -ESHUTDOWN; + + if (sk->sk_state =3D=3D TCP_CLOSE) + return -ENOTCONN; + + if (!timeo) + return -EAGAIN; + + if (signal_pending(current)) + return sock_intr_errno(timeo); + + return 0; +} + #endif /* _TCP_H */ diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 5265a9453814..8b4917a7f262 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -842,26 +842,14 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *= ppos, if (ret < 0) break; else if (!ret) { + int err; + if (spliced) break; - if (sock_flag(sk, SOCK_DONE)) - break; - if (sk->sk_err) { - ret =3D sock_error(sk); - break; - } - if (sk->sk_shutdown & RCV_SHUTDOWN) - break; - if (sk->sk_state =3D=3D TCP_CLOSE) { - /* - * This occurs when user tries to read - * from never connected socket. - */ - ret =3D -ENOTCONN; - break; - } - if (!timeo) { - ret =3D -EAGAIN; + err =3D tcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (err !=3D -ENETDOWN && err !=3D -ESHUTDOWN) + ret =3D err; break; } /* if __tcp_splice_read() got nothing while we have @@ -873,10 +861,6 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *p= pos, ret =3D sk_wait_data(sk, &timeo, NULL); if (ret < 0) break; - if (signal_pending(current)) { - ret =3D sock_intr_errno(timeo); - break; - } continue; } tss.len -=3D ret; @@ -887,9 +871,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, timeo)) break; } =20 @@ -2732,42 +2714,11 @@ static int tcp_recvmsg_locked(struct sock *sk, stru= ct msghdr *msg, size_t len, if (copied >=3D target && !READ_ONCE(sk->sk_backlog.tail)) break; =20 - if (copied) { - if (!timeo || - sk->sk_err || - sk->sk_state =3D=3D TCP_CLOSE || - (sk->sk_shutdown & RCV_SHUTDOWN) || - signal_pending(current)) - break; - } else { - if (sock_flag(sk, SOCK_DONE)) - break; - - if (sk->sk_err) { - copied =3D sock_error(sk); - break; - } - - if (sk->sk_shutdown & RCV_SHUTDOWN) - break; - - if (sk->sk_state =3D=3D TCP_CLOSE) { - /* This occurs when user tries to read - * from never connected socket. - */ - copied =3D -ENOTCONN; - break; - } - - if (!timeo) { - copied =3D -EAGAIN; - break; - } - - if (signal_pending(current)) { - copied =3D sock_intr_errno(timeo); - break; - } + err =3D tcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (!copied && err !=3D -ENETDOWN && err !=3D -ESHUTDOWN) + copied =3D err; + break; } =20 if (copied >=3D target) { --=20 2.43.0