From nobody Wed Sep 17 16:41:22 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 26198C2D1 for ; Tue, 2 Sep 2025 02:35: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=1756780511; cv=none; b=q+uUesZhJot+8h5Czx9fhsSYNFDX9F31jtt2fcbDT0etAErn7ld/7OJlMUUq7HOazkHPDhRxpos+si/jcX8bXsIY5PCesJvTZIOIL5Hb2OEREOWXhz5OYMgUh8eGmYnHK8UfrKPPYXUHq+fHV68MBaW6w5nUn89fWupBc4bKJFY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756780511; c=relaxed/simple; bh=IEMEG5vNolCn6n0KvAjIuxW02rVpbAEkNBU19uB0Keg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Tr9iTz2FkNqf5h+pEGakDxXa3kdhWNKC8q1WmpfgwooS5sPMtbQcs60+1Fj/eGfTXjMoIwGS9sKfNCNTM0C/hHADhrAmKxFvetjus93YMxbMRUWWYYY/7sdF95wZA3oqd8JY5pDfjZqOcmjh2FEYbs0Wunx3p14RfEc68J19NfM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VjzF0azc; 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="VjzF0azc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E8CAC4CEF1; Tue, 2 Sep 2025 02:35:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756780510; bh=IEMEG5vNolCn6n0KvAjIuxW02rVpbAEkNBU19uB0Keg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VjzF0azctH2At97zXdIR9twGiPDvBJSWxM4bgnnAA5g7A/BgQ3jc1G8i88zcw33Pf cFYYT7MdTVF3ZgWRlyLdjC1sgdT1JSGC/uMagD0sdbZuzjtQpkmUC/o7FXHeBMTLqq PzVoFCuiLwBzWBCW98fWKwTLfcUrsxbJRGGQ4hGjdtAmV2+nesngX9xVoxx9RW9zO7 DQ+Yav5eYJgDeHBSoH/cRAwOQkB5/Aui/RL+YX4RtWiticBAUWtUalZwD53+G+8UeM d2G36CWQVFQl8u3alKHXsGOk5lzRTxDxhHJ/N+VYljL9ru0FfdxJWOixrN5MXV/cZv n7Nk6MVGn2mAA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 1/9] mptcp: add eat_recv_skb helper Date: Tue, 2 Sep 2025 10:34:52 +0800 Message-ID: <8e91efd0a1a38a7892f7fbe5b075e3749af377e1.1756780274.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 1ebba0ef4321..df82584a6f7a 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1888,6 +1888,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, @@ -1930,12 +1939,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:41:22 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 E4CDBC2D1 for ; Tue, 2 Sep 2025 02:35: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=1756780513; cv=none; b=uhYP1TevjsWRvkn6B+8jXONXmdjWOzfpGPEY1i8XydPJwxzcXcta2Gg4KKINb8KvMKY9JYOLqjMCLRHpiBa6XXgI6Z99f+NYf5n7x8lIk+V9WjgUzrizlvX4NDD6GatsjBRcNYRl9hVk9d6YN2Xb0BLEVpE0LDkrDEdriRtE3wU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756780513; c=relaxed/simple; bh=Pykskwwp8qZH4CptxGNkVBFJWN0QF4c7cXkxDCazJn4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RCZXGAUNZGzLtzBm4l3H7KIYM4a0D+sA6RTmLA0+lzA7p3aEY7lgQHGik3W6xSAHehMDGwgL4UUmaL4yDS+gppyKUUxr+nQOAXvkChMULsCMA/4QUKEoA/IRkVQboOrETvW8QjTN2Nk0XxFLQ+EBOhk9M31FNPxRgPHxkJCMvD0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VUVsan80; 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="VUVsan80" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 369A8C4CEF0; Tue, 2 Sep 2025 02:35:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756780512; bh=Pykskwwp8qZH4CptxGNkVBFJWN0QF4c7cXkxDCazJn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VUVsan80VXAzC7ul44M2vhSYEB7fCQDhCaSlnQX80/m+1JFaHSpNULt6ohmiFFcwI UZRZEHL7aCfdvJBuPdB5YkUpLlO9vy9YZEb2hl34mDfabjNUAlusuhVqvC9WrN0Ky7 NR8snZi2MHTDGGjtoONbLUMxZmTvTUSAvTzBgjQMxih6yAahrUrBKLN4GBm4d1VsFl DRd8SC8Ewxsz9Q/229AvfzKe48V+F7bv37qq53hbDYbmD1bHWMrZSodVi13bvXtijQ U8pS13X4sR79ZmUJyRk8CGvjSLVwfTudexkoVyMLNLWXuYc9RS9rx+ms07W52uvCD0 RbHbkFHGqUKFg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Hannes Reinecke Subject: [PATCH mptcp-next v10 2/9] mptcp: implement .read_sock Date: Tue, 2 Sep 2025 10:34:53 +0800 Message-ID: <53276621ab42624e6a6ddb58869eabfb049b87b0.1756780274.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 df82584a6f7a..f55185410e5b 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4039,6 +4039,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, @@ -4059,6 +4131,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 { @@ -4163,6 +4236,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:41:22 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 122F9212F89 for ; Tue, 2 Sep 2025 02:35: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=1756780515; cv=none; b=UyNWvIUxPv3WbhpZLL1lK4XnUo1VwvZQYpq2qR0OK1lrTWAJMBGoCNsFxopyuvJjIewJ+ukKCrp9oeoZ9FAXzSjEukY5JszcOVHp0KNvfgSTSl3BAn7cbE5jjBwzKXkO4oEknknoVS2ITQHhpsAh82mZomkP/4oq8swLKOZMZyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756780515; c=relaxed/simple; bh=moMuiFOgVUkY7ROKiCerLa/pgI+I7obr2rAWzku1UgU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pwf3TiB+NMoCPTSiTBGQtB+hLW4YpoLJQYhNFBMn00kc8DGyGFqstIGiyBcvf+x3Lfqie5s+lsKKy97fHLFs3VZEXuhsIXR9j5atT4lSikYhwfCy6FIZFh5Sx+GjUCbou8msESyb5DhRTeqZNxDqvJKjhL2XjYpc8Jdp+BUz11U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WtTd24wJ; 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="WtTd24wJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 58F7EC4CEF1; Tue, 2 Sep 2025 02:35:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756780514; bh=moMuiFOgVUkY7ROKiCerLa/pgI+I7obr2rAWzku1UgU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WtTd24wJshvFcjWdFxnXFFXPdPOfKSxWN8VObqBUfd09jEsfWGHHfcYKjez8m83DU xGaKgB/1wSZJMlmQbWGR9CFhzn2KpbzB5BfdxIYzkfHbcdtFwfjCh6phNPoc1cBwk6 j/OJgCEW7nlESHmPIIAs4dZAjEjx5+cL0sXJTy7XhniRWGJn4OetkzN8wJ1ivRRnIl TqiHujt4lW9lNU3UnK4bokLij9DhSYtw3Ag8Dj6VZ8Cq1O/zdwWAhUIJewsUS9/plo XRvmNERZtpchfTfKrPmsNlhrJynGr5dZokbButYM9OgHncUaaWVGMo/960Vr1Zt5iF M+IO8TVVFbtiQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 3/9] tcp: drop release and lock again in splice_read Date: Tue, 2 Sep 2025 10:34:54 +0800 Message-ID: <89fd2ab6630a8aceceef58273faae8db195ef2e6.1756780274.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 the main loop of tcp_splice_read(), release_sock() is invoked to release the socket lock, and then lock_sock() is immediately invoked to hold the socket lock again. It looks like these two calls are useless, so let's drop them. Signed-off-by: Geliang Tang --- net/ipv4/tcp.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index c9eb94a6c41a..c6425f13afd0 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -866,8 +866,6 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *pp= os, =20 if (!tss.len || !timeo) break; - release_sock(sk); - lock_sock(sk); =20 if (sk->sk_err || sk->sk_state =3D=3D TCP_CLOSE || (sk->sk_shutdown & RCV_SHUTDOWN) || --=20 2.48.1 From nobody Wed Sep 17 16:41:22 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 0571D1DD525 for ; Tue, 2 Sep 2025 02:35: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=1756780517; cv=none; b=KSSIELvCp/Fqb+xUFkdXUXuSG8x/Vx81cfC8EHtA0h9gqBVbyx1UksBrZOMzR4ALT6fZOHrVtCZu7fX+jHnSpCagl+aE9mTNDYTTbhzbeWBMIGxCwlo59622mQMxjswp3pdzaEl0x/MMbnJG6WrhKrS/x3mulYXd1w+mwxM23gE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756780517; c=relaxed/simple; bh=D8lHWzzViSsdNsAtrgt+yazAoAjdJ1bTrKazNqCAKRc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dFUIuhh88j02B5EPVeXMnJLsz1dfov6X/A4oY8/ypkr9WnPPIGuqfnEA5S3oJgboU9x9peBNYiattfVK19t/Lhcuen+hF9vZi8r+ZA6Xg8dWmI5HW2aU+SzT673P7/Bixioe9QhTZtIoessoZzOzjAGfVvMKRotBQ6mThR2+ti8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=h8j5v9Pk; 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="h8j5v9Pk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1B0D2C4CEF0; Tue, 2 Sep 2025 02:35:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756780516; bh=D8lHWzzViSsdNsAtrgt+yazAoAjdJ1bTrKazNqCAKRc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h8j5v9PkQM9/fApi5g9c2wCsTrotqdNNiQTy0gNZqCfaRHpSEfgTCqKXSXN2Zz3q2 g/8I+gDWl8J2EPrUZ3Po8dQ1af6o1Vlp0FUM3YG0O7dIaFRsUag1D7o5Aj9jL+YUM2 YmNp0/UVjnLmbbKyM1iSmsC8+i7eXt+ZKB4BViv4ZHHV3aFqhslY3J/2auYehBWV9I TohVCMPUtLEAvFkzd7O19HOvdIlYVQMFiGSJGkvnfF+Gx6LqptgibSjnKhADXGB39d iSzrcfidPXO1nhQnqDgC1E3k8ennGrSeUd7dZ1CFjFt++yBONcaBIqzw2J4LPmMtGv PYp7uE0G2OhyA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Paolo Abeni Subject: [PATCH mptcp-next v10 4/9] tcp: export splice_state and splice_data_recv Date: Tue, 2 Sep 2025 10:34:55 +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 16dc9cebb9d2..d48555d5f792 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -258,6 +258,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 c6425f13afd0..a1fc0a42d089 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. @@ -757,8 +748,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:41:22 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 3817E212F89 for ; Tue, 2 Sep 2025 02:35:18 +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=1756780519; cv=none; b=UL6V4tr3J16+OaTRbIo5BjLcm4KTIFD2GyBmyeWt0/0H7ynRpXLQAlbZCXel1RecyeXNEiB7fnRSc6Yy2x8GHPCGKZVhgsVmBQ+4ojaHFvmeX/avGi0KJaSzSlzchx8dCDa+MsuimwpnBvdm0u6KtAInSbuR+Md1dc5NCFI1fKw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756780519; c=relaxed/simple; bh=x08RRAO39Hbjc9cKpNMVH9Tgg48yHR1VgULKidF1Wrg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZRRV/a5yAL7gxB5OZFwa3STUHfmS3mfEz/I2o3ts2tEAGbpTIr1JQ+Km1JGCPD3/ISaQMCHETX6BRJfcfSoTHfNdROvFCp0l8gAjRypuddFhldhwynYUUaQ0B77suBCKEpniICDgI7i7+Qsnu6hBYpePvD03cZORtMW4YQnqtgo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=i03eXJvV; 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="i03eXJvV" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 259E8C4CEF1; Tue, 2 Sep 2025 02:35:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756780518; bh=x08RRAO39Hbjc9cKpNMVH9Tgg48yHR1VgULKidF1Wrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i03eXJvV/3lAjxvxwOSHgsrOTkwrzNnfheKjt9BCeoQTbwSSkjuXAA/zYLsRbV8Ro 4SMQyBpp6eMCDGNz1q6fgRodM5l/pUYSin3CwFar+hh1gn+SHPJ9Ar5H9UWuJrDqVB +RKAw1mTpZWlY0bqRwWdH/MW6oyyNPflni7JQB/489JXLPfrWesbyUTPpK/zPK5lLB QBjavgAbd8YE/Y8n/G5U0VOVmELpHhX3t9sYYFtGrdZzV8WXDwD8rFaXcOWChQG+qx F3Slk0AkQst2nfFH2OVw7VoLzWK7iTeeUVTnXLKJAQh7SO11uQyHy4MJ8PGjI3+l6N VcM8pKCFOJrcg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Paolo Abeni Subject: [PATCH mptcp-next v10 5/9] tcp: add recv_should_stop helper Date: Tue, 2 Sep 2025 10:34:56 +0800 Message-ID: <6dbd1609cfd20f98810f3793bdbb9dabe1c0ade8.1756780274.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 | 75 ++++++++--------------------------------------- 2 files changed, 35 insertions(+), 63 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index d48555d5f792..530fa57ce508 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -270,6 +270,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 a1fc0a42d089..22619dab7a45 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -796,7 +796,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); /* @@ -817,24 +817,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 @@ -846,21 +832,15 @@ ssize_t tcp_splice_read(struct socket *sock, loff_t *= ppos, 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; spliced +=3D ret; =20 - if (!tss.len || !timeo) + if (!tss.len) break; =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 @@ -2697,42 +2677,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:41:22 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 121B61DD525 for ; Tue, 2 Sep 2025 02:35:20 +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=1756780521; cv=none; b=cxRdiUrOH6PniuRZ+RflBwzyRwumWMB5SEXIWYffski9JSOD3ODYRLW1hdRYN12Di/Km8DXgjWw/6HjJj8Q/E5fSi/RNNxbSjRE9JhvprOAOm7vR8eLMZwYfxYL37qM5lccx4CdtB+SCaMJ5VyrzSku1JfY2bm0pfdCB+ow4z5M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756780521; c=relaxed/simple; bh=OqnkOlsEHCJSZsIggXb5XZujaunSMz0Dpd8INTwLyfg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Jpo5Y2Z9rpDBCP5cy/i9UZHH9o0cRPAqPahG5H/0W0VB/AkjRHp3/iS6QpOK2zc6GrknWgZ30nJEpBU/T0ihfAngv9x4QbgmlX/2nvyXz4ikIbPLdykxSGLCDJMZUiLfBbArRTpUgZdn7+iDjnWdUX5TlIbl2BBAJcrPuWKdwms= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=DWxVndA9; 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="DWxVndA9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 63B35C4CEF0; Tue, 2 Sep 2025 02:35:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756780520; bh=OqnkOlsEHCJSZsIggXb5XZujaunSMz0Dpd8INTwLyfg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DWxVndA9ovpf8hKUjQGbg2c3fpUm9zbeXRXfHHCwKaFD8GBog85I9c1RbTJNmK0JP NSIRGBZLtCgHys50M+yUidd3EgOTjsO8QI3DgL42Ms4vb0qKNQ80dV1XDt08i2rmgF 1l334BzBR9ReS3C4IG71haRFm7jhOLBe9+rZb1e5eyiiNBua4CslrjvTaW5h9Jr8t/ aBvs6BSa0hu7lYXZDnKOy4SHe2Y7U335wOgsL2HXv9Bd1Uy0nzRdDwRu1OzNVBppVb aB0DiSv+bzbOE9rylGQ11i7QUc2/lSV62yn0LnHvNl82kTgiNAKmcJfxIce00TQDm7 EuXllD3Q/2bHg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 6/9] mptcp: use recv_should_stop helper Date: Tue, 2 Sep 2025 10:34:57 +0800 Message-ID: <96089b8fef2d353fc9e0be055e8659a6a1b572de.1756780274.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 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 f55185410e5b..6574f82d59d1 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2183,20 +2183,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 */ @@ -2205,20 +2197,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:41:22 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 7957A1DD525 for ; Tue, 2 Sep 2025 02:35:22 +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=1756780522; cv=none; b=XeWh9zpHgJSXrKxjqPhr9HC2+WOuNZebS8yK6fPvYVMkzqSnUg/9HQpKT4rivgmZdZDKZGFeVIIKKEZJoXGVyev/hu26Xwpn3ow11kYlJ8z59epB64Mgb8Jkw+9ZdY9Y9jLLVjJ3GysJmh7jlVmXgX/Vrew90OZ2PLSupMXJhAk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756780522; c=relaxed/simple; bh=yfXO4ZsIU3Kz8fb1qvk/4Haa+fTI/j58yLruc1EZ3/M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=i7ZcJXGyeSG28R6UJLOAD9srgaepmDK6PN9lMJEzkcSjB050GWyvVH+N80yI7722+3VAvZTi5cajEjQK5Mu+axF1QwcapeSOMm+Tj0FnZrRv07rY8qDKt8rN/00rWHbn+pr81yXmzgiyPU2h3vxfjDAe7LMdHvIWe+qwdEv2GIs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=AcoiXquG; 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="AcoiXquG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3CD97C4CEF0; Tue, 2 Sep 2025 02:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756780522; bh=yfXO4ZsIU3Kz8fb1qvk/4Haa+fTI/j58yLruc1EZ3/M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AcoiXquGUIZQhSl4nlkBdIekJCDPS4ITFCPDm/W0I7w/a+LTfs5nMtCiqu7zO/r9v 3wtJJcCDivkzm/Sq1w9MYPtTwlK+RAswAlNB651kuF+E3CLqqKgrCM//Rw/7RpbDr/ 4WjASjkx2gI+JHkC051A2d3mNNfmypmolkwDaQdiEEiCZqUdY/UBal7TDSxxY1gw6Q gjBYgaMtCipgzvu/Ds+EyG7kCuahmtC+zBrqFYBhKbAdHIrR4Th0PGrt+sQYdksGZL asbtt27osWlU6b9obiG6Pc2Ht2Mk1IIckhomh8/xVqUHVQ0hEaopZRF+mKOymvlyg2 yI6niopixivEw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 7/9] mptcp: implement .splice_read Date: Tue, 2 Sep 2025 10:34:58 +0800 Message-ID: <3ec04ed0947b753b7b1c5a3a201aca4cbc3ee5b1.1756780274.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 | 94 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 6574f82d59d1..701295f6ae1b 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -4091,6 +4091,98 @@ static int mptcp_read_sock(struct sock *sk, read_des= criptor_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); + + 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) + break; + + 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, @@ -4112,6 +4204,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 { @@ -4217,6 +4310,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:41:22 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 454E4212F89 for ; Tue, 2 Sep 2025 02:35:23 +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=1756780524; cv=none; b=ueYNB12SvkIHhEGlEtpIrAB7R9acEF3L/19T0Y8YT1K5LS1gNzllfIxCw1i42QjHmv3lAt0L8JwHe4agketMrCsya5NaGQFNrVxYo0wZAhb6xh1RonOH4E2paORwLZRlP3nxFq1xEIULPYpYeBv8V+oxvl6c6D4Uo6W5rA1a5fk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756780524; c=relaxed/simple; bh=5GOemc8goFp/01Dy8pKnpLsVqLblPC8dyQ/Q+kCzeDo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QKUc7Ionv7eF/jteORXcC+Oqm/FrnmgPj0sy41QGcY6W8vtbLYrQ3/MdKoMBquOQdJ4a/HyJVSjrVLwJEZZ1zRerIvQmRcIKwyCcZmcORBZ6j+AMd+Bb2ZNzTxGlRKO+lxz+RgX1+Xl5snCG+0gPU75eD8GND7WzD6+LrTPcriE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=S8PH7B6l; 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="S8PH7B6l" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D84E0C4CEF1; Tue, 2 Sep 2025 02:35:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756780523; bh=5GOemc8goFp/01Dy8pKnpLsVqLblPC8dyQ/Q+kCzeDo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S8PH7B6lC9I1N8fWMPIh/dKNG9cC6Y3UDcR1gzj8IFDN/ZgjywTYhQU5gZFGkyUi1 nkgUkRwImzvYR32wdY9PRN3ksKYo+5x1DQhFjvheoKAAq7hrA3AtcuBtuUTCT321Tb nZ87n3cWtt+HDzdWgif8VMbdmcAlR5HYhO/3IkJyvTgnPSI1dEZX1s+cU/OueuE5Aq QTJ3BBAs9C0+FqsOHtmfBnumabuOEZ1hhhE6w7FMN6/8gKGLlmxwqLZamCXczMp8rG 5dkQY5rjMSGvyAHHRLKiJZJ1w+BZISj3uOVlB1bGtyXFBuJEfXQJXORhotKJ8S+mMm SNmqMdlNlpcIw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 8/9] selftests: mptcp: add splice io mode Date: Tue, 2 Sep 2025 10:34:59 +0800 Message-ID: <5dbf35c163a8355c376dcc2c747d66f4d3c2df04.1756780274.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_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 4f07ac9fa207..d522ac2da9bc 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