From nobody Sun Mar 22 08:10:59 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 031E7371CFC for ; Tue, 17 Mar 2026 09:41:52 +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=1773740512; cv=none; b=KVq4H4q/DWLVUY7w/mHiDQV58mKYbMCupGCBJ+4TflCvLc2s5zrBfIxhOYnCAULbj/o9Aj/n7ewmHlKw9JsiVp28Mby/k/2PKLCAkzgfLx6uuO+1FPHek5/0mi1lB+Aq/3pGPT8iPlQDeKUNX/1CQy8bPdlKe7RCdoFhkjivfhg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773740512; c=relaxed/simple; bh=0JD/xP3fPHNwI9KH3JxQenrEEIm10rhTRKU6iDLLfz0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cLlFhc+G/SjTCFx7lgfDsxQUynNVJbkudU9P8kwmu2ItC9o9ucx/vSzbQgZLSJVSyXvovoi6hn0pdG0E1n7waRpQp/eG2kNMYRyWZOo4Fs2N5df6EyiNzBEkCViERoUMaPM8YJIuk2fnLdXwfwobYSoabkFtXqU0dT6wfEna2ok= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pV6woyWa; 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="pV6woyWa" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4E64C19425; Tue, 17 Mar 2026 09:41:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773740511; bh=0JD/xP3fPHNwI9KH3JxQenrEEIm10rhTRKU6iDLLfz0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pV6woyWaUEhb+pmF7BY5ULsP5JjXlwOlK7pmJAJoDEpQWl1dZmJgcyS3S+XFqo/YW gBrH/Za/2BMMy1G9UwmDXAY4Q1jnz8ulHbaDt7Z6+Ll2H5KQ+10FA28eMFQVlcnnDf 4kTnyY1D/ZfFV24uCg41dcvMBQ3I0NOjeyMVBpACMERAeRTYsdkLAjLkdEIGHQTYnX f1CAUdLoYMvyR2/ZwwY0rewmbcLi/lVs77rxW+TaFwiQFRcZHj8fZqatZ1DurGNj8N WK0w8VhLT6Gv4lE8xPqSitoqyy89YbSrCA5KPXDDa16aiF+YfPpUB3TVVHcjI9zfDc 73/FU7jHPD3JA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [RESEND PATCH mptcp-next v2 1/3] tcp: export do_tcp_splice_eof Date: Tue, 17 Mar 2026 17:41:26 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 Extract a do_tcp_splice_eof() helper from tcp_splice_eof() and export it to net/tcp.h, so that it can be used in MPTCP. Signed-off-by: Geliang Tang --- include/net/tcp.h | 1 + net/ipv4/tcp.c | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index f87bdacb5a69..af2e4b61bf23 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -370,6 +370,7 @@ int tcp_sendmsg(struct sock *sk, struct msghdr *msg, si= ze_t size); int tcp_sendmsg_locked(struct sock *sk, struct msghdr *msg, size_t size); int tcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg, int *copied, size_t size, struct ubuf_info *uarg); +void do_tcp_splice_eof(struct sock *sk); void tcp_splice_eof(struct socket *sock); int tcp_send_mss(struct sock *sk, int *size_goal, int flags); int tcp_wmem_schedule(struct sock *sk, int copy); diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index dfd677c689ef..2ffad80c1c28 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1469,9 +1469,8 @@ int tcp_sendmsg(struct sock *sk, struct msghdr *msg, = size_t size) } EXPORT_SYMBOL(tcp_sendmsg); =20 -void tcp_splice_eof(struct socket *sock) +void do_tcp_splice_eof(struct sock *sk) { - struct sock *sk =3D sock->sk; struct tcp_sock *tp =3D tcp_sk(sk); int mss_now, size_goal; =20 @@ -1483,6 +1482,11 @@ void tcp_splice_eof(struct socket *sock) tcp_push(sk, 0, mss_now, tp->nonagle, size_goal); release_sock(sk); } + +void tcp_splice_eof(struct socket *sock) +{ + do_tcp_splice_eof(sock->sk); +} EXPORT_IPV6_MOD_GPL(tcp_splice_eof); =20 /* --=20 2.53.0 From nobody Sun Mar 22 08:10:59 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 C6243371CFE for ; Tue, 17 Mar 2026 09:41:53 +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=1773740513; cv=none; b=Lard/IkoOZ1S8X+NxkbsQlj5rsSMX5Vjf5cgE8WOHmURc6MJumKaAPTMIhyItK0vegww6oK2BOHoSSl4ZkcYbczRyRw1+poTJboCmVHmGJ+9TGvfiitS3Dh7lQy81yKq6Rey4EUXIwjsuH/nhzh8FQQhibnd6iyfiqQ6/3O4pCI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773740513; c=relaxed/simple; bh=jTnH2QoepueJ2x5uSuq0yrNfahpgJYxJ7NDC2NmqbOI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XQL9kFdCoh52HNnaPHnSGdtQ1JYm44AJ6OQ76oY2fP5mtuUWSWZDFOeAb01mTEnV8yc0guzw8ijvJ73G1GKzwg54mXRgzMcgC/HOJWanlnRtb8uz6d7cdGMceF+KMvn2KRawBtxJkpMgA8DZs8CvwLXZO04E1KETeGlgnj2HLR8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Li4rqMAT; 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="Li4rqMAT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DEA5C19425; Tue, 17 Mar 2026 09:41:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773740513; bh=jTnH2QoepueJ2x5uSuq0yrNfahpgJYxJ7NDC2NmqbOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Li4rqMATJmwYC+BqMQWV5SsEDxR0H+VDgDh870RWY1OOMD4EnxRurK0xwQXyQMjiK Q4ugMLMQTs0d4IJRtXkKEIVQUFsP0gXzPTmiYXls4X5HpwU3/pmASw1BbP9CPXJDnP nrwTKwDos93oH494G2yv/twkr3u7VLja7flsrrIQ0cchhpQGaxVbpF8IkVfijj2J9Q 14lm/eMYon8CWbUxTml8X6uq6/IvYOvET+jQx0rXT+1Wpd/hpiGOQ7UF62l7Ux8U+O EfXq94rzMeausCgM+fSgyFSRgAXXmYIbrhbFk9lSXR7CtPhbD9bCaqMKuO1eUT3pUp h5DVl4a3sOkSg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Matthieu Baerts Subject: [RESEND PATCH mptcp-next v2 2/3] mptcp: implement .splice_eof Date: Tue, 17 Mar 2026 17:41:27 +0800 Message-ID: X-Mailer: git-send-email 2.53.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 the .splice_eof interface for MPTCP, namely mptcp_splice_eof(), which calls do_tcp_splice_eof() for each active subflow when a sendfile() operation reaches end-of-file. do_tcp_splice_eof() flushes any remaining data in the TCP send queue. MPTCP operates over multiple TCP subflows, and each subflow may have pending data in its send buffer that needs to be properly finalized when splicing data through an MPTCP socket. sock_splice_eof() calls the .splice_eof interface from struct proto_ops. To maintain consistency with regular TCP behavior, the .splice_eof interface of mptcp_stream_ops is set to inet_splice_eof, which will switch to the protocol-specific implementation (sk->sk_prot->splice_eof) - for MPTCP, that is mptcp_splice_eof(). This is an improvement; nothing was broken before. MPTCP previously did not handle the splice EOF notification, while TCP did. Without .splice_eof() support, the queue is not flushed immediately when sendfile() reaches EOF, but it will eventually be flushed after a small delay. Suggested-by: Matthieu Baerts Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index b5676b37f8f4..ee6d5b4edd1e 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4020,6 +4020,27 @@ static int mptcp_connect(struct sock *sk, struct soc= kaddr_unsized *uaddr, return 0; } =20 +static void mptcp_splice_eof(struct socket *sock) +{ + struct mptcp_subflow_context *subflow; + struct sock *sk =3D sock->sk, *ssk; + struct mptcp_sock *msk; + + msk =3D mptcp_sk(sk); + + lock_sock(sk); + mptcp_rps_record_subflows(msk); + mptcp_for_each_subflow(msk, subflow) { + ssk =3D mptcp_subflow_tcp_sock(subflow); + + if (ssk->sk_state =3D=3D TCP_CLOSE) + continue; + + do_tcp_splice_eof(ssk); + } + release_sock(sk); +} + static struct proto mptcp_prot =3D { .name =3D "MPTCP", .owner =3D THIS_MODULE, @@ -4051,6 +4072,7 @@ static struct proto mptcp_prot =3D { .obj_size =3D sizeof(struct mptcp_sock), .slab_flags =3D SLAB_TYPESAFE_BY_RCU, .no_autobind =3D true, + .splice_eof =3D mptcp_splice_eof, }; =20 static int mptcp_bind(struct socket *sock, struct sockaddr_unsized *uaddr,= int addr_len) @@ -4542,6 +4564,7 @@ static const struct proto_ops mptcp_stream_ops =3D { .set_rcvlowat =3D mptcp_set_rcvlowat, .read_sock =3D mptcp_read_sock, .splice_read =3D mptcp_splice_read, + .splice_eof =3D inet_splice_eof, }; =20 static struct inet_protosw mptcp_protosw =3D { --=20 2.53.0 From nobody Sun Mar 22 08:10:59 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 5ADE137186D for ; Tue, 17 Mar 2026 09:41:55 +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=1773740515; cv=none; b=WB9PjK/Gs39APiNA12tePm3CuZCedQQw5bryOnscQs7YCFtdtCXltTgMFoTxQfnJ1sDUxtSCO/fmvEE9HsloR43VMF8/9gFCiSBgQBO4lS4gNiIwJFMs+mzAXP6YuYrzhDasD7cTkJ6wPSmTLfu3qFe6k1pz/lMZPZD/qxVo3JU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773740515; c=relaxed/simple; bh=z5fO9bg/cYr8m0HygbzqjuIVQBLBljSofvsf7SuMMWA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eXhpOOnxju/00uI4c5BZASVFARTREMPBot8sK751TR6AUbbEo9A1vlSmuKgqYZqTMm2mf3Au05cUh9+3KwcO+jitlTDlb0RiVfHtoRaDAaDaaiv0Ud5unLW7tlqpsvt2TPEi4T60rFOveWfAHKe3U1gAvzD6pu5CpBX2w3opiaE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=bcptMqfk; 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="bcptMqfk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E499C19425; Tue, 17 Mar 2026 09:41:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773740515; bh=z5fO9bg/cYr8m0HygbzqjuIVQBLBljSofvsf7SuMMWA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bcptMqfky20krL3bxqbAGug0mRAicuP8Dw8cdg1OqJtRqdXG0KyXSrH8OtnpOIcqy JIXlr2w/ptLd5jv1IED/0JvX7BiHglObVZjAm6RzC7vb0wT370NK5GlSDTygu+5+gK 5GOX6kV9N6r5XuhNKvjnopl11VeZkqrQE/UOPwCTFdsHPSoqkXiCkKVwzI2QREPPlo 2q/QLYnossaTnQTkAs9oMhUESQRz7e2Y3w4aLvU0Ti6Gijxcf3ASSs6Zvl/e4M9t/W kPQM+hfwOS04HAX7oPP80DuBA3RN2WTa2lOxYjeIQNPWUyjdsnoGyKpwIk40GaMqoV KQYr6OxU1ZhXw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [RESEND PATCH mptcp-next v2 3/3] selftests: mptcp: connect: trigger splice_eof Date: Tue, 17 Mar 2026 17:41:28 +0800 Message-ID: <4e535245e10938fe4004b03fedb5f9f31b0be714.1773740361.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.53.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 Increase the sendfile count by one to ensure the transmission size exceeds the actual data length. This triggers the splice_eof path in the kernel, allowing the newly implemented MPTCP splice_eof interface to be exercised during testing. The change from 'count' to 'count + 1' forces the sendfile operation to attempt sending one more byte than available, which activates the end-of-file handling in the splicing logic and ensures coverage of the related MPTCP code paths. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index cbe573c4ab3a..2aaf3ed11315 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -870,7 +870,7 @@ static int do_sendfile(int infd, int outfd, unsigned in= t count, while (count > 0) { ssize_t r; =20 - r =3D sendfile(outfd, infd, NULL, count); + r =3D sendfile(outfd, infd, NULL, count + 1); if (r < 0) { perror("sendfile"); return 3; --=20 2.53.0