From nobody Wed Sep 17 18:16:52 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 C8BE72D4B4E for ; Thu, 10 Jul 2025 09:52:13 +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=1752141133; cv=none; b=N3qBx+wIgU89IA1AFwxi4eKrgwj+tufRhfI6rancUGEudb9J+JzVxB0y2M8LYh2RPdhrxY0ftzNnmFO3hb1jbqBokjj37mWFX/WQufBvUXjjn85ZziLewft5OUduIkexgMrIs2K7EXkUsSRYkKMHdCQ5wTxyiI6n1vHHvTnnSrU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752141133; c=relaxed/simple; bh=hKYATRhEwpt2FDQ8uvhI1Y2DaT8p5gnvCErM9U4drQg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=D/d2HijJDMseQw0uMT96DcY+TO/sevqr7xkvjP/vMzuRSV4sASv5gHtPb9yyj2eQecse2Bq9LeWnTkCNcJRa4VecxBCOm6n56hH8OU5lrRpN9atD73Quh38uMpaNebCFvp9oAM3moB9sfO1pXEru1THUEW/v0Jtc17Z9vlBZhiM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=n3cHqj54; 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="n3cHqj54" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E8CFC4CEF5; Thu, 10 Jul 2025 09:52:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752141133; bh=hKYATRhEwpt2FDQ8uvhI1Y2DaT8p5gnvCErM9U4drQg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n3cHqj54vb9b33hja71aa6lUDGJ72TfthuANHRijSJ6Hf3EbujBfqc7CD25TNfm58 gIU7RmbMbNYch4CCouWInGb/XClhPxZkMrQ02hjjxCMNtj42PkCgUbi/8kg3zZGfwQ onUX6GRTaxUYzUZ9ErCJbNz4FpQQ6dUXjy6imF51dmzVs7PNC5jzStGk8N8+rCgH+h wZh8hu5uYLTueebe1ryYRDG9EALv+zFm0WhO0+HuQ1m0bN6tq+9G3y8r0KtcP/+9bj 0cmEPyAqFMP+K7MC4sRWAaGKLocPUj4v4hLkz4BGCs/fmF0JS7LyD10zVCC5pzNSe3 47OrVbrCbkgbQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 1/2] Squash to "mptcp: add recv_should_stop helper" Date: Thu, 10 Jul 2025 17:52:05 +0800 Message-ID: <7e1e06155567ebe1ed3eadcca86cf529a4cac224.1752141057.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 | 54 +++++++++----------------------- 3 files changed, 49 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..caeb48823058 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,23 @@ 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; + } + + if (err !=3D -ENETDOWN) + copied =3D err; + break; } =20 pr_debug("block timeout %ld\n", timeo); --=20 2.48.1 From nobody Wed Sep 17 18:16:52 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 AA0592D5419 for ; Thu, 10 Jul 2025 09:52:15 +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=1752141135; cv=none; b=mKr0sQP5xbG38UywXDGwyZ9csCqdwzJN8euczJ+wgOaICkTJvMaK+LQfpLW2Hij13JIsxJ55bDAQh1gNqDBhKFh98XzKRnuVHuriVthCcLKGUTZ/+sHxvAxCbUFH91szuVmzdpeiTC73Gk7puzQXoTBaat1ItIx8fS3Ap7BoE9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752141135; c=relaxed/simple; bh=3ZlBrrizABMdX3hX5BaseCpXr3luWaS0GyULf9eidGY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YKHxqGnf6HfuEci9TSa2xZsUhIaMjpN/Xu7X2p2IgCenMK7k7CQy39tZpDQo/af9zQbGDbmfVBE6buYUoDrV8xWKC3DkUsqaaR5fUtAtXlqMQk06IFpTXd0zDy3IwlUDkqjBzvtb3ySiyEkM3MRzOcceeqgogyY31mtMN3ywANI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JYiYQpLB; 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="JYiYQpLB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44E52C4CEF6; Thu, 10 Jul 2025 09:52:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752141135; bh=3ZlBrrizABMdX3hX5BaseCpXr3luWaS0GyULf9eidGY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JYiYQpLB++8m6E5L119FqxuPzbx9bPBHRUq2PsmwQv81apAxIPNFV3xt6rGZaRULW 4VEbrY6s9moMkAupepfkAjmMP6gahC28rOjD02cj5D+0t/ApfnC4TXZ7cr1H/iVZ33 Oqq6fq2Ea982a7kJ46+p2iR8d/MMoMAFWPOQtr0gU1gwPx5BXKMErOFdtgVKdNzaGP wr7oWMGq86cyDQb/vdASQJ+fls3YQ7ExhGv+zL8xl2RgsU96rXbaymkadHCuZEKVh3 smOYOB3TUyLWDHST3LR1sKBfsUqoLxg8KaE8kUnhA5R3egZvDHkddK4c7ezh7C25KH 1+ABi4OImx11Q== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 2/2] Squash to "mptcp: implement .splice_read" Date: Thu, 10 Jul 2025 17:52:06 +0800 Message-ID: <1fbba8a517aeb941fc9ffdc84469db65cca737c0.1752141057.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 Update the parameter of mptcp_recv_should_stop. Use mptcp_recv_should_stop at the end of the main loop too. Rename to tcp_recv_should_stop. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index caeb48823058..bcae97b48b4b 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4037,10 +4037,9 @@ static ssize_t mptcp_splice_read(struct socket *sock= , loff_t *ppos, .flags =3D flags, }; struct sock *sk =3D sock->sk; - int shutdown =3D -1; ssize_t spliced; + int ret, err; long timeo; - int ret; =20 /* * We can't seek on a socket input @@ -4063,11 +4062,17 @@ static ssize_t mptcp_splice_read(struct socket *soc= k, loff_t *ppos, break; if (sock_flag(sk, SOCK_DONE)) break; - ret =3D mptcp_recv_should_stop(sk, timeo, &shutdown); - if (ret < 0 || shutdown =3D=3D 1) + err =3D tcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (err =3D=3D -ESHUTDOWN) { + if (__mptcp_move_skbs(sk)) + continue; + break; + } + if (err !=3D -ENETDOWN) + ret =3D err; break; - if (shutdown =3D=3D 0) - continue; + } /* if __mptcp_splice_read() got nothing while we have * an skb in receive queue, we do not want to loop. * This might happen with URG data. @@ -4087,9 +4092,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, timeo)) break; } =20 --=20 2.48.1