From nobody Wed Sep 17 19:38:04 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 BFFAB5227 for ; Fri, 11 Jul 2025 01:36:16 +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=1752197776; cv=none; b=eV1oNrnJCtBAwuwULp7+M9KfirsDDz1vLubhJcPHTEdZfMKqsQRSWc4upSNdnmMwKKptuDk6vhcAjPpWx0BsLUelBZPmPQg1D8N0u1IjQqFLRZZ/2AQqasaIZTa48bw/sPf64AH19eGX/F5VfMRwsW5runbObNHdVVhZjj5HEQA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752197776; c=relaxed/simple; bh=FE/6mo9xEEFRZzzT+vw1SlTsa7EVsrg8vdA2ZsotPEU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R85mhTQ76/UeomBzmLLoXrJ67BefQQE3xjqgwyAsMeZqCJFrS1G1aSItZIMD+qNm5Swvo51ZoRp7kCChkRIFWA3dp7jxC7RD+7RLgKkjrvzKMAiKC5ubV/EMSDadMGN3OmbD/zUN1jx9quX5RIkpfUwuEmqoWk6YVF9cDHuAH3Y= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DabClZOl; 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="DabClZOl" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9AC5BC4CEF4; Fri, 11 Jul 2025 01:36:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752197776; bh=FE/6mo9xEEFRZzzT+vw1SlTsa7EVsrg8vdA2ZsotPEU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DabClZOlFbdACMkW5kEFu+NYbiyFCnarZX1Pbn3LeDDnWLD1HDRrDXiOnJO+JjE1i VT5g/WFR77CebisQxgs0yLyHOuBqncS36dC2eF8ht2W/M002h0qzejoe98db8nqqFX XYRoroJDmSDp0NF85Zo8TiqMbO3LYkmximZB7e3PClRXxHx4jS13MF9GVMn1upKZfL 0FzukmwLt5ifempQ3vtU78Gn5Eepc9YOw+tlv01yfH4zIOkbhyehVJ+ii2mAMmdy52 Ok3qzrhmRq9A67p135wkXy0UOdiVA8vccOF4wUj2I3+GmbSPInSY0JVWlFLGLE+d7t ampdR/3oHgGeA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 1/2] Squash to "mptcp: add recv_should_stop helper" Date: Fri, 11 Jul 2025 09:36:05 +0800 Message-ID: <782e65ce91f13786c11954cf5b69c481f193c44e.1752197546.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.48.1 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 tcp: add recv_should_stop helper Drop "shutdown" parameter of mptcp_recv_should_stop. Use mptcp_recv_should_stop for "if (copied)" case too. Rename this helper as tcp_recv_should_stop using for both TCP and MPTCP. Signed-off-by: Geliang Tang --- include/net/tcp.h | 23 ++++++++++++++ net/ipv4/tcp.c | 73 +++++++------------------------------------- net/mptcp/protocol.c | 53 +++++++++----------------------- 3 files changed, 48 insertions(+), 101 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 338b97a91278..bb1628c0b070 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -270,6 +270,29 @@ struct tcp_splice_state { int tcp_splice_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, unsigned int offset, size_t len); =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; +} + =20 /* sysctl variables for tcp */ extern int sysctl_tcp_max_orphans; diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 75d4b4ddab8e..35aed2af1e34 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -796,7 +796,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *pp= os, }; long timeo; ssize_t spliced; - int ret; + int ret, err; =20 sock_rps_record_flow(sk); /* @@ -817,24 +817,10 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *= ppos, else if (!ret) { 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 -ESHUTDOWN && err !=3D -ENETDOWN) + ret =3D err; break; } /* if __tcp_splice_read() got nothing while we have @@ -846,10 +832,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; @@ -860,9 +842,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 @@ -2699,42 +2679,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 -ESHUTDOWN && err !=3D -ENETDOWN) + copied =3D err; + break; } =20 if (copied >=3D target) { diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 6b3be1d0668d..5dc3716daab5 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2090,40 +2090,12 @@ static unsigned int mptcp_inq_hint(const struct soc= k *sk) return 0; } =20 -static int mptcp_recv_should_stop(struct sock *sk, long timeo, int *shutdo= wn) -{ - if (sk->sk_err) - return sock_error(sk); - - if (sk->sk_shutdown & RCV_SHUTDOWN) { - *shutdown =3D 1; - /* race breaker: the shutdown could be after the - * previous receive queue check - */ - if (__mptcp_move_skbs(sk)) - *shutdown =3D 0; - return 0; - } - - 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; -} - static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int flags, int *addr_len) { struct mptcp_sock *msk =3D mptcp_sk(sk); struct scm_timestamping_internal tss; int copied =3D 0, cmsg_flags =3D 0; - int shutdown =3D -1; int target; long timeo; =20 @@ -2166,19 +2138,22 @@ static int mptcp_recvmsg(struct sock *sk, struct ms= ghdr *msg, size_t len, if (copied >=3D target) break; =20 - if (copied) { - if (sk->sk_err || - sk->sk_state =3D=3D TCP_CLOSE || - (sk->sk_shutdown & RCV_SHUTDOWN) || - !timeo || - signal_pending(current)) + err =3D tcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (copied) break; - } else { - copied =3D mptcp_recv_should_stop(sk, timeo, &shutdown); - if (copied < 0 || shutdown =3D=3D 1) + + if (err =3D=3D -ESHUTDOWN) { + /* race breaker: the shutdown could be after the + * previous receive queue check + */ + if (__mptcp_move_skbs(sk)) + continue; break; - if (shutdown =3D=3D 0) - continue; + } + + copied =3D err; + break; } =20 pr_debug("block timeout %ld\n", timeo); --=20 2.48.1