From nobody Sun Feb 8 05:58:54 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 50A214A08 for ; Sat, 28 Jun 2025 06:58:00 +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=1751093880; cv=none; b=ZO+MA+3UoKo2S1pEdawlRKica86/KLwsLDr6H2XSbnfTPoZuYsw0H9o7mdMz/geLy8FInezbWQsibkWry0AJhmDaXrchsJ7K5G9VD8PNuh7HyOK1cF5Cr5KaJr1niVSBttV5PRMaYlH2tcBtzG/p/uxvFvI4DbQBoaYWSQvKL5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751093880; c=relaxed/simple; bh=epwapybJb3CgkKtp/aeYa0kMv1PgIz/cC1O6ujlwZOY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wq16+zu1Cxd17Cvk1egmrPnWmpFMvEZH4gtyB6C6B8rYK1VX1S6SAP+MkC+ks1fNsWGYBwZbNhJ7QKep8Bx+1j6sGa8HxoluOTw7ZO1ERK70dp6LQfP7CLkaZT3UvHXYUDjbMvBd8/NOel8R9s8mU1lesyuUQg78RTfnQ6E6QuQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=V3xhDDq2; 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="V3xhDDq2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10D0CC4CEF1; Sat, 28 Jun 2025 06:57:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751093880; bh=epwapybJb3CgkKtp/aeYa0kMv1PgIz/cC1O6ujlwZOY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V3xhDDq2oS+fhMeKaaPlrJ6TlKm2kPG8UneLGY2nKKzpeubjNbbp06SEYZ++YaevZ JFwBsgIUfKQUWhNgR8S0BIwXAmtlpjvgz8v4qgSQWS/DWyB///RZ6M2OAovImJkZQ6 4hsUUCOjqLHsz48R2nmMNpK9iHHYzPERUbmF7asZXmeqOoktkugdAIdel3htKuS8T6 GnyWrGz1oXqSTIH007TLvNxxcyeyowGXDnONu7+m3lmVTIML1//CQD558g3sOkswGr Y74JHpF6xwOyGZTXa6Ji1VehTjftUTJWkTngBsBFcxlCh9eDdL73Wgcap/S9mnZF0n WEWV771NqWRcA== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v5 1/5] mptcp: use sk_eat_skb in recvmsg_mskq Date: Sat, 28 Jun 2025 14:57:09 +0800 Message-ID: <4a309ea09d8398ea08588aafba020b676f57616e.1751093346.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 uses sk_eat_skb() helper in __mptcp_recvmsg_mskq() instead of open-coding it. Signed-off-by: Geliang Tang Reviewed-by: Paolo Abeni --- net/mptcp/protocol.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1de42dc4e8ea..2f747ab730e5 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1890,8 +1890,7 @@ static int __mptcp_recvmsg_mskq(struct sock *sk, 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); + sk_eat_skb(sk, skb); msk->bytes_consumed +=3D count; } =20 --=20 2.48.1 From nobody Sun Feb 8 05:58:54 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 4F0144A08 for ; Sat, 28 Jun 2025 06:58:01 +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=1751093882; cv=none; b=edRv/AtoTiPzx/EfY0t8L7CpExke+2WUHvT+LOo0v3cQ4kyjFcF1SdVq3dqIyoJofYzQx4YAWDc3Jz/5/UtaAHreMVTCbvTiTv2euZ/MDyes++J1gMd7650r0qF/49IlXSZpu7D1SHIgr65Cv6O2yghwCUy4kyjlJ3sMDK2Y4LA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751093882; c=relaxed/simple; bh=vBCSHusMthd3wYqtglA1rZINZLF8DuQCY7RGbljju3U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rBhLKK8kct4GQsmzTzMPNmO5JNVsjNZjeEukAqsaUwdmqu4zMdzTvCQzgTMOM0jub4My3d0ecgf6FSciK7WOKAw3p/2tVDe6iEiyZUT4vWw83TGCAmggz9dMn22k2S28RLQ5/8TwAMWcBlnbCaC85OsMwxHOrjTe8fkwIE2pH50= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=t7hNErgi; 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="t7hNErgi" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABF2FC4CEEE; Sat, 28 Jun 2025 06:58:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751093881; bh=vBCSHusMthd3wYqtglA1rZINZLF8DuQCY7RGbljju3U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t7hNErgiY4hyromYyQJqjECycgsc6+bsHo8TXFOiggYLWXs7QZ5zYoItQPR2o55LD DPqradS2HivOgtdV3Vn5+KmHJjAxUSsteEWYRNTeHVXgna3qjwSXNu95IJ6L+ifpFe 8siAsScteK5Gl+sJMN6mjXV7S+A0aSyVTUKnnYdYzyZJSBoNAd5QZbOF2LrwonIfpL Aw9zv3iLT6ub8ktdBVQcEj+h6X+A/LYVzmiTbVdnAhH4ccxbCqtS5gHq/9BK2VJiC4 lxEGSrVGLJpgT2PjAEj3KuBUJ+REn+XD/idcs35h+NATXN84VXZiOjUm4e/cN5p/h+ SW66NSXJ1GsbQ== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v5 2/5] mptcp: add recvmsg_desc helper Date: Sat, 28 Jun 2025 14:57:10 +0800 Message-ID: <5fcd0bddfcdca24ebe9b0ff66cad0913235a4df9.1751093346.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 In order to implement .read_sock interface of mptcp later, this patch extends __mptcp_recvmsg_mskq() to a more general __mptcp_recvmsg_desc(), which accepts read_descriptor_t and sk_read_actor_t parameters. In this way, the original __mptcp_recvmsg_mskq() can be implemented by passing a newly defined mptcp_recvmsg_actor() to __mptcp_recvmsg_desc(). This mptcp_recvmsg_actor() is a wrapper for skb_copy_datagram_msg(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 37 +++++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 2f747ab730e5..2ebdad6b233d 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1844,8 +1844,9 @@ static int mptcp_sendmsg(struct sock *sk, struct msgh= dr *msg, size_t len) =20 static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied); =20 -static int __mptcp_recvmsg_mskq(struct sock *sk, - struct msghdr *msg, +static int __mptcp_recvmsg_desc(struct sock *sk, + read_descriptor_t *desc, + sk_read_actor_t recv_actor, size_t len, int flags, struct scm_timestamping_internal *tss, int *cmsg_flags) @@ -1861,12 +1862,14 @@ static int __mptcp_recvmsg_mskq(struct sock *sk, int err; =20 if (!(flags & MSG_TRUNC)) { - err =3D skb_copy_datagram_msg(skb, offset, msg, count); - if (unlikely(err < 0)) { + err =3D recv_actor(desc, skb, offset, count); + if (err <=3D 0) { if (!copied) return err; break; } + if (!WARN_ON_ONCE(err > count)) + count =3D err; } =20 if (MPTCP_SKB_CB(skb)->has_rxtstamp) { @@ -1902,6 +1905,32 @@ static int __mptcp_recvmsg_mskq(struct sock *sk, return copied; } =20 +static int mptcp_recvmsg_actor(read_descriptor_t *rd_desc, struct sk_buff = *skb, + unsigned int offset, size_t len) +{ + struct msghdr *msg =3D rd_desc->arg.data; + int err; + + err =3D skb_copy_datagram_msg(skb, offset, msg, len); + if (unlikely(err < 0)) + return err; + return len; +} + +static int __mptcp_recvmsg_mskq(struct sock *sk, + struct msghdr *msg, + size_t len, int flags, + struct scm_timestamping_internal *tss, + int *cmsg_flags) +{ + read_descriptor_t desc =3D { + .arg.data =3D msg, + }; + + return __mptcp_recvmsg_desc(sk, &desc, mptcp_recvmsg_actor, + len, flags, tss, cmsg_flags); +} + /* receive buffer autotuning. See tcp_rcv_space_adjust for more informati= on. * * Only difference: Use highest rtt estimate of the subflows in use. --=20 2.48.1 From nobody Sun Feb 8 05:58:54 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 E27E021CA03 for ; Sat, 28 Jun 2025 06:58:03 +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=1751093884; cv=none; b=CtKoEM+2AFNci7bE2qoBy7y1cZ0gHnoBO7Q9qGmfcOlkgja+ECbkZq6g0dvh3LTI/kb9iviiZs49CdYSVPTewWsiWth5ncG3d1Y2lwEO8Qgcu7IeK4wESTXYHaXoCDlESyWp8QrLBcJKbNmQKjeqaIOozNmJggnSqdqaLvSjnhY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751093884; c=relaxed/simple; bh=lE7qwDkioDbkRUHGKoyY63JeC7dhOFS9Z5U6KnVwmB8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sKyV9sAi7e65CVjYvkihZw09zL+LYZ+fgFDyiLnOJEIDJ33NUANdRWTA2DoiCJCMc7tzTt8/Lsc92IbilvcEofuaqwW4QaDTmVFAiUOszzf7fsRXUdPAHy4Jzib1TVESmPiHKZl88ic7a2pRQStKGNCLopZKw5F0ioi2ZhXKcps= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fPWVwufx; 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="fPWVwufx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55F8CC4CEEA; Sat, 28 Jun 2025 06:58:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751093883; bh=lE7qwDkioDbkRUHGKoyY63JeC7dhOFS9Z5U6KnVwmB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fPWVwufx62sKDaQe/qL4M5/JyXeGAJUGyMaDzcy5Kkt1GoiotJm/Fig8PRoMIIxUp iwTW9L0mQcvgDKJbXxGtJo6oRfK4zbrvvI2evg9JUcsAaCKQTbZRyHmO+e4VTrTa3L FdhcWAMSRfchRrJv3O46VT7cDB+iP7SJF6HhGZAYLcLF4y6h75j0Ig9aq8YlQ2eLQM 1rMgDQacDeJjQkZWTabJ9LWgF5TAO3wb5QEm6zjVhUG9ZH4i0HiuP5El5qrrbC/1KC Symm4fDwd5AgIlIZkNrXqrEWS9cC+Z6Np22g7vbQYD0YdzXx9SfrGVZ32Y25yeVCaQ WWlU6jM+U6STQ== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v5 3/5] mptcp: implement .read_sock Date: Sat, 28 Jun 2025 14:57:11 +0800 Message-ID: <1beb923fbaa782f2ddd2f97c5028425641e244d8.1751093346.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 using the newly added __mptcp_recvmsg_desc(). 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. v5: - use the newly added __mptcp_recvmsg_desc. Reviewed-by: Hannes Reinecke Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 2ebdad6b233d..1a1cfa1ff376 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3985,6 +3985,33 @@ static __poll_t mptcp_poll(struct file *file, struct= socket *sock, return mask; } =20 +/* + * 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); + struct scm_timestamping_internal tss; + int flags =3D 0, cmsg_flags =3D 0; + size_t len =3D sk->sk_rcvbuf; + int copied =3D 0; + + if (sk->sk_state =3D=3D TCP_LISTEN) + return -ENOTCONN; + + copied =3D __mptcp_recvmsg_desc(sk, desc, recv_actor, + len, flags, &tss, &cmsg_flags); + if (copied > 0) { + if (skb_queue_empty(&sk->sk_receive_queue)) + __mptcp_move_skbs(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, @@ -4005,6 +4032,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 { @@ -4109,6 +4137,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 05:58:54 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 904184A08 for ; Sat, 28 Jun 2025 06:58: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=1751093885; cv=none; b=quTjge8h9gT0b7LQqa6DWqWW1juGOK+oS3cXeJlesi9jD9u+VrYMxpx6vclCJK8y/CJVRDy9xwyLTUier33g/rn6ynCndJb4o6xBhBLQePpFHwdIhFNaQydBPeNCPW9hYddh/L0rEbYiD8Pgh9G4M+9a87yyUc0J6KUMVuYrbqk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751093885; c=relaxed/simple; bh=OXE1AbtxVH9Hj+m4RuvIjuM0TYnpxQbR7eBWUYi84C0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WhnwW3AB1zTFjQwBeGj1fS4gdmOTgxsTASEO2m2QcqbRvz7qYChxTBu/5RG1GdyLRfg/91GoDyzTF7FLQGGbuD4N0fQZ46tT5M5th4X3QGOK3EO3zgDhaEta/T9Wt1SvjStDSjtcB6ak7u4lUs6XZlhma7+40P9znoyObF5qcO4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=j7S5Jp2n; 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="j7S5Jp2n" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EF8B2C4CEEE; Sat, 28 Jun 2025 06:58:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751093885; bh=OXE1AbtxVH9Hj+m4RuvIjuM0TYnpxQbR7eBWUYi84C0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j7S5Jp2nlGfTJXd1Gyq8HZrkj0PxiKdUij36wfKc5m/s4NQJf90/v0rzK2CDaj4Y3 z1EmKTEPzlmqxL1ajDKEVfCdYR7S3PWs9bHFyUK5P0tC0ikhygDkypIyIgdSoqvfyC SPCVDo4f1lFQvdI1Ag9SwzzaqOziROHGRYyGUXzrqDJftDTpnPml0Jm/TeFz4UASWg a6C6uovwkDrZvS/RtPB5sBuWUs4Y2kdFgrMTIV7EBtnrqWsZCtWjcqcCCFFGOe3vye x8XawX7I2Zqi96S9/tGneiRd8E0WcGWGDEsscluCKzg5ZWwKx9WWO+1fIkBc+McTGh F/LxqHLJT+u8A== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v5 4/5] mptcp: set .splice_read Date: Sat, 28 Jun 2025 14:57:12 +0800 Message-ID: <2074c7e5977c170bf5d2cb990bc2523130a9cc8d.1751093346.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 sets .splice_read interface of mptcp struct proto_ops as tcp_splice_read. And invoke .read_sock in __tcp_splice_read(). v2: - use INDIRECT_CALL_INET_1. Signed-off-by: Geliang Tang --- net/ipv4/tcp.c | 4 +++- net/mptcp/protocol.c | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index c18682c3fa33..97175b75796b 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -774,13 +774,15 @@ static int tcp_splice_data_recv(read_descriptor_t *rd= _desc, struct sk_buff *skb, =20 static int __tcp_splice_read(struct sock *sk, struct tcp_splice_state *tss) { + const struct proto_ops *ops =3D READ_ONCE(sk->sk_socket->ops); /* Store TCP splice context information in read_descriptor_t. */ read_descriptor_t rd_desc =3D { .arg.data =3D tss, .count =3D tss->len, }; =20 - return tcp_read_sock(sk, &rd_desc, tcp_splice_data_recv); + return INDIRECT_CALL_INET_1(ops->read_sock, tcp_read_sock, + sk, &rd_desc, tcp_splice_data_recv); } =20 /** diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1a1cfa1ff376..a8de9ee45aa5 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4033,6 +4033,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 tcp_splice_read, }; =20 static struct inet_protosw mptcp_protosw =3D { @@ -4138,6 +4139,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 tcp_splice_read, }; =20 static struct proto mptcp_v6_prot; --=20 2.48.1 From nobody Sun Feb 8 05:58:54 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 02B554A08 for ; Sat, 28 Jun 2025 06:58: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=1751093887; cv=none; b=cZvwiWea+wixHZfZdldgWGBjgoolPKLgiyizXt3rdqxLGF3i6+weyxd11mPwm7aMQDEvtqVAntg0g3M/fkIo+7ENFnSAwYVW6jVpUnQ8zKnre5olPN6H6+Cgl8QN0QTflvOl43emeIDXkpRw9bwNtcNPuLYUm4tsWgwSIfpsEg4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751093887; c=relaxed/simple; bh=bhuC2TqYyeTrDbPGob8gPdZZn5KwfuDrY1y5UaLO+bw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XBUWlwU7XLh0a2YUvJTYq+veBQWijv4sidLTFSxmUYiFY1wT/UJdavfUhWVyyWI8k5rSioP9nDP4qIZCkxYXeSBFE11VNOaEYakwnwMpztpCjsexliRs65J1cfoD5E1+2zy+nDYnLor38mMWX8VUm/0zNmcOI+8HoYw8j4pst+k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NzSxO/GP; 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="NzSxO/GP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9873BC4CEEA; Sat, 28 Jun 2025 06:58:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1751093886; bh=bhuC2TqYyeTrDbPGob8gPdZZn5KwfuDrY1y5UaLO+bw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NzSxO/GPQqvs1eK9gAGr7LZh3v0RA6ZoCvctxpDKxfbupBlc4Y4zs2KKRPLcDGjNS VrFil+PnWKbbMmxo8u9kIQjucvxNGZ6ZWtIakoqDFOpwQVTj5MhviJkcQkEwy3l4AI fqzCYgAjUzRx7FXQiUlI+nOqVksCcLInCgPSPQrZ6uwCdIzNhYqHTAWlysV+3Ycgav an9qMHJXytoe540DhZdeNGqp1FUc8yqYuV7Ll5e+rZtvb/UOI9oe8oJwExFrTfEH43 j7WzODqnNB+xmDqQpUkvVIpoW6HwBCOGDk+8dpR0HyZJexCVO6NH34XxCRHz9Zhe7C +p3VpgWICB/vA== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next v5 5/5] selftests: mptcp: add splice io mode Date: Sat, 28 Jun 2025 14:57:13 +0800 Message-ID: <9d593d11dbe5aa772957a7f0ab7c27c8eac73eea.1751093346.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 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