From nobody Thu Nov 27 12:37:14 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 1A2492F5316 for ; Mon, 24 Nov 2025 09:13: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=1763975583; cv=none; b=YLXajdU2AmQqFNOmPj5/bhK22R43XW2RpGLuqHuCIqwzhv5xg6o+cZ6+zNRpMC2okWqzvuS2KD/uIBS//RSyzOHThKGZxdsyzOdFhQgG1SHz0IZEqEpUcFYvq8ubXBRVjrcScA39ieglzAOK+Qdi/jqTetnPI0ASWpqNnd8qqcU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763975583; c=relaxed/simple; bh=4oAz/740iislAtyTaSRLxw2TRzyqyQ35aVNwGUNqNFc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sLTrvb1vBGFi1fWEyXJMFpr6yVJXOadC0GaQgmiUO4dzsYi8Cq4KMDkfIP2UJSWU48ab6zXViZomPCCq9qPnFB5fINmLRWgvPzZK5POMycpLzKl8Mn+NF1UWTy30XSgMHAMg1jek8dj8iWenjgFUYIw42F0s9qn/3YzNwSWhObw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LZ5qgMuS; 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="LZ5qgMuS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 72D0AC116D0; Mon, 24 Nov 2025 09:13:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763975582; bh=4oAz/740iislAtyTaSRLxw2TRzyqyQ35aVNwGUNqNFc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LZ5qgMuSx+h+v3BynUEsII43rmjhHsJwvtF5mwZavgm0CABiPDGbMK1o0ap/PDvM0 WGYrZzMGu1/D7q7diBtDcgaMg/EGs0GUU3p6lPU8DIBneVWYOicV8wX0BR9HM5mlCk VnQO81OHDMdX5SGMeb/yXseJXIhRhOXDdVpuY/PvEhiVSlFsr0++bVV63Uyy9swYKt kMFh2noPFSLixGN+KoYcNZS9Ud+CDDbh9/xwXm1zpD50Dd+EM5mabvilpiomBfEgF0 wH+DEZP1pIk5+VauWliQfzr87z+uMKlvFaNA2qa8bzIMNeiVEC7BoZp7dZNhrLkpf6 RNwMpRAyVGYhA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 1/8] mptcp: add eat_recv_skb helper Date: Mon, 24 Nov 2025 17:12:46 +0800 Message-ID: <0fac6bd30baca4fdefec5947d967c56c182cc26e.1763974740.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.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 --- 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 ad20b087e9a9..b29790a7cea8 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.43.0 From nobody Thu Nov 27 12:37:14 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 2BD5A2F5A2C for ; Mon, 24 Nov 2025 09:13:04 +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=1763975585; cv=none; b=JAfKLTQjwX5Ez6JY6KNQuY8UFMJcdsHQvnRFYPyoBuzAObF8GexQYd4ge3MXL/uW5wx6iJxidO2jeiA4FKNDrAgWmdIRKca03i0DGoeFR6flG97aRtEi8D5rbEejNzL9uGM+oavqibDjfylHwDy5S+RQNbcOEp/RpZ7lnGmHR/8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763975585; c=relaxed/simple; bh=X5JB+ZXzC03c8XoPJmD6wp1M5H6ucogyNffBo9/1QkQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IHzDon97Au5gGFlLBabSHT1VClXH6E04ztp73JjkyhadiLZ8i7iXU6YFGNQ5dhNQyMWg7TNfRIepvpPbnMVNQxgHdWODt874Ql8qdzCMqj5rYlHVgXrT30NUj0ZuqNCw6KEuYcjXFDbkFshLt7h/cAYfscsnXZEHeUnej7EQc6A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LUjvXRVj; 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="LUjvXRVj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 472B2C4CEF1; Mon, 24 Nov 2025 09:13:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763975584; bh=X5JB+ZXzC03c8XoPJmD6wp1M5H6ucogyNffBo9/1QkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LUjvXRVjQgRsHp/jE3aOtPuYoTVt+RIKcsKrcuJ5pRcDmo2mz/2KXfb1viPG5jbKh SdmSMOIG8+aM43k3WzyRBysQURitpHYHCMN+i0tyFaN3iUBgZkUePcAK0xfj/we03j RWZaTTWzOLM8p7pXaBqS07W4Qs8qvMMmeyiwtkWevgx0d0C+suHZNc/6xUij/vLgEP SqE4+6qm1x8QQ6Xnfi7ypazM3Fw1byHuI018Axd8XhKcUB/7CCNbRPVxsWOsAJrSwc EIll80pMRidYseLiCrpBq+Y2naF2hVH/JT7kf6Z7eWdir8R+68zr7LwzEHOgn/N4gD 4FePpi1q4AYlQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke Subject: [PATCH mptcp-next v14 2/8] mptcp: implement .read_sock Date: Mon, 24 Nov 2025 17:12:47 +0800 Message-ID: <0a5459b14005500ef92850ce375ee67eda063426.1763974740.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.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 --- net/mptcp/protocol.c | 86 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index b29790a7cea8..75f90f5fc2a3 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4296,6 +4296,90 @@ 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); + size_t len =3D sk->sk_rcvbuf; + 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, len - copied, data_len); + 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 (copied >=3D len) + break; + } + + 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, @@ -4316,6 +4400,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 { @@ -4420,6 +4505,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.43.0 From nobody Thu Nov 27 12:37:14 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 2AFF12F531C for ; Mon, 24 Nov 2025 09:13: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=1763975587; cv=none; b=FCL+DMk84ulW/oiLuddZgB22QfWHgJTD1P0hKRJ52Se5mYtNOFPt6eJVkfAM4jAE+9V2KjyWznAd3v3FVvZHDJd+CRDckgLYvbpLCmSbRr1ja+EtgI0raoi6UeW0SNZ9bK1R9AqejMxSqCejlMCMxYBxgEnsNd85wFc2SEp2ON0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763975587; c=relaxed/simple; bh=ssv3JcOqjvqatsXN5b9vlm4K3B9pTJKKzeVyU/PlFx0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aUZ9cADyNYGOJRKWsfFTIta/lrOKAn7SvoKuIZZXPhMsARidfoGN/TWQNSrKKp4gF3VrnUPU/wWVxfNa3xINYoABYC2mOwZzUjYr6mly1GTFe/AY1qt1N3IU0ceUqv51bBoiOB1iSt2KA49ILKmHduKcGyF7h4WPnwdWk+0bvb0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rHx24Pon; 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="rHx24Pon" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 533ABC4CEF1; Mon, 24 Nov 2025 09:13:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763975586; bh=ssv3JcOqjvqatsXN5b9vlm4K3B9pTJKKzeVyU/PlFx0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rHx24PonS9ZUoXYJ3S8EH/R4XpmJTBvY2Yllw/QuV5OdWLPb3L3pMxhSGNFYgTUJn egjU1IqpNQDkdiv06DPTzA0+//Ryitjl6CWkHGrNob19wY5R5vr04nRBKPRFzKThER rV0Pm5eZNnxd/3TAwCFkGDaifl9f3mCviEyGV0taI9XukilI7B7At2hDg57IrP6pX7 yBM+I04QrweyzomfJtqNAqcuVriJMRC91Y7SfuB68aPEGd+OskqMkcU9Qno/LjUIjz gfFzmXzk/FWszW8umsJ506gxO6xWjvy0cRDI53ej7DmN8rQ25e7WA1DOaSGrHz3H3X OtjjDr/XJaFkw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Paolo Abeni Subject: [PATCH mptcp-next v14 3/8] tcp: add recv_should_stop helper Date: Mon, 24 Nov 2025 17:12:48 +0800 Message-ID: <67d9afa587bcd654db6e63350d9cba395d7778fd.1763974740.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.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 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, 35 insertions(+), 61 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 0deb5e9dd911..94a50a9daf65 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -2942,4 +2942,27 @@ enum skb_drop_reason tcp_inbound_hash(struct sock *s= k, const void *saddr, const void *daddr, int family, int dif, int sdif); =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; +} + #endif /* _TCP_H */ diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 5265a9453814..8b4917a7f262 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -842,26 +842,14 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *= ppos, if (ret < 0) break; else if (!ret) { + int err; + 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 -ENETDOWN && err !=3D -ESHUTDOWN) + ret =3D err; break; } /* if __tcp_splice_read() got nothing while we have @@ -873,10 +861,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; @@ -887,9 +871,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 @@ -2732,42 +2714,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 -ENETDOWN && err !=3D -ESHUTDOWN) + copied =3D err; + break; } =20 if (copied >=3D target) { --=20 2.43.0 From nobody Thu Nov 27 12:37:14 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 36F2C2F531C for ; Mon, 24 Nov 2025 09:13: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=1763975588; cv=none; b=klqqm+Ujlm+ik+3DHYemPG8P54QgudyTiP45wSQlzdAx/3I+70ZAUEm3kaT1B95VZebl4MePqlDQUBT2ONX5OQuPrXLs98ggWpIQlUw9SYcvxhFYAihawHYiHsanmaUayN2oDcmXtf54ruXMupBHaWmw3rpyhKaOFzn7isC2Xm8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763975588; c=relaxed/simple; bh=OAwG+bknZLpSx0zvEY65lzI2EEn0it9RHlF1E6xk4Cg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OUcMkmMPlO7uSgDt05GpdjzGoalbgvf9fDJorV9mJo0swVcPSbI+NG1pE+wri51lJIfK/nSGQCAVH0uwYBjsyd2VAY4U8BApfUC4OGmPhJzalp71fDCV/seJCKnVi1zapcanGrwC8tkENgq0TWtZfls8bL5W4piLWLYuKkkVCJk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cJybegtK; 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="cJybegtK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4739FC116D0; Mon, 24 Nov 2025 09:13:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763975588; bh=OAwG+bknZLpSx0zvEY65lzI2EEn0it9RHlF1E6xk4Cg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cJybegtKhDEY+HrdhOXUkF1Mp+fVTTHzHt+UBI4xDFzbH5WXvLf6Hly5W9oarY16O 2oNftxPcLsU667yeOIjX9HMecmkv2XOVPtVaAAl0yNW4u/kUbc165x79BAv+HWR9/5 I2sJFfL3gfe3lTh7fKw0tEDftQXx4H646EyFY4F3731SKYrI+h9Mc8XLzg0Q/riB3P eDialF4ke7vYK9gJ44ct927dj3h/X88bY4ceYuaMwgNmUbpMz3sEmVZhIHWY/u7Uyh GwLTnjXagqO1vMMJRCFipyjOzKsd4a2pnRUG1VoE6p1VDirUPjSl7R/xuSHWK/grCx EIiFUsbvdaFNA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 4/8] mptcp: use recv_should_stop helper Date: Mon, 24 Nov 2025 17:12:49 +0800 Message-ID: X-Mailer: git-send-email 2.43.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 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 | 35 +++++------------------------------ 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 75f90f5fc2a3..9302b372910e 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2296,36 +2296,11 @@ 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); - break; - } - - if (sk->sk_shutdown & RCV_SHUTDOWN) - break; - - 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; - } + err =3D tcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (!copied && err !=3D -ESHUTDOWN) + copied =3D err; + break; } =20 pr_debug("block timeout %ld\n", timeo); --=20 2.43.0 From nobody Thu Nov 27 12:37:14 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 664792F5316 for ; Mon, 24 Nov 2025 09:13:10 +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=1763975590; cv=none; b=X8BRW230oh1ZtUw6HaZrhbFIIrIjK3U3RnmYgBkGUm1gDdpqwhRL8AksWtntMkEW+efpyowCap/XjTlMBbanD2VikLQY1dbHWTMyUYmsB3U/0LGLr/lzjMYHM6JUbelVZl5VnaGeSflEWs+mZA5/GzKj38/FqTmJGgiNahEg2Ek= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763975590; c=relaxed/simple; bh=hHvG0ace6qZUfNg2igScH2dfB5idZl8Bvpz868+5SJw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fMSw7okTDbsG0lDfPACVAOFqrZWtTUsOPc5+iNN9vhD/5sDB8tuoFO0WFeaICtyRn6WW0+zFZpsxNMFiBZYbtaowWdbQjYTLiciBxaVyQAc55GO+TWIi1541tz/vqxhBWVuCNnAzNCpCqhXdp8/SMV/ZYW4pQhCw1nwXiElGOzA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=LK6j3QZd; 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="LK6j3QZd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0184C19422; Mon, 24 Nov 2025 09:13:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763975590; bh=hHvG0ace6qZUfNg2igScH2dfB5idZl8Bvpz868+5SJw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LK6j3QZdOJoLTpaICbvuZXuQV9VINayoXVZ867KQ9nHQQT7/79dP9NkUD5ZEvvqf8 bWS/QuninjmnoUocNbGOo9dEanC/CLp4/t1/zUQSjP/OUsIkcrUgpwmq0Bz9KxzQwv Rrk2UIrBmxxmM86kXRZMfeLRb+4CyYUHuj9nw5t5Yt7EVSOKEM+EEZT9U44Cjw+J3k Siw1F4JeX5Jjt0tvZ0PfQvj6GduSbQRyOKpMqV2iI5jsdVDHwEPRnznmFSYJ19LCaW HWb23/jgTEJq4jzbAoqZyBVZVk8rivL7uL/XHTRMocIjlanRwDAKHz89XhJ77r/9fx 0fLE1oND5Hp5A== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Paolo Abeni Subject: [PATCH mptcp-next v14 5/8] tcp: export tcp_splice_state Date: Mon, 24 Nov 2025 17:12:50 +0800 Message-ID: <11a1c9d041698169f45cf9a1e065ad0d2d4799af.1763974740.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.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 --- 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 94a50a9daf65..a5a30b65e0ed 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 8b4917a7f262..c96f8fdf271a 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.43.0 From nobody Thu Nov 27 12:37:14 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 2DC432F60A2 for ; Mon, 24 Nov 2025 09:13:12 +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=1763975592; cv=none; b=rH5I8KRk+HuSRPEI+GIgFtxF6VcXDvU3nvvWvxvWUF4clPueXO347FFmVYmOhMJlADhBwwJ6CJH0Q0KWJb2elg2URQiBEDMbcg5CTq7qtt70HA2+dpoR+n9EX5McCNCgKqx1jiDwKNzjPT2AoSxqXYvsEUkOvqX5xqWp4en2ZJQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763975592; c=relaxed/simple; bh=lW7TL3YbMDQC9E+b7AxqEXUPMLGATCiTqwVp1LcgWl8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ECzjWTQMZKAU2rmi5aGpKLAFRKGsRJwVXOBcQLil+l9gx1UP1ThcUeodz7N+TJWp/oO9Ba0lztpes6vcHNx99sewgPCD3ecxX6csPrwHWQQ7hTMo2T0Er9XXIzoUqiOfVTX5w37JhDU0M5XweV5mbavdHOy1idsEhTc+BIqaDtc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MwpQvtlb; 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="MwpQvtlb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D6D0AC16AAE; Mon, 24 Nov 2025 09:13:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763975592; bh=lW7TL3YbMDQC9E+b7AxqEXUPMLGATCiTqwVp1LcgWl8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MwpQvtlbeuGU17CQvG5qHb/FSkAfM9uOX6MvnYmgcdzL7jrrp0+vUGf+JJkyVdLs+ 2s5ilGouF5mUKZuN2ZCjxVP/iVLTgUfj5o88mQ+LfBxEAhTVtiABWfMLjmZoRsOZoI Q4q/yBi2Br+VoAXn4tzgS1yyQU2FQY/cHomGELQj3tXnf+JkqdyqqVzNINT1y1XBRb FnIpWXm1fDuSMscsvZgyF/0Hr9wX+ikDHkMcfifKp7MMLa5UQpbExM3djBkg8ufI0G FHVmIM57al3Us+5s8dHI2uqyAGAP28bWl7MFIlPjr3bJAE1noOCLM5A9fJF5RB4LXo 07DRSq3l1EC4w== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 6/8] mptcp: implement .splice_read Date: Mon, 24 Nov 2025 17:12:51 +0800 Message-ID: X-Mailer: git-send-email 2.43.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 --- net/mptcp/protocol.c | 96 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 9302b372910e..abd0f44ad63f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4355,6 +4355,100 @@ 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) { + int err; + + if (spliced) + break; + err =3D tcp_recv_should_stop(sk, timeo); + if (err < 0) { + if (err !=3D -ESHUTDOWN) + 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, @@ -4376,6 +4470,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 { @@ -4481,6 +4576,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.43.0 From nobody Thu Nov 27 12:37:14 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 3AE382F6166 for ; Mon, 24 Nov 2025 09:13: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=1763975594; cv=none; b=Rg0tkUrvDMaCaqhasAlvttbz7YwCNqJCv5TpsoP8tWMBfptvEqInqq9M4bfkm2z+tUQsUJjIlE+8J6/pk6w0EIy3Gsryq/shgzzXxPi1uTmDENyetkLIU/554hAe1u9LTT6U5ak9T8S+U7Fm9NFaoJeF0Syj5d/PD2ECLWEYGVY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763975594; c=relaxed/simple; bh=L5rk2EXj8ezGIiZDAqsurEpBgrACnOpXsGh8uDfLoR0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OaeR8hY+lL+el/kffb4vYNbnSJ6SK6g5BNlLQY6fog0YdMEAS+P097IOlonjbNyimfNa19e+WW7FWX5DPyIFQ5eXNkuLD9fReRd/Zzwc5NfM9FK+Yaw7AS7sqK+dcljvKJL5P9TrTbvGRMMTii6FUAOc9Ze1ZxfbAyIjtw9zT7I= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=B2pPI3w4; 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="B2pPI3w4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AEBFCC116D0; Mon, 24 Nov 2025 09:13:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1763975593; bh=L5rk2EXj8ezGIiZDAqsurEpBgrACnOpXsGh8uDfLoR0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=B2pPI3w4DbJmympHnOipV/mh14hP0dWGZBI/hwm4jkJJfwYQIBZ98EqaGLSwZ7Of8 00RK0kgOND/lzl30lqX3NFM0kN3simeosdKocU65OX/cie+rndFnBEORSQYDQ0q8jS ntyBYzb4uCHABInjXe/9STrAPPqqQIGBczm4cbi+YxwtU72KDNVP+DdAoNO5vgZD6g CmLnO9P8aGMb4UCiEhA00VpvEnRG0gAz7Jvtz7Ddw7eaWolXDr8J3kKxBuptqbcyyg hJ3Q7ltInl49ecgoRSGuZB7oufrsN0BrzeHEJsV2+nRVxyucflr/+i77l/frQRYVSi OZcoNgElPfCMA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v14 7/8] selftests: mptcp: add splice io mode Date: Mon, 24 Nov 2025 17:12:52 +0800 Message-ID: <33ec8d6e5b8c7d2a9c33008ea084c8df493e776f.1763974740.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.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 --- .../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 55bbdcf19222..2e50d6f93640 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