From nobody Sun Feb 8 03:51:46 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 D7F77157A72 for ; Mon, 7 Jul 2025 09:34: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=1751880899; cv=none; b=nOrsGflbw/wmyiRkrHzjSkr5YYR12hUFBqI8ZeKtzfnSqXl/Ex6EJS50Iyp88NTufo7rOH7mUolEl9sKXnoCLXHkLa8RBzdAneKFY+wBi+xzP2WKoNXyGFfpo9DZVlH+NkyatSoEcjGzitAd23hHSwG0ikK4561OiblrWb0ztm4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751880899; c=relaxed/simple; bh=P3+6H/qR0lnek7JEqRJCQKTskq8zuNWmw8BVjE+jRhg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hiTXYcbEEYKn0QASbCeC4p4qq3Z2HTbLxJHJkUbuz2OTOC+Mfe7LYjnZ2bajb6nUwLGDMJeZn/lSa55CtCWxo3ouCA3/M/jS3PeTBBih89HAnYa6UJAmQoxS9MfntyRAzqNeUR8+Rw02YRE2Uff2bXB7hObqE5y/BdlYoZuQef8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=R0IM3Uoo; 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="R0IM3Uoo" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E27AAC4CEEF; Mon, 7 Jul 2025 09:34:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751880899; bh=P3+6H/qR0lnek7JEqRJCQKTskq8zuNWmw8BVjE+jRhg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=R0IM3UooZHgX+2jJPvbnGGXktovh5GreB3QbbG8pLug2ww9kQtjbMOpCaD0VwMIb0 ygabaYKPjqdlr+jdL4m4HAg9YsI+DqkUaXaKNVa8cBN4glhJuIb+sAqnuKeWMZTlzr VuGvGDZvVXe+l6PxNgEa4RMOmtKDCcM/RJC6mEsBzNg097AWS7C6Wl4ysIlqIHa9Z2 zgg37c9B6MiwlqVzoIZc8cOiB07gOF6jYTwJhVedpoBIEsehYeF2A1slakfnn04mzn P7AMZmZCNhPt6wF5MHYEbuuCOmImwEAz4RZdRBImDq1sM6Zz4sanvMjgwu12oOxS8K uOAIwPKW7Mceg== From: Geliang Tang To: mptcp@lists.linux.dev, pabeni@redhat.com, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v7 1/4] mptcp: add eat_recv_skb helper Date: Mon, 7 Jul 2025 17:34:47 +0800 Message-ID: X-Mailer: git-send-email 2.48.1 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 --- net/mptcp/protocol.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 0c93b36373b1..48365d54bc06 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1845,6 +1845,15 @@ 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_wfree */ + skb->destructor =3D NULL; + atomic_sub(skb->truesize, &sk->sk_rmem_alloc); + sk_mem_uncharge(sk, skb->truesize); + sk_eat_skb(sk, skb); +} + static int __mptcp_recvmsg_mskq(struct sock *sk, struct msghdr *msg, size_t len, int flags, @@ -1887,12 +1896,7 @@ static int __mptcp_recvmsg_mskq(struct sock *sk, } =20 if (!(flags & MSG_PEEK)) { - /* avoid the indirect call, we know the destructor is sock_wfree */ - skb->destructor =3D NULL; - atomic_sub(skb->truesize, &sk->sk_rmem_alloc); - sk_mem_uncharge(sk, skb->truesize); - __skb_unlink(skb, &sk->sk_receive_queue); - __kfree_skb(skb); + mptcp_eat_recv_skb(sk, skb); msk->bytes_consumed +=3D count; } =20 --=20 2.48.1 From nobody Sun Feb 8 03:51:46 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 B56D928A72A for ; Mon, 7 Jul 2025 09:35:02 +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=1751880902; cv=none; b=P3QDCe/sHCZ+le882WotOs2JoCdfnpuX4oyJ2sXKBRk9GZqOMV5DkX0twXp2G09SYpAjj/Rl/d+e9wbzSkeebj05SbDqdD322m2apy9ykx/kmDJGcgc2cV7vvesB3FdgxlXXC+3OwYy3obeYHgPZg37g6PS/1WMaCavDInET8A8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751880902; c=relaxed/simple; bh=2X3dMBO+yR9gL2rXIkzL7FioXZ0KkhbeJ5nUg8Lkoog=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pynl6BceiA7M3d0JSJW35treHGzj/g48azzqstZUj3TDDmZhfwCDS7Tu46zOmM/l4rQ5SWLAuXyIta1/kw4MX3b7988TixhXGSyksH76+lA95yFvDsnQ00aTpzyjMkrqQ4c3kL3QkqDplMT1JlB2VIEADE3qGixjx5Kh89+GOCQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UVGPBe+1; 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="UVGPBe+1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B8D3C4CEE3; Mon, 7 Jul 2025 09:34:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751880902; bh=2X3dMBO+yR9gL2rXIkzL7FioXZ0KkhbeJ5nUg8Lkoog=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UVGPBe+1d+Wfw8DJjSHoIGUDfsqn/qsfA0WVquAyPfxmq72nT/b5joFy09Zu4MVlB rL0LLHdIpdheo3ibISYPsdayCr9HdHi9bnKw0n259M3cujuZqtxGcVCrnGXGD0ZDNT baATSJRO7scNcEZfQ63aDb+ej7sQ4/ZdqWjI7CXNU136RBLH7anSrhAXyI6Pu4AQ8Z he4KP7aCH7d2sNdjjzAD1gfh9iEe32Bcecw7ZRtzsWNY/nvFaI540rJ5vEiCLOGhtL ONEJQwZKx/Cb44nvK6mgB1nZ2DnrbaIrrM8bXMpoxcBfRFpc8QDU3OTzQyzon5uw1q kqObdBAxcE7rw== From: Geliang Tang To: mptcp@lists.linux.dev, pabeni@redhat.com, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v7 2/4] mptcp: implement .read_sock Date: Mon, 7 Jul 2025 17:34:48 +0800 Message-ID: <5cbb736addab5da388d5a43d3ad147ad50ff282f.1751880561.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.48.1 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 is not implemented in MPTCP. This patch implements it with reference to __mptcp_recvmsg_mskq(). v2: - first check the sk_state (Matt), but not look for the end of the end of a connection like TCP in __tcp_read_sock(): if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN) break; This will cause a use-after-free error: BUG: KASAN: slab-use-after-free in mptcp_read_sock. v3: - Use sk->sk_rcvbuf instead of INT_MAX as the max len. v4: - invoke __mptcp_move_skbs. Reviewed-by: Hannes Reinecke Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 63 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 48365d54bc06..fc429d175ede 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3962,6 +3962,67 @@ static __poll_t mptcp_poll(struct file *file, struct= socket *sock, return mask; } =20 +static struct sk_buff *mptcp_recv_skb(struct sock *sk) +{ + if (skb_queue_empty(&sk->sk_receive_queue)) + __mptcp_move_skbs(sk); + + return skb_peek(&sk->sk_receive_queue); +} + +/* + * 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) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + size_t len =3D sk->sk_rcvbuf; + struct sk_buff *skb; + int copied =3D 0; + + if (sk->sk_state =3D=3D TCP_LISTEN) + return -ENOTCONN; + while ((skb =3D mptcp_recv_skb(sk)) !=3D NULL) { + u32 offset =3D MPTCP_SKB_CB(skb)->offset; + u32 data_len =3D skb->len - offset; + u32 size =3D min_t(size_t, len - copied, data_len); + int count; + + count =3D recv_actor(desc, skb, offset, size); + if (count <=3D 0) { + if (!copied) + copied =3D count; + break; + } + + copied +=3D count; + + if (count < data_len) { + MPTCP_SKB_CB(skb)->offset +=3D count; + MPTCP_SKB_CB(skb)->map_seq +=3D count; + msk->bytes_consumed +=3D count; + break; + } + + mptcp_eat_recv_skb(sk, skb); + msk->bytes_consumed +=3D count; + + if (copied >=3D len) + break; + } + + mptcp_rcv_space_adjust(msk, copied); + + if (copied > 0) { + mptcp_recv_skb(sk); + mptcp_cleanup_rbuf(msk, copied); + } + + return copied; +} + static const struct proto_ops mptcp_stream_ops =3D { .family =3D PF_INET, .owner =3D THIS_MODULE, @@ -3982,6 +4043,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 { @@ -4086,6 +4148,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.48.1 From nobody Sun Feb 8 03:51:46 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 3CC1D28B516 for ; Mon, 7 Jul 2025 09:35: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=1751880905; cv=none; b=s7qhr+oEZzLSX5mizwwaT64cKJhb7Z0JEFkh1mZ/etH4SwVTZmyc1T/mvF9iq8rYnj2n4KQz7psEffHBgPcJwehlVIoiF70F9S5cHmf5jUqRyPg4o0VpgcGBeG0IvPiYmWvjgjpL1KGX+dqU01Yyed0766K2IWcS7d7Kka/uLpk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751880905; c=relaxed/simple; bh=hTO0z4g3hOEzzhKSmV3p+jNfMKy6GuI8V08JOAQfGos=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CjQhY9z6Ct4Iuz7B4as4n1gwqzG8QRKOvMAXWPJV2iBW0pb/HX6O0nORjpgaSNWiwGIbez76AsRuTTqKwrHY7URY9NkhK6r9+hp+Q+4arHLmDu4IyBQvbsNetqRshYtrzalAcbzVzp15vo2hKx1Ksf6ChdbydcI36cypjVT9cpg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sOyiA+3E; 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="sOyiA+3E" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA304C4CEE3; Mon, 7 Jul 2025 09:35:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751880904; bh=hTO0z4g3hOEzzhKSmV3p+jNfMKy6GuI8V08JOAQfGos=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sOyiA+3EiGSELjDt+scsGs5ljhCwy0hjXnj38sz3mAttYSnhFpZPc8KyVZDcVTQDH XPCqGM4+N+gRFEUpJJrjiftsGzPlBAGI3ImhClSN/aSezHkG5vACcg7mJb54yxToh6 ry/lvDbE6xj/iTQ6ajEVxY0zx3nb5Ei6QS0St+ARm7pbWJo5LioVYRoV015T/B7TNw 4b8UV+DAlBhDyp5+9vDW64egE0uuGEjOV13OYBEM4kbx/W4PFYthXrTKHoq23eq+ed Bc8ssP1pKHSCNGOHFdtif3sZ2kbBu/jKBQyOdsQ++Fg0WCAlTo0BVhVcVZ2Oa0Ae5D rh7k0pKX0g91g== From: Geliang Tang To: mptcp@lists.linux.dev, pabeni@redhat.com, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v7 3/4] mptcp: implement .splice_read Date: Mon, 7 Jul 2025 17:34:49 +0800 Message-ID: <7c269511e2ff8cf2a44934cb0f12554770c5c7c6.1751880561.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.48.1 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(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 136 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index fc429d175ede..4638d4be2b98 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4023,6 +4023,140 @@ static int mptcp_read_sock(struct sock *sk, read_de= scriptor_t *desc, return copied; } =20 +/* + * MPTCP splice context + */ +struct mptcp_splice_state { + struct pipe_inode_info *pipe; + size_t len; + unsigned int flags; +}; + +static int mptcp_splice_data_recv(read_descriptor_t *rd_desc, struct sk_bu= ff *skb, + unsigned int offset, size_t len) +{ + struct mptcp_splice_state *mss =3D rd_desc->arg.data; + int ret; + + ret =3D skb_splice_bits(skb, skb->sk, offset, mss->pipe, + min(rd_desc->count, len), mss->flags); + if (ret > 0) + rd_desc->count -=3D ret; + return ret; +} + +static int __mptcp_splice_read(struct sock *sk, struct mptcp_splice_state = *mss) +{ + /* Store MPTCP splice context information in read_descriptor_t. */ + read_descriptor_t rd_desc =3D { + .arg.data =3D mss, + .count =3D mss->len, + }; + + return mptcp_read_sock(sk, &rd_desc, mptcp_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 mptcp_splice_state mss =3D { + .pipe =3D pipe, + .len =3D len, + .flags =3D flags, + }; + struct sock *sk =3D sock->sk; + ssize_t spliced; + long timeo; + int ret; + + /* + * We can't seek on a socket input + */ + if (unlikely(*ppos)) + return -ESPIPE; + + spliced =3D 0; + ret =3D 0; + + lock_sock(sk); + + timeo =3D sock_rcvtimeo(sk, sock->file->f_flags & O_NONBLOCK); + while (mss.len) { + ret =3D __mptcp_splice_read(sk, &mss); + 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) { + if (__mptcp_move_skbs(sk)) + continue; + break; + } + if (sk->sk_state =3D=3D TCP_CLOSE) { + 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; + } + mss.len -=3D ret; + spliced +=3D ret; + + if (!mss.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, @@ -4044,6 +4178,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 { @@ -4149,6 +4284,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.48.1 From nobody Sun Feb 8 03:51:46 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 6729A2264D3 for ; Mon, 7 Jul 2025 09:35:08 +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=1751880908; cv=none; b=HY/VhPgWM+wW3+VLK8b87a3Aeh/eXQuDxL4Vr038zh8DcXHH+tZr3hekmr82fsjQ6E8+wB+PSbDAm73ZqPfPHwlrmylhe9qVVadVYPLOu2k6xRXNsR5eRy+se55AXHAUuPQpcDfF8VnMNcSCI7CH7H5YlnsPnYJc8yx7zNRGQSA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751880908; c=relaxed/simple; bh=bhuC2TqYyeTrDbPGob8gPdZZn5KwfuDrY1y5UaLO+bw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hZkH50L+IuVrN3OY5Rdg5tczXmUOZsxyzDpy25wgkUs2OVo+WCL3u8CPepAsO9xMQpqDlH0g8F/MjGXSNtDQZf6UzVoGprk827Qj0VbclJmPt9aI7xO/gIZfkzmjjcnh6NxyyzNaAtImQv+n9hlfU/ZsAp6H5MB3w6+fJh2rPFc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dviwsgz6; 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="dviwsgz6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 834C9C4AF0B; Mon, 7 Jul 2025 09:35:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751880907; bh=bhuC2TqYyeTrDbPGob8gPdZZn5KwfuDrY1y5UaLO+bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dviwsgz6uAJcflpakYXh1MyL1kECxlJvg7BzIUtQ/b73ywbQ19TJDxGEIi9UNaB3I ECsGo35j1UXlh5EdGhcq6kQVcrJpbYBEOHqHWbOYbhpSFrOIWAgyRXiplw1aUf5Nx+ xYWlE6AnIYrt1YFhdIuLtPyjqHs/JAk3GXB8SThWDaAe9hE1rdPPW9dhBWN7k7Y/Xu CYfxN313obbMK3gOBnANYNjUg6+plTu9stnAaIWxe65bUE9DZW7cuk1pe1/fcUabFw 7Cc2xMxygPSFu0c6ZctI1wIRfblxWEnaicpffbGSB8zEP/X6MGfoF2sJ0ZCZBKvtXl u/oyX+CVXRGNA== From: Geliang Tang To: mptcp@lists.linux.dev, pabeni@redhat.com, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v7 4/4] selftests: mptcp: add splice io mode Date: Mon, 7 Jul 2025 17:34:50 +0800 Message-ID: X-Mailer: git-send-email 2.48.1 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() functions of MPTCP. ./mptcp_connect.sh -m splice v2: - only use 'splice' mode for MPTCP fallback tests too. Signed-off-by: Geliang Tang --- .../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 ac1349c4b9e5..4c219d620398 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