From nobody Sun Feb 8 16:06:22 2026 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 A224131B131; Thu, 29 Jan 2026 19:23:54 +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=1769714634; cv=none; b=SyyO5rM28nj+aBROxA+RkW3f+2giJJG1ycZ+HVvCwo3QgVsCO4p45VjHhIP1JczB8ow2E3h7E1RiXvkkbna/WvCnaAfX9LE9RciBvf28HN9z5mym4hIGr/sDTzmGWqC//zvHCG0MGsc919HIyFW4jyiKImPxScTZ7gRHmYk4uhM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769714634; c=relaxed/simple; bh=9g6BefChnzYyfvDQL2j81TNqLZApmbITYFTvJoYgiNo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TRYhxGysUSdY0oDfSivLE86h4k+i+mP+B/QRhaP6HsyBfjiXaC5p7zmWry7BOgo9ok69ij2R+ZKXRIcLX5zpaoaSxZ4IFsmH+3MuiXY91lyHXlLqDxxzXsYRKmLEytF9GncoAXsilsanuutT6kVi/17OtZPKiBFO0dDVF3QFZiE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=t1MvztWD; 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="t1MvztWD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ED065C2BC87; Thu, 29 Jan 2026 19:23:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769714634; bh=9g6BefChnzYyfvDQL2j81TNqLZApmbITYFTvJoYgiNo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=t1MvztWDZL4DGKiVATl5DkuMlzjyavT7r7QjU2uFpaCVxUYVbGgGjAc3Ux7DOKEvN wbtXh1szn6lhur9tieuJ6audbQ5z4F0R3bmggaTrvMWZY+SdmJYxFsqi2y1xvx+8V0 zoohUyzMabcy2dtuk20v81tPRqSZEbV/Uzz09HVcXJlVNizK9w9ty6Ulk8F8XCEOUw V2Ajk0n1fpAkx/359AO1GJmr6KKtJuMQUFXLuZYo11cs7Cl8D74X8g5JO42g6SwlmJ FBh7xbhuZTgBPK2vRSKMWF6fVYksn75jnwd/wNXvbdjnOrUvl9GP4EQDPnRzdcogNW z8if38LIQE3dA== From: "Matthieu Baerts (NGI0)" Date: Thu, 29 Jan 2026 20:23:34 +0100 Subject: [PATCH net-next 1/6] mptcp: add eat_recv_skb helper Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260129-net-next-mptcp-splice-v1-1-994cac40daa0@kernel.org> References: <20260129-net-next-mptcp-splice-v1-0-994cac40daa0@kernel.org> In-Reply-To: <20260129-net-next-mptcp-splice-v1-0-994cac40daa0@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Shuah Khan Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1793; i=matttbe@kernel.org; h=from:subject:message-id; bh=EyBVwfWPEwe81zm6wQn9WT3j88WpSp4AB+CSv6QkeK0=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDKrNx98btl8U93/rhvPwgWHLqi8fiBc5nRyg27rsX0TH e7cnLMkoqOUhUGMi0FWTJFFui0yf+bzKt4SLz8LmDmsTCBDGLg4BWAiO34yMryPC2R54X//Ycch +d9c07alMW1feu7lu4yvdknvJLe33PZg+O97tWfmlhaNNe+bDvx87rSwY2Mgh0Si3wQfnRutOzu +nOEBAA== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang This patch extracts the free skb related code in __mptcp_recvmsg_mskq() into a new helper mptcp_eat_recv_skb(). This new helper will be used in the next patch. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index f505b780f713..80f37220ef0c 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1994,6 +1994,17 @@ static int mptcp_sendmsg(struct sock *sk, struct msg= hdr *msg, size_t len) =20 static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied); =20 +static void mptcp_eat_recv_skb(struct sock *sk, struct sk_buff *skb) +{ + /* avoid the indirect call, we know the destructor is sock_rfree */ + skb->destructor =3D NULL; + skb->sk =3D NULL; + atomic_sub(skb->truesize, &sk->sk_rmem_alloc); + sk_mem_uncharge(sk, skb->truesize); + __skb_unlink(skb, &sk->sk_receive_queue); + skb_attempt_defer_free(skb); +} + static int __mptcp_recvmsg_mskq(struct sock *sk, struct msghdr *msg, size_t len, int flags, int copied_total, struct scm_timestamping_internal *tss, @@ -2048,13 +2059,7 @@ static int __mptcp_recvmsg_mskq(struct sock *sk, str= uct msghdr *msg, break; } =20 - /* avoid the indirect call, we know the destructor is sock_rfree */ - skb->destructor =3D NULL; - skb->sk =3D NULL; - atomic_sub(skb->truesize, &sk->sk_rmem_alloc); - sk_mem_uncharge(sk, skb->truesize); - __skb_unlink(skb, &sk->sk_receive_queue); - skb_attempt_defer_free(skb); + mptcp_eat_recv_skb(sk, skb); } =20 if (copied >=3D len) --=20 2.51.0 From nobody Sun Feb 8 16:06:22 2026 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 DECED31D39F; Thu, 29 Jan 2026 19:23:57 +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=1769714637; cv=none; b=Ba4k/yw1zWIMvSLz6FB7Aq038xazvxHT2bMpA0ehB2vrcxYJ+NDdDL/f1KFMuqHEI4WjMpfD8bxXhL6QA4tPripB471BaqrQ8UQV+jWRG82ZVh4IOfRTB33lTJU8h6a8wfQHgFmrMTNeghOwYflG2QsoZ4yLdod+3UGkhSZvxZE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769714637; c=relaxed/simple; bh=eYBDsyJmB6j9pEkaHZ+2ZtIkwz1/CVg+my0AG9MLd4A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uCJXBjMvd7sB7PEgcjDrZH+EsVUyDMaNe/DL+tTIqMktTzX1op4UGpOQyrwowYBl1D0/0xRJw/gj6ZPLdnMtjYq9rxwfP/smICVANa2Jili5BYMUq29OyCrcnDcSoA/nuLZMm1zppIS/ZMOIF56GEOa2r0iQDJETAJopVVcDPng= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=t6W8I7+2; 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="t6W8I7+2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C15F8C2BC87; Thu, 29 Jan 2026 19:23:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769714637; bh=eYBDsyJmB6j9pEkaHZ+2ZtIkwz1/CVg+my0AG9MLd4A=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=t6W8I7+23Hd3yol/qp7sB7sS0mMdhwDUtJJS3XW6m3BC7iX6/bYPWaLkMYlgOHIgd xrIABM4mm8EMACn+E/utBRh/Dg3yZ827KyqNcl+OoZJ0IlfUMGFMj/muyxsSc+pLwN LEGT8Pwqi7VO2ofswNOJpoafFn1P8zH4Xc1X9BCzI98Dw9Xu38E6ziYStX+Se0mYaq um5e25uJfUaTy99cA4m8e7YnlBM7uHmD5R2VfxNiFN5a5GlxCgB+7UG2FAf/UCuy4t wdvwYpoJuG5CYe86o/7XJswjScissme71NbD+pKvKPb769WJpw2Ar7DoDi/hrOmiIA AOUH7YZFSw+PQ== From: "Matthieu Baerts (NGI0)" Date: Thu, 29 Jan 2026 20:23:35 +0100 Subject: [PATCH net-next 2/6] mptcp: implement .read_sock Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260129-net-next-mptcp-splice-v1-2-994cac40daa0@kernel.org> References: <20260129-net-next-mptcp-splice-v1-0-994cac40daa0@kernel.org> In-Reply-To: <20260129-net-next-mptcp-splice-v1-0-994cac40daa0@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Shuah Khan Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , Hannes Reinecke , Geliang Tang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=3705; i=matttbe@kernel.org; h=from:subject:message-id; bh=ZDGtaKUBriS4QMep24PHEfzUNFarX+TBum4YVF044uY=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDKrNx8MUjtXfYwtrqymYGbc/ceSzV2LWWZ+nKQeEq9ne eGH2ImujlIWBjEuBlkxRRbptsj8mc+reEu8/Cxg5rAygQxh4OIUgIl80WRkmDXva96O95tnelww e35OPupL5ctfJY3LRL7n7rHpmBn57QHDPyOuvyHiFc1VCx70zpufH/rQdI7LHKEX2aeZL97J2Dg /lxkA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang Current in-kernel TCP sockets -- i.e. from nvme_tcp_try_recv() -- need to call .read_sock interface of struct proto_ops, but it's not implemented in MPTCP. This patch implements it with reference to __tcp_read_sock() and __mptcp_recvmsg_mskq(). Corresponding to tcp_recv_skb(), a new helper for MPTCP named mptcp_recv_skb() is added to peek a skb from sk->sk_receive_queue. Compared with __mptcp_recvmsg_mskq(), mptcp_read_sock() uses sk->sk_rcvbuf as the max read length. The LISTEN status is checked before the while loop, and mptcp_recv_skb() and mptcp_cleanup_rbuf() are invoked after the loop. In the loop, all flags checks for __mptcp_recvmsg_mskq() are removed. Reviewed-by: Hannes Reinecke Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 82 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 80f37220ef0c..c58e306ec3ef 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4316,6 +4316,86 @@ static __poll_t mptcp_poll(struct file *file, struct= socket *sock, return mask; } =20 +static struct sk_buff *mptcp_recv_skb(struct sock *sk, u32 *off) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct sk_buff *skb; + u32 offset; + + if (!list_empty(&msk->backlog_list)) + mptcp_move_skbs(sk); + + while ((skb =3D skb_peek(&sk->sk_receive_queue)) !=3D NULL) { + offset =3D MPTCP_SKB_CB(skb)->offset; + if (offset < skb->len) { + *off =3D offset; + return skb; + } + mptcp_eat_recv_skb(sk, skb); + } + return NULL; +} + +/* + * Note: + * - It is assumed that the socket was locked by the caller. + */ +static int __mptcp_read_sock(struct sock *sk, read_descriptor_t *desc, + sk_read_actor_t recv_actor, bool noack) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + struct sk_buff *skb; + int copied =3D 0; + u32 offset; + + msk_owned_by_me(msk); + + if (sk->sk_state =3D=3D TCP_LISTEN) + return -ENOTCONN; + while ((skb =3D mptcp_recv_skb(sk, &offset)) !=3D NULL) { + u32 data_len =3D skb->len - offset; + int count; + u32 size; + + size =3D min_t(size_t, data_len, INT_MAX); + count =3D recv_actor(desc, skb, offset, size); + if (count <=3D 0) { + if (!copied) + copied =3D count; + break; + } + + copied +=3D count; + + msk->bytes_consumed +=3D count; + if (count < data_len) { + MPTCP_SKB_CB(skb)->offset +=3D count; + MPTCP_SKB_CB(skb)->map_seq +=3D count; + break; + } + + mptcp_eat_recv_skb(sk, skb); + } + + if (noack) + goto out; + + mptcp_rcv_space_adjust(msk, copied); + + if (copied > 0) { + mptcp_recv_skb(sk, &offset); + mptcp_cleanup_rbuf(msk, copied); + } +out: + return copied; +} + +static int mptcp_read_sock(struct sock *sk, read_descriptor_t *desc, + sk_read_actor_t recv_actor) +{ + return __mptcp_read_sock(sk, desc, recv_actor, false); +} + static const struct proto_ops mptcp_stream_ops =3D { .family =3D PF_INET, .owner =3D THIS_MODULE, @@ -4336,6 +4416,7 @@ static const struct proto_ops mptcp_stream_ops =3D { .recvmsg =3D inet_recvmsg, .mmap =3D sock_no_mmap, .set_rcvlowat =3D mptcp_set_rcvlowat, + .read_sock =3D mptcp_read_sock, }; =20 static struct inet_protosw mptcp_protosw =3D { @@ -4440,6 +4521,7 @@ static const struct proto_ops mptcp_v6_stream_ops =3D= { .compat_ioctl =3D inet6_compat_ioctl, #endif .set_rcvlowat =3D mptcp_set_rcvlowat, + .read_sock =3D mptcp_read_sock, }; =20 static struct proto mptcp_v6_prot; --=20 2.51.0 From nobody Sun Feb 8 16:06:22 2026 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 83E8F32471A; Thu, 29 Jan 2026 19:24:00 +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=1769714642; cv=none; b=bJvNc2/2IupGH2yNI+wDmWgIsZa4pxjr57/bD+dz9dJgzye+B6nBdxBJN2lSMTGzMdIKubnYFBKphRxTfMwuEp50yvIWab8Q3rwaAY0iXw1g8sLC/6+F++YLuqKd/lksm+i5aFyzoeEHxpHm9CVj4xcZYV0x3RuCuSK7bvrJ3Ws= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769714642; c=relaxed/simple; bh=5pXsZ1+bdcl0+5ekJkKvICgBbW8Fn1J1qfigEm+sIpQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=GtISvvJaQGUS3176ahixpcXJDKwgPmZWIZ2ztyEQlso1WmlM4hzfQCxoe5BwuIKYB5r2PtTanLnqNYLcyKEM8cjKbtmUVvmgnh+NmB81he3sm5bfUN9nxn/aX/FxDbx+tQN+kjdR83C1V6CWmDOr5XE4/DOqGFPZSRUIPk8pJQI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eyCDgmFs; 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="eyCDgmFs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7B91C2BC86; Thu, 29 Jan 2026 19:23:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769714640; bh=5pXsZ1+bdcl0+5ekJkKvICgBbW8Fn1J1qfigEm+sIpQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=eyCDgmFskEs8TLZcnVdkB0SWuu7iFTRnF/KeXF6dfEdicQAFGOQEHFsWKNELAEuEJ yT0rft9c92//i7t/yOugLElCbTxu2bbBQjKUg1M3FWZ2vcgAVMb8LvGEOeMXk4Srxb 9DvCyc+EW/Aw2LjmhATVdxZIidz588P6HP7DK7gHlwNxDbyumduEs0RCG5auGgVP78 MthL3fJagCwHZZkyXmi6LX+lZPBIE+izrGyMV2EIEuO2nnud6leAvy4Rgv0Ljd8bvN 7CsiDokfZ+8of8vYDrI131Ff9BW92MqFrKWrToN9r1GydK8dwfgEL/yTz5pqfAF5RW uPgUfUp2Or3PQ== From: "Matthieu Baerts (NGI0)" Date: Thu, 29 Jan 2026 20:23:36 +0100 Subject: [PATCH net-next 3/6] tcp: export tcp_splice_state Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260129-net-next-mptcp-splice-v1-3-994cac40daa0@kernel.org> References: <20260129-net-next-mptcp-splice-v1-0-994cac40daa0@kernel.org> In-Reply-To: <20260129-net-next-mptcp-splice-v1-0-994cac40daa0@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Shuah Khan Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2568; i=matttbe@kernel.org; h=from:subject:message-id; bh=E5O3UWqgt4CvgYo2yhYrE/jWhi6yLAzzOug/sQ4PZ3w=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDKrNx9iUA1kNpL1O7B6J6e65fNpXUYqncsNJzivNHy7p LdJM+96RykLgxgXg6yYIot0W2T+zOdVvCVefhYwc1iZwIZwcQrAREQcGP6HFr7e/uW+dpfB3wop b2+b1PlLvs4/NmvLt5T2J3PuTv7qxPA/bsWbSa0z1Yy+3bp1lY370peNE5wWLZGtSeZfJpSgu/I XIwA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang Export struct tcp_splice_state and tcp_splice_data_recv() in net/tcp.h so that they can be used by MPTCP in the next patch. Suggested-by: Paolo Abeni Signed-off-by: Geliang Tang Acked-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- include/net/tcp.h | 11 +++++++++++ net/ipv4/tcp.c | 13 ++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index f1cf9e6730c8..cecec1a92d5e 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -347,6 +347,15 @@ extern struct proto tcp_prot; #define TCP_DEC_STATS(net, field) SNMP_DEC_STATS((net)->mib.tcp_statistics= , field) #define TCP_ADD_STATS(net, field, val) SNMP_ADD_STATS((net)->mib.tcp_stati= stics, field, val) =20 +/* + * TCP splice context + */ +struct tcp_splice_state { + struct pipe_inode_info *pipe; + size_t len; + unsigned int flags; +}; + void tcp_tsq_work_init(void); =20 int tcp_v4_err(struct sk_buff *skb, u32); @@ -378,6 +387,8 @@ void tcp_rcv_space_adjust(struct sock *sk); int tcp_twsk_unique(struct sock *sk, struct sock *sktw, void *twp); void tcp_twsk_destructor(struct sock *sk); void tcp_twsk_purge(struct list_head *net_exit_list); +int tcp_splice_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, + unsigned int offset, size_t len); ssize_t tcp_splice_read(struct socket *sk, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index e4009158b908..6e94c5859f4b 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -318,15 +318,6 @@ EXPORT_SYMBOL(tcp_have_smc); struct percpu_counter tcp_sockets_allocated ____cacheline_aligned_in_smp; EXPORT_IPV6_MOD(tcp_sockets_allocated); =20 -/* - * TCP splice context - */ -struct tcp_splice_state { - struct pipe_inode_info *pipe; - size_t len; - unsigned int flags; -}; - /* * Pressure flag: try to collapse. * Technical note: it is used by multiple contexts non atomically. @@ -791,8 +782,8 @@ void tcp_push(struct sock *sk, int flags, int mss_now, __tcp_push_pending_frames(sk, mss_now, nonagle); } =20 -static int tcp_splice_data_recv(read_descriptor_t *rd_desc, struct sk_buff= *skb, - unsigned int offset, size_t len) +int tcp_splice_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, + unsigned int offset, size_t len) { struct tcp_splice_state *tss =3D rd_desc->arg.data; int ret; --=20 2.51.0 From nobody Sun Feb 8 16:06:22 2026 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 7FD75324B20; Thu, 29 Jan 2026 19:24:03 +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=1769714643; cv=none; b=lgMzwTJlSyAlB3YgrG+ccFzyAPMXrXH4bf7itUPomlXCAtA+uaV82JHbltxViIM2TY0Fb99WuK7AKhf+0E4LAz5O79x8cx5rnGXB7JtsVwOh0nSCsAfm/1pTkdNwaFmhYehvO/Q+kO+Ml960+UO/FeByriBykTTpvyQoyphgL58= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769714643; c=relaxed/simple; bh=5Dh23pg4rmx3pdbZnLnTYRE9W6G0tlsmGnODKbU5NA4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=HBZx0D4TDW161BSPdCl09wgyoRghzSy0dRHVSIvHAv9MsDA9BeGBOIPz7GoHCl5LXJXNm242T9KeDW5hxl1s9NQwakm0OGKL/FkxuHPlXY5l7QY7LWCnQcSBAwM37u8B/13uZW7tECfJBMx7CEO4zK7rZxfWVn90PFcbbgNRQ48= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bFZBf/wJ; 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="bFZBf/wJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C0C5C16AAE; Thu, 29 Jan 2026 19:24:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769714643; bh=5Dh23pg4rmx3pdbZnLnTYRE9W6G0tlsmGnODKbU5NA4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=bFZBf/wJ8hri4UyRUcvsyJFZLO9JtXx8lFUzwdiPm4MiUVySbe3GmXwXj4oZL+4mY np9CuiKNL2Khhtp1rBJ6EzL/IgmH5GRbAmlP49ksXCmJq0FGJc44Nq5WXPP2IW8xLb GLn+zCnoX1UObVcuO1veEaBuJ6CbNXX98kWQqEDq+bCpf9HewDp/n2+nwpxm2Hyq// 2dMhF34domOta3t6Hq9mmIEO4fZKYGYRl7mIVI3tlVmbl722GmfrfuVAPQaC5oXQ9k FMuXW8MZRLfkS9W2wUsYI0DMg3Cv9TlZwx1O1Tt2F2l9f7QVe7VXZFr++CrmCLxGZG KaPjuGWIoTqew== From: "Matthieu Baerts (NGI0)" Date: Thu, 29 Jan 2026 20:23:37 +0100 Subject: [PATCH net-next 4/6] mptcp: implement .splice_read Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260129-net-next-mptcp-splice-v1-4-994cac40daa0@kernel.org> References: <20260129-net-next-mptcp-splice-v1-0-994cac40daa0@kernel.org> In-Reply-To: <20260129-net-next-mptcp-splice-v1-0-994cac40daa0@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Shuah Khan Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4175; i=matttbe@kernel.org; h=from:subject:message-id; bh=IWSUQH5+FB7+9xbI11VudN0EMrz/ck/e9lZJTN2typA=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDKrNx+uy0l4dGtBV2z1vZUVgocebukX37XZ5ry1WltLz KqLT1wudZSyMIhxMciKKbJIt0Xmz3xexVvi5WcBM4eVCWQIAxenAEykR5jhn7LZdVGJFTXtbXyp W26vX+Wl9WpzAwPbzx+HLm0u/mtT3sHwV/r8CbHt959ueDw1WcTz3tT0R6wB9873akTVbDxuYbu dgQsA X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang This patch implements .splice_read interface of mptcp struct proto_ops as mptcp_splice_read() with reference to tcp_splice_read(). Corresponding to __tcp_splice_read(), __mptcp_splice_read() is defined, invoking mptcp_read_sock() instead of tcp_read_sock(). mptcp_splice_read() is almost the same as tcp_splice_read(), except for sock_rps_record_flow(). Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 114 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index c58e306ec3ef..3aee29f70954 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4396,6 +4396,118 @@ static int mptcp_read_sock(struct sock *sk, read_de= scriptor_t *desc, return __mptcp_read_sock(sk, desc, recv_actor, false); } =20 +static int __mptcp_splice_read(struct sock *sk, struct tcp_splice_state *t= ss) +{ + /* Store TCP splice context information in read_descriptor_t. */ + read_descriptor_t rd_desc =3D { + .arg.data =3D tss, + .count =3D tss->len, + }; + + return mptcp_read_sock(sk, &rd_desc, tcp_splice_data_recv); +} + +/** + * mptcp_splice_read - splice data from MPTCP socket to a pipe + * @sock: socket to splice from + * @ppos: position (not valid) + * @pipe: pipe to splice to + * @len: number of bytes to splice + * @flags: splice modifier flags + * + * Description: + * Will read pages from given socket and fill them into a pipe. + * + **/ +static ssize_t mptcp_splice_read(struct socket *sock, loff_t *ppos, + struct pipe_inode_info *pipe, size_t len, + unsigned int flags) +{ + struct tcp_splice_state tss =3D { + .pipe =3D pipe, + .len =3D len, + .flags =3D flags, + }; + struct sock *sk =3D sock->sk; + ssize_t spliced =3D 0; + int ret =3D 0; + long timeo; + + /* + * We can't seek on a socket input + */ + if (unlikely(*ppos)) + return -ESPIPE; + + lock_sock(sk); + + mptcp_rps_record_subflows(mptcp_sk(sk)); + + timeo =3D sock_rcvtimeo(sk, sock->file->f_flags & O_NONBLOCK); + while (tss.len) { + ret =3D __mptcp_splice_read(sk, &tss); + if (ret < 0) { + break; + } 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; + break; + } + /* 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. + */ + if (!skb_queue_empty(&sk->sk_receive_queue)) + break; + 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; + spliced +=3D ret; + + if (!tss.len || !timeo) + break; + release_sock(sk); + lock_sock(sk); + + if (sk->sk_err || sk->sk_state =3D=3D TCP_CLOSE || + (sk->sk_shutdown & RCV_SHUTDOWN) || + signal_pending(current)) + break; + } + + release_sock(sk); + + if (spliced) + return spliced; + + return ret; +} + static const struct proto_ops mptcp_stream_ops =3D { .family =3D PF_INET, .owner =3D THIS_MODULE, @@ -4417,6 +4529,7 @@ static const struct proto_ops mptcp_stream_ops =3D { .mmap =3D sock_no_mmap, .set_rcvlowat =3D mptcp_set_rcvlowat, .read_sock =3D mptcp_read_sock, + .splice_read =3D mptcp_splice_read, }; =20 static struct inet_protosw mptcp_protosw =3D { @@ -4522,6 +4635,7 @@ static const struct proto_ops mptcp_v6_stream_ops =3D= { #endif .set_rcvlowat =3D mptcp_set_rcvlowat, .read_sock =3D mptcp_read_sock, + .splice_read =3D mptcp_splice_read, }; =20 static struct proto mptcp_v6_prot; --=20 2.51.0 From nobody Sun Feb 8 16:06:22 2026 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 4570E324718; Thu, 29 Jan 2026 19:24:05 +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=1769714648; cv=none; b=XRiU+f8fLnQfQFOH6CqPBha3XaO6XOLrNpSujQ40/ICJECyIGTSmgWEtMRI/fzMKOGRA9plZlKXamta3W88NoM5oFjBAG05pw3qyvn0GpOURCe3NlvwWO39++dY17N+xNBYA0dkri2qLkePRKEfUTLH0UMuwRoAJAdZV2HFsf/k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769714648; c=relaxed/simple; bh=UhMRuuhZAFvT556ZpN92xarxT8NldbqyDz7w9uzgrpg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FUI4iXAxSiRu207aw/TBh3pOCZw5hZPvPX95uFGhojTHig2wTAZ0OsaecB1HzXQpx4cCNlXNdyiDCIzR848bMa8O85nTzRxWVPivGcLcKLBcMds+bYZXIGJmZekcMwd2aPQ3ybkbK2ivuW8z3HEkRBWSFC9Kt84Bd+LhoM8PkLA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=m60i8tzd; 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="m60i8tzd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5FEF5C4CEF7; Thu, 29 Jan 2026 19:24:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769714645; bh=UhMRuuhZAFvT556ZpN92xarxT8NldbqyDz7w9uzgrpg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=m60i8tzd4QO0eRTIYrNSN/Ns4HChA36Ueegd0ZdNPOnqkhgy+OH+BIDsfA0DcpqJN yda9J0RmjpagrA+JnMg3CRA6oyyi0xKgZ9/AwJIrbudsNe68iX01Ey/d45Zf9Lu4LF ysYyHJAvltbUBDcp/SbGawNuFQa+orM4N0C06Q1fcDJIw+uoGMX/d3rCK3Xl1KsyxV 5Ix6+eDzGcL7qXGT3/Vnn1v3R4SdddmXArdrOoWjjMB7EJS3IW6o5Vm4wQ05G1rpGI QcWsX0vA7nEW6v7jBZ6XykyKlkZ3H6k0dFh3Z8+0uvBQ23SvJLnQx1lPTGxQ9KgKQY dTs1qZIgWaTlg== From: "Matthieu Baerts (NGI0)" Date: Thu, 29 Jan 2026 20:23:38 +0100 Subject: [PATCH net-next 5/6] selftests: mptcp: add splice io mode Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260129-net-next-mptcp-splice-v1-5-994cac40daa0@kernel.org> References: <20260129-net-next-mptcp-splice-v1-0-994cac40daa0@kernel.org> In-Reply-To: <20260129-net-next-mptcp-splice-v1-0-994cac40daa0@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern , Shuah Khan Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=4220; i=matttbe@kernel.org; h=from:subject:message-id; bh=/kusE89Z76EIevhWm5CsEZ0h5H6PEbZn8hZprjRZLzw=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDKrNx/u+ui3wGT20QfOj8S/iatMWpE9YU1JnRPnv7Xd8 xh2/RCa01HKwiDGxSArpsgi3RaZP/N5FW+Jl58FzBxWJpAhDFycAjARj8mMDE0M1pdFqvfu+XPu lkWG3sNv0ZaS1nf1dMsbbQ+/9ppxu4fhn5WS6NVw5TjBrzUbNjx7ZRn8a+kL+a83y/dMjbH7cp8 9gQ8A X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang This patch adds a new 'splice' io mode for mptcp_connect to test the newly added read_sock() and splice_read() functions of MPTCP. do_splice() efficiently transfers data directly between two file descriptors (infd and outfd) without copying to userspace, using Linux's splice() system call. Usage: ./mptcp_connect.sh -m splice Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 63 +++++++++++++++++++= +++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index 10f6f99cfd4e..1c4fe60089a2 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -52,6 +52,7 @@ enum cfg_mode { CFG_MODE_POLL, CFG_MODE_MMAP, CFG_MODE_SENDFILE, + CFG_MODE_SPLICE, }; =20 enum cfg_peek { @@ -124,7 +125,7 @@ static void die_usage(void) fprintf(stderr, "\t-j -- add additional sleep at connection start and= tear down " "-- for MPJ tests\n"); fprintf(stderr, "\t-l -- listens mode, accepts incoming connection\n"= ); - fprintf(stderr, "\t-m [poll|mmap|sendfile] -- use poll(default)/mmap+writ= e/sendfile\n"); + fprintf(stderr, "\t-m [poll|mmap|sendfile|splice] -- use poll(default)/mm= ap+write/sendfile/splice\n"); fprintf(stderr, "\t-M mark -- set socket packet mark\n"); fprintf(stderr, "\t-o option -- test sockopt