From: Geliang Tang <geliang@kernel.org>
To: mptcp@lists.linux.dev, hare@kernel.org
Cc: Geliang Tang <tanggeliang@kylinos.cn>, Paolo Abeni <pabeni@redhat.com>
Subject: [PATCH mptcp-next v13 3/8] tcp: add recv_should_stop helper
Date: Thu, 23 Oct 2025 13:56:46 +0800 [thread overview]
Message-ID: <e4fbd8d1cdae3039d348539ef12466f1080cea2a.1761198660.git.geliang@kernel.org> (raw)
In-Reply-To: <cover.1761198660.git.geliang@kernel.org>
From: Geliang Tang <tanggeliang@kylinos.cn>
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 <pabeni@redhat.com>
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
---
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 190b3714e93b..4492397a5377 100644
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -2935,4 +2935,27 @@ enum skb_drop_reason tcp_inbound_hash(struct sock *sk,
const void *saddr, const void *daddr,
int family, int dif, int sdif);
+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 == 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 adc9edd2e9bb..c5653daa2201 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 = sock_error(sk);
- break;
- }
- if (sk->sk_shutdown & RCV_SHUTDOWN)
- break;
- if (sk->sk_state == TCP_CLOSE) {
- /*
- * This occurs when user tries to read
- * from never connected socket.
- */
- ret = -ENOTCONN;
- break;
- }
- if (!timeo) {
- ret = -EAGAIN;
+ err = tcp_recv_should_stop(sk, timeo);
+ if (err < 0) {
+ if (err != -ENETDOWN && err != -ESHUTDOWN)
+ ret = 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 *ppos,
ret = sk_wait_data(sk, &timeo, NULL);
if (ret < 0)
break;
- if (signal_pending(current)) {
- ret = sock_intr_errno(timeo);
- break;
- }
continue;
}
tss.len -= ret;
@@ -887,9 +871,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *ppos,
release_sock(sk);
lock_sock(sk);
- if (sk->sk_err || sk->sk_state == TCP_CLOSE ||
- (sk->sk_shutdown & RCV_SHUTDOWN) ||
- signal_pending(current))
+ if (tcp_recv_should_stop(sk, timeo))
break;
}
@@ -2730,42 +2712,11 @@ static int tcp_recvmsg_locked(struct sock *sk, struct msghdr *msg, size_t len,
if (copied >= target && !READ_ONCE(sk->sk_backlog.tail))
break;
- if (copied) {
- if (!timeo ||
- sk->sk_err ||
- sk->sk_state == TCP_CLOSE ||
- (sk->sk_shutdown & RCV_SHUTDOWN) ||
- signal_pending(current))
- break;
- } else {
- if (sock_flag(sk, SOCK_DONE))
- break;
-
- if (sk->sk_err) {
- copied = sock_error(sk);
- break;
- }
-
- if (sk->sk_shutdown & RCV_SHUTDOWN)
- break;
-
- if (sk->sk_state == TCP_CLOSE) {
- /* This occurs when user tries to read
- * from never connected socket.
- */
- copied = -ENOTCONN;
- break;
- }
-
- if (!timeo) {
- copied = -EAGAIN;
- break;
- }
-
- if (signal_pending(current)) {
- copied = sock_intr_errno(timeo);
- break;
- }
+ err = tcp_recv_should_stop(sk, timeo);
+ if (err < 0) {
+ if (!copied && err != -ENETDOWN && err != -ESHUTDOWN)
+ copied = err;
+ break;
}
if (copied >= target) {
--
2.43.0
next prev parent reply other threads:[~2025-10-23 5:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-23 5:56 [PATCH mptcp-next v13 0/8] implement mptcp read_sock Geliang Tang
2025-10-23 5:56 ` [PATCH mptcp-next v13 1/8] mptcp: add eat_recv_skb helper Geliang Tang
2025-10-23 5:56 ` [PATCH mptcp-next v13 2/8] mptcp: implement .read_sock Geliang Tang
2025-10-23 5:56 ` Geliang Tang [this message]
2025-10-23 5:56 ` [PATCH mptcp-next v13 4/8] mptcp: use recv_should_stop helper Geliang Tang
2025-10-23 5:56 ` [PATCH mptcp-next v13 5/8] tcp: export tcp_splice_state Geliang Tang
2025-10-23 5:56 ` [PATCH mptcp-next v13 6/8] mptcp: implement .splice_read Geliang Tang
2025-10-23 5:56 ` [PATCH mptcp-next v13 7/8] selftests: mptcp: add splice io mode Geliang Tang
2025-10-23 5:56 ` [PATCH mptcp-next v13 8/8] selftests: mptcp: connect: cover splice mode Geliang Tang
2025-10-23 7:54 ` [PATCH mptcp-next v13 0/8] implement mptcp read_sock MPTCP CI
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e4fbd8d1cdae3039d348539ef12466f1080cea2a.1761198660.git.geliang@kernel.org \
--to=geliang@kernel.org \
--cc=hare@kernel.org \
--cc=mptcp@lists.linux.dev \
--cc=pabeni@redhat.com \
--cc=tanggeliang@kylinos.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox