From nobody Sun Dec 14 02:01:12 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 6392D25F7A8 for ; Wed, 11 Jun 2025 09:25: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=1749633911; cv=none; b=Cwu2EvxY13qcAHaaEq05IhNoMAfDjE1e4pCkbXYGxjS8ZPJHe3w9BUOM0Em90aJmlR6o6b7dxUxKtGYCMwdC3FJQVHtyt8Efg5+3F87CBWqmXi/X5qScpCDfDLaTZ1Msu/qC0dFraq9FM2DU/cfvueNQdcg1P9Fgz8/z1tUEZUE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749633911; c=relaxed/simple; bh=ckRTtky5dUmt+IN8CQ9dCGUKltmexIW6KYwF+rdoUaQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LTAhF9FXJZ12Zk1EwzHh4l6iSEM17zmrwKP4p+9lQUtOeSrcVV5fPim8TXx4bwJXjkZWN4WUZfaxvL8oZ0wuXCNZU9+nXe4m1vL8jFR9Fv0kTFfPtTOlE9vqJy+Zwqb5v1FF98fKs7jyS6e19+TjKEBWa15B+bdU1Di2uFR/KGU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=lmt2H/3V; 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="lmt2H/3V" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3A620C4CEEF; Wed, 11 Jun 2025 09:25:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1749633910; bh=ckRTtky5dUmt+IN8CQ9dCGUKltmexIW6KYwF+rdoUaQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lmt2H/3V0eT4TO6tfhmnRaa34RNX7rq2rL0sQ9ntfRpLi7wPBKlhuHyc2nUgh+J5V m1ro5YKCP326GA+XnfslnVxLaJXUlp2oD6uDu9X0H3IGCHLT+YIIW7zT8nQQrvFppO GkjVSbsX9D1TJtvaw55ilrk4nT503YdoASgGW6IxB1Jm6wkJDgFPEL1W2iVNYZuymp LYo6Kh8+OWo+NEi7apqGsQHreAwWfJtwZOZrpWm9D5XkW9llCquSbYhb1pv+qG2eR2 Lmf6I9HYpHtsT6D9s7+49AihlX/s1tzeuFEp2Dfr6aNTIN566mhOKvQCqCgTdKu3dK HoWddUQQnrunQ== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next 1/2] Squash to "mptcp: implement .read_sock" Date: Wed, 11 Jun 2025 09:24:52 +0000 Message-ID: <35dbe3cb9fc4a23039b96981fc105440dea4c8b9.1749633671.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 Use sk->sk_rcvbuf instead of INT_MAX as the max len. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 32d389329262..53057c4f41f0 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -3965,8 +3965,8 @@ static int mptcp_read_sock(struct sock *sk, read_desc= riptor_t *desc, { struct mptcp_sock *msk =3D mptcp_sk(sk); struct scm_timestamping_internal tss; + size_t len =3D sk->sk_rcvbuf; struct sk_buff *skb, *tmp; - size_t len =3D INT_MAX; int copied =3D 0; =20 if (sk->sk_state =3D=3D TCP_LISTEN) --=20 2.43.0 From nobody Sun Dec 14 02:01:12 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 94D6922DFA2 for ; Wed, 11 Jun 2025 09:25: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=1749633913; cv=none; b=FTtP4PaL8LbjjOsAF4Q6FVCEdGiJh07fUw71XdmHvIvmotMs5aELGWIPHeVCq+kr2aBE4sc9sGTcKH22Ja2ebeOxU7rxPP1wu0HS99K6I41kd4SN+HwInfpLmM/m3zw9WrZc7p36FuuX10HfibqjPUMNJteQy4r8il/X1HsIq6U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749633913; c=relaxed/simple; bh=KvjMSIJy3lYCLYwy9S+Qk+3H39d+nm+2nUs2myUa5mw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XLltOyyKw5xyab+t4xdpg4smJ3WM14DWOpsP6pdcrxUOSiRCRMfp6hnz6oTirANTHVidICzVjvcvaJh6SNP9khGadE6/Z3vSXVmY1+7HMfpc2B6YMR2ylcw1zOHsWnpCaFBNV3staoo9z298+1BwnRemP/+dYqJ1zhvYgggRW9c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=up+9neWw; 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="up+9neWw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0D68C4CEEE; Wed, 11 Jun 2025 09:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1749633913; bh=KvjMSIJy3lYCLYwy9S+Qk+3H39d+nm+2nUs2myUa5mw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=up+9neWw1O3GykBFHPmQkPITz8s3dKxz5tFUGriUd5ceBFSFdqSI80X40hOmMR67Q bkcp5OxLckUfPm0xpqm92CPIVd2o+ktuxGjSMZ2/vGYVUQuRFsOr3Stnc8BMQW+UJ3 bM0lfepuOV3Viluj6IKla+08ibq2AWEfj33bV/+LdcjOrRe/NLlTH4qsZpyU8lM+zS pK5tWAojb6DwmGsbxzeCNrZU+nP5rS/FrOXRplWnC6SNHMfe+HOe/pwunVTmj5woWo dNYrEpqJFq51JmcMV9rwT4QjiBk1x9ecM+RbF9CAdV+xsOIwtdDFYk95Zd7VmE3Jxk 0J+o5qTBBg/AQ== From: Geliang Tang To: mptcp@lists.linux.dev, hare@kernel.org Cc: Geliang Tang Subject: [PATCH mptcp-next 2/2] Squash to "selftests: mptcp: add splice test" Date: Wed, 11 Jun 2025 09:24:53 +0000 Message-ID: <756dfb8d54e0f43523f3ab630b807b22da0d6535.1749633671.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 Close all fds of mptcp_splice.c. Add splice io mode for mptcp_connect. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_connect.c | 61 ++++++++++++++++++- .../selftests/net/mptcp/mptcp_connect.sh | 10 ++- .../selftests/net/mptcp/mptcp_splice.c | 43 ++++++++----- 3 files changed, 98 insertions(+), 16 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/test= ing/selftests/net/mptcp/mptcp_connect.c index ac1349c4b9e5..ce4b4ed9164d 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