From nobody Sun Feb 8 16:05:36 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 B417138886C; Fri, 30 Jan 2026 19:24:44 +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=1769801084; cv=none; b=TZpN7KyApsp90XfckpxeDIJDbfV95xtVOwozoR7qjuMlU5xVkKxlOE3xFwAj8K4SmKMjbp481og6pDf8LLysAw0p8TZrsuJaabEKx2AtT/Tczzzr9mbt/E6C+WNw5JqeqBNlka1tyBs1qL3pbxzhcWoz+Jk9keZ5mEfgby3+8rs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769801084; c=relaxed/simple; bh=EAuYMbBxbAMoilMPoZHDPGbeVZ7tT76pM+ENAAXn57s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Ajgpf+Oq7TjTpjxIs7NVMSDW4gAPx1Mb6JlrnikXN8Q3V6jFjYvOq8cGiOF27Ih9AVi8uT2wc+kKdJHXLEq7F3m9xrn15NsOlurS6G0gJ0BSq+PBOB8Lk7AWs51v+ZXr3ydyFuoU2AMvlZ2CgjUWV4AczMyH5774KtckAGpW6ZA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ra0Kxnn+; 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="ra0Kxnn+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A0FAC16AAE; Fri, 30 Jan 2026 19:24:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769801084; bh=EAuYMbBxbAMoilMPoZHDPGbeVZ7tT76pM+ENAAXn57s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ra0Kxnn+NhZ+jCx42HQT+y/3koRF2uQt8nT1jZgTJHkTz39tL7QcQkxfyQCUIK2wt asTSIsXxFrqnDYOMKtGT6mwm4W8hc+Dx84Ffi8UvxW4viomq0Cy4K1856RgLm8ml88 /w7kKGeCIMzXaulo1LpPth7cfaOB+ukMMyJqnEtgiKWQC0mptcIUZc9/FMnbTZ097R n4MYIXzVLtw9dZWFYLjk8jO0StJeCelA78JshPPPmlhAPLjHJGdgTCCzcbvyTWeY7u OuF3O/GWUCuuE2bQ8lxtlTA8MWacyr/nx9uk7OO1WY0le8aPVkXwvJvMC3f1zNq9UP +hcXO0XN57j5A== From: "Matthieu Baerts (NGI0)" Date: Fri, 30 Jan 2026 20:24:24 +0100 Subject: [PATCH net-next v2 1/6] mptcp: add eat_recv_skb helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260130-net-next-mptcp-splice-v2-1-31332ba70d7f@kernel.org> References: <20260130-net-next-mptcp-splice-v2-0-31332ba70d7f@kernel.org> In-Reply-To: <20260130-net-next-mptcp-splice-v2-0-31332ba70d7f@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=/OxdgJ9BuCWlHWdJ6t8N6yU/MrKYs3xo5CWQUzxfqpY=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDJrWYuzVx3QNPlQECyR+etWkNq9V5ymh1dW2S+a+v6Yi 1Rx7wrLjlIWBjEuBlkxRRbptsj8mc+reEu8/Cxg5rAygQxh4OIUgImE72D4p3ouZUL5BetF65xb ZXbeMfz4oTgiebonX337hNiJFo92/2JkmKjwoOXyP5NvGj3N4Wv/N/+d4O3Y6tUmYb/3zr5JR1Y s4wMA 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) Reviewed-by: Eric Dumazet --- 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 8d3233667418..5eb2a6182d4b 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1995,6 +1995,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, @@ -2049,13 +2060,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:05:36 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 5522538884B; Fri, 30 Jan 2026 19:24:47 +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=1769801088; cv=none; b=sRex0dvFqYxXi4rymxu53SIAHklju82X3UPqX5paP6P3dWfJ2otJsKwI7i9TzyZ4O+rNzrwZnu0nhZ1zzCYIbLvFoBXv3CQl2/weKsWEvFtNPEYd6BbHV7didmhKwbi/RaieVQ36fnLo9FFhZj7eUXc1nzHOHrSffuROjcm3eIk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769801088; c=relaxed/simple; bh=OJHRmNNIJWRbPOyDdCEKU1GKMjHvZW8dJ0Y58MwPp6s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jNqiF0RjMx96PZw+I+5r/fKQQwel1BGTolQFBUld9uONrTvNWzM/BR99Vs8pCHEP1XcwS4T0S9jlkQpIP/fsjrftYsDn+xpwiD3FsBdTs02Nf3UEIXIDVTfr448rK2FbtQyFkdnaxUWFt/ncSaAiYusn+FPxMbSjqGMbPlhM7lA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CT+bvUve; 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="CT+bvUve" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F06FBC16AAE; Fri, 30 Jan 2026 19:24:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769801087; bh=OJHRmNNIJWRbPOyDdCEKU1GKMjHvZW8dJ0Y58MwPp6s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=CT+bvUveE2kLSdQz77bEfZtngsSlhGtaN7EsVvbdusrs2DVfgKirgmT1GXSUbQecK 3Azuvzhex698r7nOLXoYrnw+mxLp03IDjzOJsF9DQlE9HPwm7hU6e6XHk5c19Toi6n 4TowlOA6po+VIypORSFioJwKAdWbRJYFP/SpspwaOxVj6qRcff1moTheX4I/JNzkiw zTwoRd/0EkvJLMnhKhcBSK4AnNSEnDuYHiYD88qwZpOx/Hdj/MQMl4D1Zrau/fxAe6 Eb5rwIafGVHUqucTHf7G6nOVVat/NfebIzKAPcI7DtrUefR+FOV9OJ5xMBTRBKlLz5 ZA5IATnAaPiCQ== From: "Matthieu Baerts (NGI0)" Date: Fri, 30 Jan 2026 20:24:25 +0100 Subject: [PATCH net-next v2 2/6] mptcp: implement .read_sock Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260130-net-next-mptcp-splice-v2-2-31332ba70d7f@kernel.org> References: <20260130-net-next-mptcp-splice-v2-0-31332ba70d7f@kernel.org> In-Reply-To: <20260130-net-next-mptcp-splice-v2-0-31332ba70d7f@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=KMuYOcjFI7Lawq5WHpxaJGlfAmPSD3RlV7+TssOLC88=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDJrWUs6Lnh1+G6foeV0vOttzqZLz3a98vr2U6Bq2jmdc E2vEw8VOkpZGMS4GGTFFFmk2yLzZz6v4i3x8rOAmcPKBDKEgYtTACZSW8XI0NIcovhH9OUZD55T EoFVS9Ls/hgr70m9sWT9zPLjje9uhzAyzDF2OF5Ts+/84w3lRqEb50fysU4sWKS27fL6XO5Ngkb 5jAA= 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 5eb2a6182d4b..2071f984da12 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4317,6 +4317,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, @@ -4337,6 +4417,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 { @@ -4441,6 +4522,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:05:36 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 877A6389469; Fri, 30 Jan 2026 19:24:50 +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=1769801090; cv=none; b=DX26MbKgQ0VYlHGEKikt8QoCTWEbkqs/E3JTRC8sk0FUfwUV1EZaeH78dWYi4zN6ZoU9S8gaI7PulLJNmXZ+Lj5kaie68d8sxTicz9kjSZnffye/tK86qgjEPjUFmidwhR8rNfP4OQGR4+Rosg14gzABz5OsbYHqFaEIwj3erQ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769801090; 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=GqZn5sqw1YFCb24+szhzx/Peo2EKqoMctGqzPfUEwUYiJ359KqDzjAdHKLhyRl6q1HcLQXD+kJd9dptWsB6kA5ksO1gbeWW3AH35bf+cjJAoBLbx1EAPqTc7HHCHbgc/cH9/9/+VNOZBY6+C1/sl9uAAEeM6FIcCLSKj63ca6so= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=K7nWJ4Jb; 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="K7nWJ4Jb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5279C4CEF7; Fri, 30 Jan 2026 19:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769801090; bh=5pXsZ1+bdcl0+5ekJkKvICgBbW8Fn1J1qfigEm+sIpQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=K7nWJ4JbohukozJ+0CKHBm43kGvZvJkYx05RwXOery2ajtyTKVDfUWbFZ+9MoC/lO Ir0nO1ikNv8we9AOEpIV/ypjpwCwEi9Ei5OKXNwSLG04vA3lyy0oLF5EBNIISedicS XsEj2EwEG258NhkdTNvcn9k4dxTzBsI8LqtMBjeH9Xt93LblnsTEbsO8w8OsPwp8Po bgtFORjMtcA9Lm79WhGJDqoXQ3WQlstGbwIcri4pv5RPAd0eXNfd+B5iwn9cbPbsWP 1xbXgObzSnQhxmEhdvLrvtPxqPnN6T5Rp6RplmDnMz5nJJpKVnBjrCWJFn38B2ngFy B3cwony5I/ltA== From: "Matthieu Baerts (NGI0)" Date: Fri, 30 Jan 2026 20:24:26 +0100 Subject: [PATCH net-next v2 3/6] tcp: export tcp_splice_state Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260130-net-next-mptcp-splice-v2-3-31332ba70d7f@kernel.org> References: <20260130-net-next-mptcp-splice-v2-0-31332ba70d7f@kernel.org> In-Reply-To: <20260130-net-next-mptcp-splice-v2-0-31332ba70d7f@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/Th0Gd3rumMp9WSGDJrWUv2fbU4Nk/L4ue1V2pfay+cL3gSsdHhRvaBtW8fb znVLXghq6OUhUGMi0FWTJFFui0yf+bzKt4SLz8LmDmsTCBDGLg4BWAii+sZGVYc8Pnd5Nnzf7uA u4W8Ek+unfcZJR+WhV7HpmiviL6mZ8rIsHzzu9eMO9YEn2zhV1zc80v2x/WQIzqcWkWr6/SCo24 +ZwYA 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) Reviewed-by: Eric Dumazet --- 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:05:36 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 8F411388874; Fri, 30 Jan 2026 19:24:53 +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=1769801093; cv=none; b=Fu0YrO1EKZaZkkLXBqYGa/prLUrH896XbQLE2yFP1CqOQeaPmniTUzg5ARAcGKXdQbRcB2tk5w5PPMYiYhQvqs2YhHMkfV1dyA2O4dOzbA00/fYGweDQ7BrClbueThp8peetAmnFFFkOvDBDm4bsmWsRuHQK883+mQ043xVbiEk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769801093; c=relaxed/simple; bh=LYLjPE5IORq4UG8eIVkHs/P+wZb4Kq6vHRgDcEijYRE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=OQbY5vwThiKy6Z02pYdaXxsrWFxDkwd15wq1L0Kvvm+9ccK1llg68c9T4TPxv7KmySFTAKa66vkBRuqAWjhemPMAFs/HlxvEgwwYo/e1GFf7EdP2C4N2yDug3oR9Im+NAGS8qOHrAVPEJLEO/a2p/NZzT3q0zxQwMYsur44qP1A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ug7hDnJe; 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="ug7hDnJe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6064C4CEF7; Fri, 30 Jan 2026 19:24:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769801093; bh=LYLjPE5IORq4UG8eIVkHs/P+wZb4Kq6vHRgDcEijYRE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=ug7hDnJeSs6BZvkht88WBiDalhscCjJc++vu7r/HArZmhCOZytim1+/ocPfhLZN1Y Q0X5F8+khPlu9t48XJjAClwtraRHhMTKG96rthMccrhjNZUT/shupDngBeDFjmIkjf DT+6nA2ykzH03EteEkTCT6KjHPXhhD3HGzk+2tzU396wP0UDsZeUS3SAogfwVl+hts wZqv72eq++A3lZjIZCBl5Z1Eey4/z1IUR+EQTdIBtuIXBKN79lX3tQsK0Iymzulirh WOMPzm9mLLHOIivm+K/tZSTZpVsSU19N5NikFMSy0XfUqPOGUiS39lPWvALiK8Zfv+ cNt/jJ2mc0KiA== From: "Matthieu Baerts (NGI0)" Date: Fri, 30 Jan 2026 20:24:27 +0100 Subject: [PATCH net-next v2 4/6] mptcp: implement .splice_read Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260130-net-next-mptcp-splice-v2-4-31332ba70d7f@kernel.org> References: <20260130-net-next-mptcp-splice-v2-0-31332ba70d7f@kernel.org> In-Reply-To: <20260130-net-next-mptcp-splice-v2-0-31332ba70d7f@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=4285; i=matttbe@kernel.org; h=from:subject:message-id; bh=dGLYK6/3afPrBVUkXgyFIvesaiZzdIaNnL/eMHu9RBo=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDJrWUs5V1RqFL+qUtBfeeL1k/NfPqy7UP+a+8BLz6Z5M 30+KR7R6ShlYRDjYpAVU2SRbovMn/m8irfEy88CZg4rE8gQBi5OAZjIjQKG/2nB3L735D5eKdnF 3ruV8/iXQ006++J3TvyhVSf2vE/yHjMjQ98VpmLxrNtTk9TefJZcvPl43PnVfx1fWyiUMCc/eJe 2ngMA 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) --- v2: Fix kdoc warning reported by NIPA --- net/mptcp/protocol.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 117 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 2071f984da12..9b8c51937eb2 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4397,6 +4397,121 @@ 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. + * + * Return: + * Amount of bytes that have been spliced. + * + **/ +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, @@ -4418,6 +4533,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 { @@ -4523,6 +4639,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:05:36 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 5FFB1389E02; Fri, 30 Jan 2026 19:24:56 +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=1769801096; cv=none; b=qgDCyysHa3Um6uOU1wKDMCGKMKcbv9BCH0n41X5HNHGcOxKU+xSbhv1QxgilCFJNDE++8zuqhB2har6N9xl3whmNLk0jMOrPHBIlt+EPpSNKyxcMVb4omS39R5o8jyT29qdn5/U4mCPtqrpyZgvx0eNTUMDop1m07Qv6b1WAJZg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769801096; c=relaxed/simple; bh=yrMXX/Ly2uRIHmG4Ho8y9+W8x7hUvoaXfV0fOSFxZ30=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gHQbX2gHVgXg6Gf/Hcxr14IqrVgx28TeGmm35by5iy2BAlnRqAgL1CAenIgfy2tzJBCSLkyU0m/cJjAKQLQgoRbfS8aydLxOtPC6VWYZDyle7hRqcpxeQbBNAgI+LnVbJRY6lfOPweCd041cOTk8HPizbPIQc2+sit2jygCmp+M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Ye2d8sJs; 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="Ye2d8sJs" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86E04C116D0; Fri, 30 Jan 2026 19:24:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769801096; bh=yrMXX/Ly2uRIHmG4Ho8y9+W8x7hUvoaXfV0fOSFxZ30=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Ye2d8sJsfGA5rOLS3MUXFBMsQHNCyJMfG4jRSV0Z/blqpx95qsb0uzJJHvuVhHsij LJ7bIjRXSOhIwjeLck51YaU0hZ4WfUpxRt9T7cBrl6uuHK+iWgSkXVb8KWDEOrGylK 8TLQuZO77IepVCnEJBOfJFcetxUobkD1H6eZes5y58MG7YgZv4yVW0l5qlLDo031SR HUP3DLh+uJiEQBxZ+WiGc1tk/7sdsipVfhT8d6mcQzLusvuDhm9WNSi2g9pvDdQTUi Fkfw7zM09iMRYM2jKz2n6NswW6H26oGnuh6K8P1SN+YIyITlHwEnI1rsxFAIsGWD+Q OPyedT9HyLMNA== From: "Matthieu Baerts (NGI0)" Date: Fri, 30 Jan 2026 20:24:28 +0100 Subject: [PATCH net-next v2 5/6] selftests: mptcp: add splice io mode Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260130-net-next-mptcp-splice-v2-5-31332ba70d7f@kernel.org> References: <20260130-net-next-mptcp-splice-v2-0-31332ba70d7f@kernel.org> In-Reply-To: <20260130-net-next-mptcp-splice-v2-0-31332ba70d7f@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=4719; i=matttbe@kernel.org; h=from:subject:message-id; bh=c/dUcsH6Pw3M4nSbAekCkr05kbFGmSy5QETn5mOhaws=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDJrWcsmV4SW7my6VBd8tkFg5XcZrfd58uw2mZUWawxP2 11b2NjSUcrCIMbFICumyCLdFpk/83kVb4mXnwXMHFYmkCEMXJwCMBGNckaGf3fs0yoVqiIfJv+/ wrBgBcsOaWNu7lcvt/Syav9SennvK8M/lbmhKXNEhWx7bfd1HvvP4fxnE1f8q6Z1wh+apIytXtd xAgA= 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 Co-developed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- v2: catch possible errors with splice() (NIPA review assistant) --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 79 +++++++++++++++++++= +++- 1 file changed, 78 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..a74b13e42ecd 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