From nobody Sun Dec 14 06:34:30 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 14F65228C9D for ; Sat, 13 Dec 2025 06:39:58 +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=1765607998; cv=none; b=KWDIKQxRuQzPkltUW63zTrZt3d3pgCkoNP5dqWNep0Ai6NZdH2fEZJEz0BvyXfDGuTK0T3EcnzNQoY+UNfaj98UxJYhK80wnOEFgO9vKLc8BWX3jtJuDRA9XE4MEqZJf5fMx7ohGBX1s89jreGkQPE+cyNINnqu/6tUqvMQVN0M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765607998; c=relaxed/simple; bh=nzw4+5E+QO6hXCcbnRPjpLbcVxe1G6zWlRG3vS5J4qY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n0gEYXXtc55rXPwQt7WbrVgDbQrX1oPC9MELxq0nJsPkevWTqy2ELM1OGmhoiZyfKzD1AitF/CafLJWisFEnc7wDyq5XXAwuxlImeHLrxqSFE6xbq78OyXLmGFPx/AuCg2Q4X2U+l0gmlQv9ZMVf/lkWewHZwGHRzGB47hmq+6I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Pse6l+aU; 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="Pse6l+aU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 659FAC4CEF7; Sat, 13 Dec 2025 06:39:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765607997; bh=nzw4+5E+QO6hXCcbnRPjpLbcVxe1G6zWlRG3vS5J4qY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pse6l+aUxoatQDOr6Ew+CQkOSy2MtX2rMIbObue35aKJNWL3QcK3TrqSX4oB1eWS+ 1TTaguxHOM6dYBjRBKX/WIUQ0C8LIPFbdtC63G+XG81h0d7OPphH0ec1+h/FgnENbh 3xFNQOyLucNNMVLBb3pHgW71L+QlRNpLcTvobofiymfJ2/3CF+0OoqwZdk7AffO3ye NM3pGa3Uz3nc7EvjY0wc5Q7fSjLt/2OqwKZ07Tz2uPlU1Z29C5fLqe6Rc81qKeXSBj 8r0FV02Aoso21bPc9WKoYMS839QEADazG/GHy8+ppzrnNPv80wR40QP2dWhqGxc9Zv P7WWNnaR6uS7A== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Paolo Abeni , Mat Martineau Subject: [PATCH mptcp-next 1/3] tcp: add recv_should_stop helper Date: Sat, 13 Dec 2025 14:39:48 +0800 Message-ID: X-Mailer: git-send-email 2.51.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. Use this new helper in tcp_bpf_recvmsg_parser() to check whether to stop receiving. Suggested-by: Paolo Abeni Acked-by: Mat Martineau Signed-off-by: Geliang Tang --- include/net/tcp.h | 23 ++++++++++++++++++ net/ipv4/tcp.c | 58 +++++++++------------------------------------- net/ipv4/tcp_bpf.c | 22 ++++-------------- 3 files changed, 39 insertions(+), 64 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index f5f6119f7716..e22f9fcb145d 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -2953,4 +2953,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 sk->sk_err; + + 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 40ad9656dc9e..f67d5cab5c15 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -815,6 +815,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *pp= os, long timeo; ssize_t spliced; int ret; + int err; =20 sock_rps_record_flow(sk); /* @@ -835,24 +836,14 @@ 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 -ENETDOWN && err !=3D -ESHUTDOWN) + ret =3D err; break; } /* if __tcp_splice_read() got nothing while we have @@ -864,10 +855,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; @@ -878,9 +865,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 @@ -2724,39 +2709,18 @@ static int tcp_recvmsg_locked(struct sock *sk, stru= ct msghdr *msg, size_t len, break; =20 if (copied) { - if (!timeo || - 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; } else { - if (sock_flag(sk, SOCK_DONE)) - break; - if (sk->sk_err) { copied =3D sock_error(sk); break; } =20 - 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); + err =3D tcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (err !=3D -ENETDOWN && err !=3D -ESHUTDOWN) + copied =3D err; break; } } diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index a268e1595b22..314be75964fa 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c @@ -281,31 +281,19 @@ static int tcp_bpf_recvmsg_parser(struct sock *sk, if (!copied) { long timeo; int data; - - if (sock_flag(sk, SOCK_DONE)) - goto out; + int err; =20 if (sk->sk_err) { copied =3D sock_error(sk); goto out; } =20 - if (sk->sk_shutdown & RCV_SHUTDOWN) - goto out; - - if (sk->sk_state =3D=3D TCP_CLOSE) { - copied =3D -ENOTCONN; - goto out; - } - timeo =3D sock_rcvtimeo(sk, flags & MSG_DONTWAIT); - if (!timeo) { - copied =3D -EAGAIN; - goto out; - } =20 - if (signal_pending(current)) { - copied =3D sock_intr_errno(timeo); + err =3D tcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (err !=3D -ENETDOWN && err !=3D -ESHUTDOWN) + copied =3D err; goto out; } =20 --=20 2.51.0 From nobody Sun Dec 14 06:34:30 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 CD4B8228C9D for ; Sat, 13 Dec 2025 06:39:59 +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=1765608000; cv=none; b=BSy1RfthM7DIONpk6lWv+WFF2bh0+bkv0ikuvsCUJvD2mfHtgFs1dIcS8jzcpPS+UYo/Zpt5URdlaVyVtwu6YpgGZ3jryD1Ke40G2ogn94nlhPR6DHll69Syaab8STY8HLUrkcr5zGTGQF7SewouzPz922lvXE5KtWzPbC7DGCk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765608000; c=relaxed/simple; bh=CNQGwyZcMYb868VOo3LKjYGRiQrfNvLKvrUbT9olALI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=C0ZorZIwBanoDK54Nrpq6psN8fkZM1nVj1UrVRb2sp+c8lmIsvfeUihV70wWSd1KVJRLGkyaOBsxoWzfagQHF8QqlDCbvpBTU8P8LhTDusHuj1AQD0kf+gej3hzBNRhJPHADCN3gPno+mtWy3QAz4nmF5bfs6G0owT4dU9Y2Dtc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=S2UBf7zx; 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="S2UBf7zx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A91AC4CEF7; Sat, 13 Dec 2025 06:39:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765607999; bh=CNQGwyZcMYb868VOo3LKjYGRiQrfNvLKvrUbT9olALI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S2UBf7zxFOMNLKx26JKVQUYgj4JLEWgWqdcB//dfPoO112qvWrlh3jYP2YkV8bbrv L/DvnY3VcWZlPD2zM13G0N7AWwV8vHf+LdLId0cJzeS4Re85abOJ4cvD/mFUyBJXj8 DiwzFJsDam7+0lXzc0crm+g/qiPB3TC3HytnvxcTW6jJbPcoWka1rvQliO0rx3qMT8 0vippMPEBQpNy8D7+k1SMagvgUsRgPyYbFZGahGl4k94kn2gjtE+Vq/CoOEZg76H+X RFFhzqtbEpEXdttw+3+ujBRmljFLDZMUduq/td74cVRGg6QMZ05eW41e+2fppo9mSn icd9+fW5Ah8+w== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/3] mptcp: use recv_should_stop helper Date: Sat, 13 Dec 2025 14:39:49 +0800 Message-ID: <017e298d8b4788e4ec78ce7901d64ff9c1d71ce0.1765607485.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.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 Use the newly added tcp_recv_should_stop() helper in mptcp_recvmsg() and mptcp_splice_read() to check whether to stop receiving. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 52 ++++++++++---------------------------------- 1 file changed, 11 insertions(+), 41 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 334fdb10fdf3..dce7fcb05fc0 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2315,11 +2315,7 @@ 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) { @@ -2327,21 +2323,10 @@ static int mptcp_recvmsg(struct sock *sk, struct ms= ghdr *msg, size_t len, break; } =20 - if (sk->sk_shutdown & RCV_SHUTDOWN) - break; - - if (sk->sk_state =3D=3D TCP_CLOSE) { - copied =3D -ENOTCONN; - break; - } - - if (!timeo) { - copied =3D -EAGAIN; - break; - } - - if (signal_pending(current)) { - copied =3D sock_intr_errno(timeo); + err =3D tcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (err !=3D -ESHUTDOWN) + copied =3D err; break; } } @@ -4438,6 +4423,7 @@ static ssize_t mptcp_splice_read(struct socket *sock,= loff_t *ppos, ssize_t spliced =3D 0; int ret =3D 0; long timeo; + int err; =20 /* * We can't seek on a socket input @@ -4457,24 +4443,14 @@ static ssize_t mptcp_splice_read(struct socket *soc= k, 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 -ENETDOWN && err !=3D -ESHUTDOWN) + ret =3D err; break; } /* if __mptcp_splice_read() got nothing while we have @@ -4486,10 +4462,6 @@ static ssize_t mptcp_splice_read(struct socket *sock= , loff_t *ppos, 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; @@ -4500,9 +4472,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.51.0 From nobody Sun Dec 14 06:34:30 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 8CA7A228C9D for ; Sat, 13 Dec 2025 06:40:01 +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=1765608001; cv=none; b=K5p7cVMkoD5f5WdpU1jKQBwlARprJp22yzJvSuXZDpNqfir1F50okqAtN6XYkh//MnQ39BQ6xoJF9PD5feAK7aEs9a3r2N1HluBsesqomumwSLoafToKa5Hyc//oITMIxG58bYljWFwAjcc9r7IV3wTGo6GSlSlE6ni4Tc+VKNI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765608001; c=relaxed/simple; bh=8GzJj/JlQvJbLU8iEbNNEvqpXqOFZvGX5gDrw/RSTSY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I7pVm+11pyIoyFf5E/QjKaNOzt6AbZxAQZVa+/xXajtLCvR3BoO26wL0fyztfCLtLsUJizs4nICkgSTjYcFt46mDv0aqvHyet603FPaeMV2JfrHYav4EiInZLMGkSlRHX4Q96Ka67fNL7PHmtalNyFsgb1E8JkJyYf6dmRgIy78= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a51Nfebi; 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="a51Nfebi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 196A1C116B1; Sat, 13 Dec 2025 06:39:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765608001; bh=8GzJj/JlQvJbLU8iEbNNEvqpXqOFZvGX5gDrw/RSTSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a51NfebiufGAdjI24ywkQzj47Msl1nVB/4OybXY+mqesP+SpM2LdqB8spLvysv5YW S/aK3/C+LCv76L2rQswp+s6KpOBkzZljhR7TfyOoO7dsOQs8eeo6DeYRMGu84e5LcU TcHOCfRlPqHpNHn1vSZpklSsU6wVMhRgd0t2YMOVWQksqG9CIH7zckfJKWSZs0gWvS tZhOrQfiQMRPoZXIag2FkQtnvO1IEG4A+E8IBe42Q8ABSPsqlNXA3tawOWuk6VvxCx 15pj1Fm77RHiUI0EFt1eSFvYllPbxfdwjGJzRw5De2VGH/x7OUn+ruNjZJPKJTPQhd bNQzwbp/tBQfg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 3/3] tls: use recv_should_stop helper Date: Sat, 13 Dec 2025 14:39:50 +0800 Message-ID: <51351ea6098c066588dece8f33592073eb5f4e5b.1765607485.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.51.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 Use the newly added tcp_recv_should_stop() helper in tls_rx_rec_wait() to check whether to stop receiving. Signed-off-by: Geliang Tang --- net/tls/tls_sw.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 9937d4c810f2..26517c317ee7 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -1377,14 +1377,12 @@ tls_rx_rec_wait(struct sock *sk, struct sk_psock *p= sock, bool nonblock, break; } =20 - if (sk->sk_shutdown & RCV_SHUTDOWN) - return 0; - - if (sock_flag(sk, SOCK_DONE)) - return 0; - - if (!timeo) - return -EAGAIN; + ret =3D tcp_recv_should_stop(sk, timeo); + if (ret < 0) { + if (ret =3D=3D -ENETDOWN || ret =3D=3D -ESHUTDOWN) + ret =3D 0; + return ret; + } =20 released =3D true; add_wait_queue(sk_sleep(sk), &wait); @@ -1395,10 +1393,6 @@ tls_rx_rec_wait(struct sock *sk, struct sk_psock *ps= ock, bool nonblock, &wait); sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk); remove_wait_queue(sk_sleep(sk), &wait); - - /* Handle signals */ - if (signal_pending(current)) - return sock_intr_errno(timeo); } =20 if (unlikely(!tls_strp_msg_load(&ctx->strp, released))) --=20 2.51.0