From nobody Wed Sep 17 16:19:50 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 AA6923596D for ; Sat, 13 Sep 2025 00:39:06 +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=1757723946; cv=none; b=jIHBqMLbhISMDR+dQlWIPBYq56uRsEzexRRZ3tSlNGM1l86Gh5VhTOxgGehk88+9FfCHQ/7J2AlnzlG9B9ntvjlIM+patQQ/Z734SZ3yo1Bf/xx0ROQMSgN5hyOAqX7dTx9VSYBO9sKNJeCejLPw3QTdZmW5l36S0645Ac5kDYU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757723946; c=relaxed/simple; bh=5PDdeBCimXHhAnlpCuGubUpW6ZRXHtmPtuFROXo6DVc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nsoZwgaD0r66J/VhXFlC5+5L5CcmbjgpYjstDH2kmqctMsrhhTg8M4CB+bDdvm9+rRRXK88B/zyc6PTEWVosh/slMNTnuNPdydcpVubnXNoYf/rGVMbOeeOm0kaEUpr5EyjfUOcIxpo11YEZSde7Q2OFtOdlx8Sf5olawLgF9rs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mLkXYhXZ; 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="mLkXYhXZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 493E3C4CEF5; Sat, 13 Sep 2025 00:39:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757723946; bh=5PDdeBCimXHhAnlpCuGubUpW6ZRXHtmPtuFROXo6DVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mLkXYhXZvxwaERMSNstWnulfhm31zaac/eGYHLiej0XSFpTl8cVceRgzBHgt6uyZq 6kh1+XauPdb2VRV3Vdhs115Bp7Em62bQuPh6FNoMd9aLXDKVwXbMHiUSuvFCasEtQB oEuluyFvJWc3XsUJBo9siJhP87VUzwLUeksDGMQY3oYgCyHsKF/7KXuuYxwUTbX8dR aHMIywTobAucj9+2ghG5NSOMLXD5Sl9k1uiJuHDUhHuPCKCdq3gVflcVe2qMVn/D5H AQsbtUdJlX5PPpjqoGFR1GEI5tlKmM9nqYTk3TXO0yIfwsOPBXfV3J1BhRYxPAtLPd Y3ZFnQcAq0Wgg== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v11 1/8] mptcp: add eat_recv_skb helper Date: Sat, 13 Sep 2025 08:37:20 +0800 Message-ID: <869ac3b23148e394640fa55870c6e39c4e177da3.1757723270.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 extracts the free skb related code in __mptcp_recvmsg_mskq() into a new helper mptcp_eat_recv_skb(). Use sk_eat_skb() in this helper instead of open-coding it. 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 7933291e991c..882b68a02fb9 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1901,6 +1901,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, @@ -1943,12 +1952,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 Wed Sep 17 16:19:50 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 5FC833596D for ; Sat, 13 Sep 2025 00:39: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=1757723948; cv=none; b=tbmrqFcF4626t7xpCjv0ViDlaXd87FjaqvqkSQ8Yj9LIBK2L3Y8hMvXfvDlmz5igDsLLGvytM5zoo6acl/ZS9rxWl8tvrgJGo92uEsGzUO88iZIDPJvUIs2MR1lHiTbb3PgKXhVzu4sJTuAP4ReBju72qHEHrR8aom31ztB9H9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757723948; c=relaxed/simple; bh=rFYQHttFTVLHAoAm6UzMtZ9AKpPh6ODCCqM7lEMAy/o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fT910EOgLsWk4vEtP2QnUbGXROqSph1mIgWnf1EdQSHX6EQi8HuxoXMbzNYITOY3Mz8fUJ7a0oW8TcnnFPYt62UrgSn3L2L4ap2Z4ZVbhmqi+r4cKtZehABVN5xEYZxOYnrFq8SbPy5mEcCdzhsSY43xXV9N5KPKf09m/1Nwfgc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MOaidova; 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="MOaidova" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC44DC4CEF5; Sat, 13 Sep 2025 00:39:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757723947; bh=rFYQHttFTVLHAoAm6UzMtZ9AKpPh6ODCCqM7lEMAy/o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MOaidovaHXlkiNtMtHTv3MKCzkWSN2SPVuTRNiVI4BUKe3C2EzoK8CkojNGzRD8Bs XkBmcLuRkjt9AnGa9aRW36PHuAG2Whi83iv63ObSqFrdooYzDO1cn9D/8XAjWsMwwP dAfwULp6R+pHW3gdiGVqV6lp1x8gsi3ydWhyfInF77wkKUhpccUhXq3HNVuwW/t0UZ NQIfA0HzddDRSJd99WtxQXoS4AwBKsBb+K4srOkO6M1OuygzxoX5Rq/xNVRXMI8775 THjhHYXZDpDjkTq6g0rmgMiNmWilnteu3awn1A7zPpP8fR7EQxavbYqoTA3l6niCAE 7WEdbmKtbPfPw== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v11 2/8] mptcp: implement .read_sock Date: Sat, 13 Sep 2025 08:37:21 +0800 Message-ID: <9158471b0d4fcdd7f9e66a8c1995a8bc997f4b68.1757723270.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'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 --- net/mptcp/protocol.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 882b68a02fb9..00fe7531ba8d 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4051,6 +4051,78 @@ 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 sk_buff *skb; + u32 offset; + + if (skb_queue_empty(&sk->sk_receive_queue)) + __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) +{ + struct mptcp_sock *msk =3D mptcp_sk(sk); + size_t len =3D sk->sk_rcvbuf; + struct sk_buff *skb; + int copied =3D 0; + u32 offset; + + 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; + 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, &offset); + mptcp_cleanup_rbuf(msk, copied); + } + + return copied; +} + static const struct proto_ops mptcp_stream_ops =3D { .family =3D PF_INET, .owner =3D THIS_MODULE, @@ -4071,6 +4143,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 { @@ -4175,6 +4248,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 Wed Sep 17 16:19:50 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 24CAE11185 for ; Sat, 13 Sep 2025 00:39:09 +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=1757723950; cv=none; b=OL4PaxQ0O2Utf23G2ulhxk7U5roZO9MQM6MgI+ITqb2y0SyyEMBf0Obxfjlkok75TRSYlWTxm5DtBQwFKv8jT4Fhty1Xjke/aGRVIRFJiI1pDLMTqzrow/RFlo2ujZbwTuJQ1ooR5H93LnwdIiXh+9/SsmjR65brzMj93BgP2Mw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757723950; c=relaxed/simple; bh=OGcTCBKq3im1Sr97t2AUNmxwsssfLDlmVA/h4Q2X/2g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RkdkB614UdlbV82zCasLiJ7IgmKINZC+Qdb6t+SnMJMEAZ0FpBh82uVApcUKecdw83uMwv42CEevuA/EL2RAWLy7ULGxaEW1qVFR/znsdvH5BjnWLNvFuZfzE6JATd3DvIaBm833P6ANCq2IvoozALQ/O7tTAXTwkQjlonSbfbA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=T+dAVGWd; 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="T+dAVGWd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5E49BC4CEF1; Sat, 13 Sep 2025 00:39:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757723949; bh=OGcTCBKq3im1Sr97t2AUNmxwsssfLDlmVA/h4Q2X/2g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T+dAVGWd2QMa5StcNlet0fd00BiSHt4asSYod8QzjYIiZ1PpVaOve4OJMRPgJwEeZ sBxOB2Fg3htg0dKKjdyxAsXMKpWQQV2FappM3DbF8lTqVrmc5Yug5vj9CyMYtifSau pzYKGIa9aiH7FK93jSW4yCCXyuLeMXFYMs9flWkK5f+8qbwJAsh2B94OUmV2fdhO1J i0LJG9rMJrqY3mCl03o1UxOyQcLP4Wkf9XURKgRmppdhr05vUNlzRtXdamSIXRyjml l9xOiy6KCFFYyCI3AYpthdP0EuQA9bJrpsU+KF14Udz2zuLqvsvD9aSKD4Cn2nCusd FgL9Vk6gOP/sQ== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang , Paolo Abeni Subject: [PATCH mptcp-next v11 3/8] tcp: export splice_state and splice_data_recv Date: Sat, 13 Sep 2025 08:37:22 +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 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 --- include/net/tcp.h | 12 ++++++++++++ net/ipv4/tcp.c | 13 ++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 277914c4d067..b071dad4c5e0 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -268,6 +268,18 @@ static_assert((1 << ATO_BITS) > TCP_DELACK_MAX); */ #define TFO_SERVER_WO_SOCKOPT1 0x400 =20 +/* + * TCP splice context + */ +struct tcp_splice_state { + struct pipe_inode_info *pipe; + size_t len; + unsigned int flags; +}; + +int tcp_splice_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, + unsigned int offset, size_t len); + =20 /* sysctl variables for tcp */ extern int sysctl_tcp_max_orphans; diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index d9ec2207bad9..03b75b3f676e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -316,15 +316,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. @@ -773,8 +764,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.48.1 From nobody Wed Sep 17 16:19:50 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 DDE5811185 for ; Sat, 13 Sep 2025 00:39:11 +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=1757723951; cv=none; b=G40LTPf5Rhm7SQfbERgkrm15bPLz7aw+bGAio56CCCTTN8Pj1lqugtdGeJPlH2kJgWS/peUARnyKbBs7IxqPGlP0xBStakO11jFAm+6BRrKlox7q/FbueslLKjoAgnXJ+Z30xuE/xxkHx4oS8PKO7tf/SWne08xAU9IukshAV3c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757723951; c=relaxed/simple; bh=ACUXJqNN368ju2r6WKKZ2m19M9rrmuVLa9x0FnrEQ9w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RWO2BnFFRFxKJxerwsS6xp86eA1slJpJhIJc1Opy1AH/jrL31A304QY1EgcTQ0RqXY1goY0sL4+sNh0ik9xExLcUGvpin3ppWzKC2itcIeHxgGpmmyu3AgbZ1rSm+dLgRqKGb7oA4eOGXE3QASDi74e2syU2ySW6q0H0I4N6blw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=klXcqAKU; 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="klXcqAKU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 360A0C4CEF5; Sat, 13 Sep 2025 00:39:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757723951; bh=ACUXJqNN368ju2r6WKKZ2m19M9rrmuVLa9x0FnrEQ9w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=klXcqAKUAIHdI607niwUgV5UFxi5nGxaIYHBMFzelUkVa88IKzGJzk6SyfLGYbmc/ Pj0ZNx65kTbXHzbEcXmk8YQEQZyeLSePYdXs1D5Mz+gPa9qfRyDZ9JF3K0jTBjBEEO BGQsjN2HrTWlih1Ps8aS1kLfdUNr01Zru6VwMNhaX3YU/bHFiuS5/ZZXtiRH8i1xDj JDmUgKitWA3+35bHbPa7hyzkSYj7IuyAc99uQ/1PTwsPcpbrPXrTakCoJGGOxwrpln 60ED6KIpmqvLjLKaJdb338IuDCGJfSZTXSa+DiXnT2Rp0gUZtL0zfaE7iiJBGL6aHz UGCE7crM/+T8Q== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang , Paolo Abeni Subject: [PATCH mptcp-next v11 4/8] tcp: add recv_should_stop helper Date: Sat, 13 Sep 2025 08:37:23 +0800 Message-ID: <935226abaf68ae4e0e94e66bd1884575264ad9b0.1757723270.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 Factor out a new helper tcp_recv_should_stop() from tcp_recvmsg_locked() and tcp_splice_read() to check whether to stop receiving. It will be used for MPTCP too. Suggested-by: Paolo Abeni Signed-off-by: Geliang Tang --- include/net/tcp.h | 23 +++++++++++++++ net/ipv4/tcp.c | 73 +++++++---------------------------------------- 2 files changed, 34 insertions(+), 62 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index b071dad4c5e0..e4a8ab62ae77 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -280,6 +280,29 @@ struct tcp_splice_state { int tcp_splice_data_recv(read_descriptor_t *rd_desc, struct sk_buff *skb, unsigned int offset, size_t len); =20 +static inline int tcp_recv_should_stop(struct sock *sk, long timeo) +{ + if (sock_flag(sk, SOCK_DONE)) + return -ENETDOWN; + + if (sk->sk_err) + return sock_error(sk); + + if (sk->sk_shutdown & RCV_SHUTDOWN) + return -ESHUTDOWN; + + if (sk->sk_state =3D=3D TCP_CLOSE) + return -ENOTCONN; + + if (!timeo) + return -EAGAIN; + + if (signal_pending(current)) + return sock_intr_errno(timeo); + + return 0; +} + =20 /* sysctl variables for tcp */ extern int sysctl_tcp_max_orphans; diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 03b75b3f676e..e772b4527ce0 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -812,7 +812,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *pp= os, }; long timeo; ssize_t spliced; - int ret; + int ret, err; =20 sock_rps_record_flow(sk); /* @@ -833,24 +833,10 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *= ppos, else if (!ret) { if (spliced) break; - if (sock_flag(sk, SOCK_DONE)) - break; - if (sk->sk_err) { - ret =3D sock_error(sk); - break; - } - if (sk->sk_shutdown & RCV_SHUTDOWN) - break; - if (sk->sk_state =3D=3D TCP_CLOSE) { - /* - * This occurs when user tries to read - * from never connected socket. - */ - ret =3D -ENOTCONN; - break; - } - if (!timeo) { - ret =3D -EAGAIN; + err =3D tcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (err !=3D -ESHUTDOWN && err !=3D -ENETDOWN) + ret =3D err; break; } /* if __tcp_splice_read() got nothing while we have @@ -862,10 +848,6 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *p= pos, ret =3D sk_wait_data(sk, &timeo, NULL); if (ret < 0) break; - if (signal_pending(current)) { - ret =3D sock_intr_errno(timeo); - break; - } continue; } tss.len -=3D ret; @@ -876,9 +858,7 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *pp= os, release_sock(sk); lock_sock(sk); =20 - if (sk->sk_err || sk->sk_state =3D=3D TCP_CLOSE || - (sk->sk_shutdown & RCV_SHUTDOWN) || - signal_pending(current)) + if (tcp_recv_should_stop(sk, timeo)) break; } =20 @@ -2715,42 +2695,11 @@ static int tcp_recvmsg_locked(struct sock *sk, stru= ct msghdr *msg, size_t len, if (copied >=3D target && !READ_ONCE(sk->sk_backlog.tail)) break; =20 - if (copied) { - if (!timeo || - sk->sk_err || - sk->sk_state =3D=3D TCP_CLOSE || - (sk->sk_shutdown & RCV_SHUTDOWN) || - signal_pending(current)) - break; - } else { - if (sock_flag(sk, SOCK_DONE)) - break; - - if (sk->sk_err) { - copied =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. - */ - copied =3D -ENOTCONN; - break; - } - - if (!timeo) { - copied =3D -EAGAIN; - break; - } - - if (signal_pending(current)) { - copied =3D sock_intr_errno(timeo); - break; - } + err =3D tcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (!copied && err !=3D -ESHUTDOWN && err !=3D -ENETDOWN) + copied =3D err; + break; } =20 if (copied >=3D target) { --=20 2.48.1 From nobody Wed Sep 17 16:19:50 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 7DAD011185 for ; Sat, 13 Sep 2025 00:39:13 +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=1757723954; cv=none; b=F7CKzW2jk9T5pmvPCQTaGsiVAciMBjBu/fgqWYhtVbX3Ia8Cq4nxJLQxJ8finjwSXkjQ6ne23eWnM1wFJmgIvyOCR3U6lnZUzcJ1hpiVLffxjnyYaeK2XoSgDxUky3hXmtr/oho1tVYot54dFQkHkY/vcpFZOGdynTOWn8G1Fn0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757723954; c=relaxed/simple; bh=a1wkl3z3gdzHoObtVAwTVrxi3rVt7rgpVMkphlb+Fb0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FduI3iXkvb2YGbYh8QXw0olQB90Ka/J0O8fOGAoJlqPhgo7dDfNdYnR+ET+IvYJ9Mekh5lQyQY4meM5mUj3kRg1AAk3lEzRJ3F15cu4BnuWkKNsiS7/LJJzGZjWZRm9+QbncOXvBO2MXGDPjFmqGDFIcMrBZGnaf6X5HD4rEpSI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=guaYuxl4; 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="guaYuxl4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0EBEFC4CEF1; Sat, 13 Sep 2025 00:39:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757723953; bh=a1wkl3z3gdzHoObtVAwTVrxi3rVt7rgpVMkphlb+Fb0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=guaYuxl4npt3fdwwLuzJqH73/JNsYpLIKItKNBx2EHVda1z0y5u1ArqduroipVwEH gg4++zSh/75J/zeltMpcJx5lMnDjr0iZRuOYxyAG3Iqspo2U09wcwJUv4HN7ce2J7S 8gV+JgRGgpbRtDIG4Vivsv8hHJQ4m0a2UFh2xbKEoMj1eLx3AUOpGQAlVX5T2jeTWb exPkvwwBSd5kieAwB8Kb0K3X5E6lukGboH4LBhp7tWtmK7Spn+cbyZz9WX8fheQb5K Mw7ZdR84qZOBBVblA+oj3AH6pQdXJZIEHsbPEFQmd8ibbNWPJNwTXV2TbNmAcJOKMH coYdrR8mCTbrQ== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v11 5/8] mptcp: use recv_should_stop helper Date: Sat, 13 Sep 2025 08:37:24 +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 Use the newly added tcp_recv_should_stop() helper in mptcp_recvmsg() to check whether to stop receiving. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 00fe7531ba8d..2288ceda45ce 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2196,20 +2196,12 @@ static int mptcp_recvmsg(struct sock *sk, struct ms= ghdr *msg, size_t len, if (copied >=3D target) break; =20 - if (copied) { - if (sk->sk_err || - sk->sk_state =3D=3D TCP_CLOSE || - (sk->sk_shutdown & RCV_SHUTDOWN) || - !timeo || - signal_pending(current)) - break; - } else { - if (sk->sk_err) { - copied =3D sock_error(sk); + err =3D tcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (copied) break; - } =20 - if (sk->sk_shutdown & RCV_SHUTDOWN) { + if (err =3D=3D -ESHUTDOWN) { /* race breaker: the shutdown could be after the * previous receive queue check */ @@ -2218,20 +2210,8 @@ static int mptcp_recvmsg(struct sock *sk, struct msg= hdr *msg, size_t len, break; } =20 - if (sk->sk_state =3D=3D TCP_CLOSE) { - copied =3D -ENOTCONN; - break; - } - - if (!timeo) { - copied =3D -EAGAIN; - break; - } - - if (signal_pending(current)) { - copied =3D sock_intr_errno(timeo); - break; - } + copied =3D err; + break; } =20 pr_debug("block timeout %ld\n", timeo); --=20 2.48.1 From nobody Wed Sep 17 16:19:50 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 A8A2B38FB9 for ; Sat, 13 Sep 2025 00:39:14 +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=1757723954; cv=none; b=e8bmIhVQBjcI0TnKPde+GithfbyyftDzcZUReYqCn5I3iuMzz2Ss/gx6dRu8DDGeFaaasU72OrMnkDqsxTPrY7Uxh9/l+P/bb82VxGyTdUWQqV/vQ3QIDki55BMWqukbAngQBCyDGJAJ4R2iEg8o7BeU9a4QMayiYSZlrxMh1UQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757723954; c=relaxed/simple; bh=hVytNSo+mu0v8CingI4PDIDyZxovCRQMQAw5ri6gn20=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=s/4CiYrxPbVEQK1PtiXHiyJb4xFn8suIJc3t4K/1yB81DhJYDYn/flKZF0mK4Fk6Kgax07TdyPJ93HPvvtv3/VN5tjjTsLasVQrlErQrCbSYbR42mRiSdPooZQ+/4fPDHUrKHFokgUY2wfPOlqgGNDprpRhMrKUDBJqCTOprKEU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dSVyGA/V; 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="dSVyGA/V" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79D47C4CEF5; Sat, 13 Sep 2025 00:39:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757723954; bh=hVytNSo+mu0v8CingI4PDIDyZxovCRQMQAw5ri6gn20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dSVyGA/VGJM+VWJa33YFAJUs9Le0E5Mad7TsfEUkMeu+dSmsk2h3EbwYfHgnIOT39 ZhI23uXgJ4duXhxcsZRz9EzSYe70fOG3emjYgxmU4JM8D2m5U8/syQIPwsOHxlFimM Wcxnxx9ctVhph6oiCt1+tLOq6pN2Bj8wyfM55wmE1WuUqm2Z1EGfxwFcCkCWvv9Rbf 0ql24640Uou9uqWyN15/CWSPXvDSnTpO6/J3KNcAv8F/A96KN/pXZBrEee4AluXI3Z ioYhz3eXfvGWcVPii26WPOErkikkRLu2hocds+C1/s6/yopWb7Nnehj9ak7tYK8jYq uhWz9bPDq1YRQ== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v11 6/8] mptcp: implement .splice_read Date: Sat, 13 Sep 2025 08:37:25 +0800 Message-ID: <206b6c3dfd40468128dc11b52620230af492d58c.1757723270.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(). 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() and __mptcp_move_skbs(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 98 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 2288ceda45ce..8259cc74c7b2 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4103,6 +4103,102 @@ static int mptcp_read_sock(struct sock *sk, read_de= scriptor_t *desc, return copied; } =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, err; + 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; + err =3D tcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (err =3D=3D -ESHUTDOWN) { + if (__mptcp_move_skbs(sk)) + continue; + break; + } + ret =3D err; + 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; + continue; + } + tss.len -=3D ret; + spliced +=3D ret; + + if (!tss.len || !timeo) + break; + release_sock(sk); + lock_sock(sk); + + if (tcp_recv_should_stop(sk, timeo)) + 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, @@ -4124,6 +4220,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 { @@ -4229,6 +4326,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 Wed Sep 17 16:19:50 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 4F1FD3596D for ; Sat, 13 Sep 2025 00:39:16 +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=1757723956; cv=none; b=X4rnEwJVxZ0mNW67D00NSXdS9H7oU+XTcn1/KdlZSfCOOKzTP9KRJ21l2vE7OZ4fwdgTSz8r3mL9uTXvWurS6NsLYinKyfSKTySxjx+v3HaUD8souavot0vnbPPUjwJsac+yImg8EhY1aQbjv19yC396iBqgaPk/1mwu0nrtda0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757723956; c=relaxed/simple; bh=giWibT3e82X+BfH9OMg5I4ljB81bq8LbLb1ZjqMgo3Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=toTK9jVV2CW0IVAB5PAmt6qk7nPbMSfPhiY5Hl6S1OZcoYPrSrsCYqF4R6Ey/pg6RV4ORI/CtOmIU8DQ2gQbMpAxDSoq22GTGlWw/QeWtCmtx3Oa+ialcAQDzbjk4bubkFRqhqUijvBIVrtVypgV2tIpjRYR/ojoiIFFPTVidto= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=iyoU63yO; 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="iyoU63yO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2000BC4CEF1; Sat, 13 Sep 2025 00:39:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1757723956; bh=giWibT3e82X+BfH9OMg5I4ljB81bq8LbLb1ZjqMgo3Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iyoU63yO19mVR0nGbBb2CyZ7t56to5j1wlU4s67EbhS/AFlzOU590MQxrpK9lzK59 skUP5v2fHVM3dkTFC5pRQfnn2ebU5XwUyWPpJgzeGWaDwdohUnUkbtUzpbYDLn35ir vZlHbAvuqYgyyj8e8qboM8Y26wVdtARHGgkaZF7rlGJS9jdPOwHgPzjWI5VDnjpcxm t733l55Zgen5OrLItgSQWo6dB0GDddlpRKwNV01XI+ywWKynRJS0FcESSRjfqiCgmS h86PBjc40keuojrTtJswpJr9BdC3/9zYwjpnMmyV3r7byywpKEq6dqcXM2r6HbtObS FkN0oDTB5q6Qw== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v11 7/8] selftests: mptcp: add splice io mode Date: Sat, 13 Sep 2025 08:37:26 +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_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 --- .../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 b148cadb96d0..52c6696a13a5 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