From nobody Sun Dec 14 06:16:08 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 8257E26B741 for ; Sat, 6 Dec 2025 12:34:29 +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=1765024469; cv=none; b=lPFJJru1pyMuKHmFwu3vu70mTQLZyY+8L+nfLvXTIhZcSM7TcWvoC3+CpQnalj4jMOykM93h/7H7Rn1FSu2+wCqunew5yG8zOiy7cMXgOt6rL+XnWeI6Qt1skvgDQo3leUIfokdCr+4Z1w8Ig54//Kfs2ICMAG1v0hV0mj5jzTY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765024469; c=relaxed/simple; bh=hWQMcm1DLMilY3LUwPUQhOMOnXd2TSSzffgFrV/XJ/Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ny7EQ4u6MlOEvcQacsZ4hlHnxmk8UVmLaggJqj+zDsrt9uzN819ygxSOxTTUjtsY1b+Om7v2KnxXo16M4WIaIjHZSLY3is294f/M8c6m6n8ZbLUTIHwGmv32cgWTKqydKFBullt4aY6O4N9c4872K1zVEQdg/RvVa1bw1YeaxpU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ei1UxPUd; 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="ei1UxPUd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA584C4CEF5; Sat, 6 Dec 2025 12:34:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765024469; bh=hWQMcm1DLMilY3LUwPUQhOMOnXd2TSSzffgFrV/XJ/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ei1UxPUd+TtXTOx1SIFlQF+YnYlDEBDB/1baAhQUY5i6G7knMN43TIfFuLmc8DnU0 MKfxmUOS4sqXlSj/ian1qJr+NYuEJ4PCHv8/YzkOu8kS3XwKp6tzWrHWTG1GSQNQcd HrJWaENCh4A6YMUt+CLn77rSm9H3YBnufYprm0RIBsog+5watJIhjbvSuq8MoJ7EjO Djf6al+aMCX0DFLCd8k0rCFHqfddc215+wXFvA7Su/LmY10wrmT2StWd56DzGxWtFk Ho/RPx632+pbDXL3KFvWm2fOaV6ac4jD+b7A02PMHZ/8VAmGMQKoQHv9BAjgxQ8z/X xa1BYwzr1z6sQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 1/6] mptcp: add eat_recv_skb helper Date: Sat, 6 Dec 2025 20:33:51 +0800 Message-ID: <96278b640414dc8edcdce440c411cc1521b10930.1765023923.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 This patch extracts the free skb related code in __mptcp_recvmsg_mskq() into a new helper mptcp_eat_recv_skb(). Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- 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 23c4db484861..9d67c751b7a9 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2017,6 +2017,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, @@ -2071,13 +2082,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 Dec 14 06:16:08 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 F26FDDDC5 for ; Sat, 6 Dec 2025 12:34:31 +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=1765024472; cv=none; b=lTCVJv8NQEsQ08O4AmvumXUUzjU2/faN4KcTOgqyHOWKJcXD07LufkpZJi4YjxO6yULkGIYl7wEVJaxwf71M9desh9AEkLrrlhBokPxN0nDw8IbATsEkFXnBxJL3SdOVtQZUUblNbkpbOyIUqtZtkhL9nSyD6DxVmMfxIVepng0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765024472; c=relaxed/simple; bh=49lsmvuuJEyPxMr0mre3SjmAsVnOoqyeVqmxKzVhCas=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oqsZd9b8G/lqbklt3EEk1nvL0QBZgXrKrKBv0Qt6Stev+f7HG33OXEVmd/hzuK3wr/Ygp3UCUOZHgUkghUGmREjqZhf3Y92+QmzCB7ImXtw9UkMQ/ni30nHUtSaZQT9r0uJymVoMvZrluUkFOCjw5lzIfqpI6L0RkzWBy0dav/g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bWn0lNJV; 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="bWn0lNJV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CB0B2C116C6; Sat, 6 Dec 2025 12:34:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765024471; bh=49lsmvuuJEyPxMr0mre3SjmAsVnOoqyeVqmxKzVhCas=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bWn0lNJVZpMjEbIdnIH2M1BpA812y/VhJov8dWfDApvH2mdWDBjKi6daIjEGI/+zi UUid9j9hCUyu4aXEXTDJ91cvKDf7kGoYgW//GoB/eBQiqqCDKJaTbjCUXLtfkyILQf DNOX7poh5XX2d+/lDoqtZ63hkAiuOxtZ8bdAXzFSlcQ5B+GZxnT5na76wFYjmri/yl bGkAlA5PjeyG373yBC1UrRIJSILLWgor2sZ1hyZvSVkZX78PvmLVa+Mw/URNryS76P KnheZGs0fc/KjHOEIZz6ud5Fqxso6U2JIqcioK+B5dKc3KNOmunI2Su7i47m8IOvF9 /+C0qelDk3x0g== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke Subject: [PATCH mptcp-next v15 2/6] mptcp: implement .read_sock Date: Sat, 6 Dec 2025 20:33:52 +0800 Message-ID: <6d5470547063a740c0eb2f80655fafd7dc47716e.1765023923.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 nvme_tcp_try_recv() needs 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 --- net/mptcp/protocol.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 9d67c751b7a9..01d602f0d556 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4322,6 +4322,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, @@ -4342,6 +4422,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 { @@ -4446,6 +4527,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 Dec 14 06:16:08 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 738D8DDC5 for ; Sat, 6 Dec 2025 12:34:34 +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=1765024474; cv=none; b=DfowdeRL07odiZRi3/4Hkczl56VWH/x0fO88A6fAtPC4xxnEYZ18Ou7uabx9kQEuzIGRXhSFtuYw49loBpYGC9Foxj2EM8A9GKoomvrQIMukCTRqGRmbFtE+wtT+yhWs5h1edRL9XETZTDbXdCZJWpptapDksbFt2kFYbjcB0vc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765024474; c=relaxed/simple; bh=lV56axlPXMe1LcP0B5FRqRW0KYzq5Ep3zPi9Lsr+CfE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GiKitOZf8yRkV2zEgOyfj2WJy2Yp7D+is8ulb2N/Fc235KCc466GMXhjrxWE6aPXtEi9EzXTSZR35T/9weG3VeQ4ODegVSUbtK7nM6QY/w1XlnyHnKJynl/3s3S5xMuSWMCOw2/u4b6r5O6SVULzMEC3XzSvm8giCUqTxR4UfNk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=p8OQ+Vo7; 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="p8OQ+Vo7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91E9AC4CEF5; Sat, 6 Dec 2025 12:34:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765024474; bh=lV56axlPXMe1LcP0B5FRqRW0KYzq5Ep3zPi9Lsr+CfE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p8OQ+Vo7gFdISBO0uHopQZs/sx5gUjCeeDk/4nvsnIDn+In6wuZBPqJzf5YozXr4a KHC6Tm7/41CoAaR6AMEyCSNZLAn2KT1ewm9yKVuOnCHR2qTRd/bzuREdyg6wEZ6GGn csFehLEgU9s4wWGZvvhp3XULZJeVqbhE1ya3cJlB9M3a9lUYUNwBlLkD8UrlyWWC1T S3W3YPlLG6Q+4opWEz4jYCEWVv7ahPIQ6laeyP2O7CZUv7rRrura7kL6lfAEdL4kMB 5QaKkSCcW6FkTgQzhrybPVxzqeiokiKYZ2KgqILOtLrUh4CIiz7CaULMg0wXXNzqKQ 4V+DvzYpHXcxw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Paolo Abeni Subject: [PATCH mptcp-next v15 3/6] tcp: export tcp_splice_state Date: Sat, 6 Dec 2025 20:33:53 +0800 Message-ID: <83d5d4fe500cf589dca5b4318ed3e6985ed34f28.1765023923.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 Export struct tcp_splice_state and tcp_splice_data_recv() in net/tcp.h so that they can be used by MPTCP. Suggested-by: Paolo Abeni Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- 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 0deb5e9dd911..f5f6119f7716 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 313c7cf208d8..40ad9656dc9e 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. @@ -775,8 +766,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 Dec 14 06:16:08 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 CB3B12F362D for ; Sat, 6 Dec 2025 12:34:37 +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=1765024478; cv=none; b=h3ggEn80ccVD93Z5zOV5/Urwq5k5ydXn/N+0PwRIGI8itRa4VxzhcvVLzwXjNjtW+p26ll+vCpEXWbAd1f1gEtQwkAGQ3xK1pQWsvu4r9ktwN2P896AKdIGP0Om2fxf1gMig+jvnptTWgX9DkCchm/weygWR4mW8+KfuDjSbSCI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765024478; c=relaxed/simple; bh=E1XqA4fai0Wx3ZysMUZJKwmMyGhAm3RF0vAtKKLLG/Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=e87bWFNkkIO4ozagpEju/ZEWRsoZ67rkTDqQj3jK16Xsbi+bUTvQKVyJEozXWvtueVoEAy5GJ/lQO2YAWcl5dMmQBFvY3GZ9LZpT4fy7GkXdTaL5Gq4XMbKN79w9BcpiUd6o1MFud8dBp/sORHI9+VW/OskoFweSv19PyEoTuro= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MF9rPrWM; 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="MF9rPrWM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5870C4CEF5; Sat, 6 Dec 2025 12:34:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765024477; bh=E1XqA4fai0Wx3ZysMUZJKwmMyGhAm3RF0vAtKKLLG/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MF9rPrWMMNDRV3DxgswXkSFRlEXzy1QZ7XVjJm0rTVHlb3dCugcgGQz3BshPCUGuP ijsUDhYiSECI6O0fACHEAGT9Q35TzaOz86i48QFOqLBmge8ozvJB3epeqBQy0HR2cC K3wGsOVM5beZuJb39Q91XQKdQZ/FDRHOwycYbE38rHbyX4mwi3/NKusSVMZ76oZIsv x94B79YyaNPVYieoHjf52yTrglSmhmfWBRsF42SlWKcBFN8cHMslXexJ2GTeyDJwrS JldRfjPBY3twMKbr9X+J6CWzIcnd7jg6tFjIVzi8gi0I/QGDyYSjbXu2jbTCpyzwN3 LwzsajMgIl5ag== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 4/6] mptcp: implement .splice_read Date: Sat, 6 Dec 2025 20:33:54 +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 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 --- net/mptcp/protocol.c | 114 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 01d602f0d556..334fdb10fdf3 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4402,6 +4402,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, @@ -4423,6 +4535,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 { @@ -4528,6 +4641,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 Dec 14 06:16:08 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 464BD28A701 for ; Sat, 6 Dec 2025 12:34:41 +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=1765024482; cv=none; b=cz77rF6M0roP1NIkIHuZA18w1GkO6OYo6KJexc8JZxrAH78DClBnGRifVZCOZ+gMq42Kzkc7QmFikZURno31JWnJBIZCYb4Bzcqth3VU1hcGAvgaAFP8pVgdrCz3Q+gc1gn8juFjuExOvILUx8fkC7gdS5JuYyinhnEl6egdGD8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765024482; c=relaxed/simple; bh=UhNb8M7jyLgttYDJBfZhnurW8DR5TP4B9xx1EdXwR/s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j9isnWAojhAZFGYbIwhYRhn9B/LZ4B+YpVCbQd197bbEwd3Zz6GpQ9lCQ1u13LT/PEEZ5Fuh0RS4bemLjaJIh/SjVSsUEIXILZvvlOJLoTL0yDPH9yNFHLN8lzV8zobgw4yESwz/hU0FGnG3YWwIeR65XdMyKPRL58cZ9BUhrM4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=u0eHfhSz; 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="u0eHfhSz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2951AC116C6; Sat, 6 Dec 2025 12:34:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1765024481; bh=UhNb8M7jyLgttYDJBfZhnurW8DR5TP4B9xx1EdXwR/s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=u0eHfhSzipSMbAa2K6BFkbvHVACbV36+Vblh4LV2Bkqoo+dJJLa0rd3fAvqieU3If rebWi4Vz8LWnxsALWurO1dsjr81+KEZID+at0i95neUc4dStv6YfkVyE0NYnuHTStv u2SftltGL6yLh7o4vT6QavffJpG+ARUCsV0QyuvTuRzXvMtVir55UcRMD7a5bJ1tL/ TOPkWKlm6a/oGwTtZ8nlFkVE/0trZXdKiufGxkR0nJJnngWtIzxZRl6nbcGxc1MKLo Db5gla8HchrP1MnfuOkBnO4AV2g57FJpJOpuOUaY7bW9VDxjuvlu1aANIbGSyWqjG0 0hzdXayy66TzA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 5/6] selftests: mptcp: add splice io mode Date: Sat, 6 Dec 2025 20:33:55 +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 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 --- .../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 404a77bf366a..b82df82e0594 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -51,6 +51,7 @@ enum cfg_mode { CFG_MODE_POLL, CFG_MODE_MMAP, CFG_MODE_SENDFILE, + CFG_MODE_SPLICE, }; =20 enum cfg_peek { @@ -123,7 +124,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