From nobody Wed Sep 17 18:05:36 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 813B82F4307; Wed, 16 Jul 2025 10:28: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=1752661702; cv=none; b=NisAfnMp+QKJE2705yXo0ozU5lfsHHuldqsP4+hhjwgOjoBaMdVtJK2TfX34dRlgKMAS4bbwQpE1zeWysJgtlW61Aytqxe4nWEzo0G3B0X03REruCtBkjCRNcylxJ9mBms5MmhVVrGNPMo/SCFykoMvH+HI4/RnLOtj+WbQQ534= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752661702; c=relaxed/simple; bh=uubJkcASmdlBqyOvngpV0o6PcVvEqHNyWJgMpNd4zhU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=dRrybFfDCKhUXgsDoPLB81DLAXUkOwdtcaD+1mwtKDn9EutowbQYr/58QWFa4qVvl9zMxF82pUxqwsTjOG0ueeNEIfY/RUGGrt3kw9CcNTstblLF2Y3MeHP9a/W8UORoqvE0mXmwG4d9WnSqqtZkDunXKIBoJQlbQy+Rbp9Uvik= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=If1JW8as; 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="If1JW8as" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 91B59C4CEF0; Wed, 16 Jul 2025 10:28:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752661702; bh=uubJkcASmdlBqyOvngpV0o6PcVvEqHNyWJgMpNd4zhU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=If1JW8as8nFoLsTdcQEUHsMROXj4gfdD+T5wHsJBX7HSjAnVY7ZJtmpAnIyfk+wAe EPdVq1fufeGrJjAMFEmwEwhoE5BnB4rBEnSxvZ9wi1+6bbH+xbRKZcIIaGBwkF8nx6 dJs3M2rUYdYsAtz1GVVmKPadNB6HFUgIC3nnbHEwHtUbZBseyYNgVzYwCJqOjyBpqr YnrUiUTH2YVBi/+8HYgAth+X410JKLpOwIsiZlj3qmIeZAZ7hngrY4ISAsf3QUrNQA qVMQu0wSvcfgkIFSE0zi03VPaG2KfBeXIM3u8Wt3+75oHT5YliM0Qd4NSQYYLmRNqm TLMFqKep/WJvA== From: "Matthieu Baerts (NGI0)" Date: Wed, 16 Jul 2025 12:28:03 +0200 Subject: [PATCH net-next 1/4] mptcp: sockopt: drop redundant tcp_getsockopt Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250716-net-next-mptcp-tcp_maxseg-v1-1-548d3a5666f6@kernel.org> References: <20250716-net-next-mptcp-tcp_maxseg-v1-0-548d3a5666f6@kernel.org> In-Reply-To: <20250716-net-next-mptcp-tcp_maxseg-v1-0-548d3a5666f6@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1286; i=matttbe@kernel.org; h=from:subject:message-id; bh=TuqgIvrSS2p7z4IQu39LyqcaRxpvwfcEBIky4XYlVRI=; b=kA0DAAoWfCLwwvNHCpcByyZiAGh3fr2jV22jLKdGynGn3jqW0GsrgHeG9iRtYaNNXiAN2Woq+ 4h1BAAWCgAdFiEEG4ZZb5nneg10Sk44fCLwwvNHCpcFAmh3fr0ACgkQfCLwwvNHCpcbLAEA2XUL NK1tHeqp6mtwjoFdUSaRlG3jBpbuNd0nuq9sDVIBAOH5aU4EgrFh974wC8/rT/93mbHWuaty/vU o2iZQdFIF X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang tcp_getsockopt() is called twice in mptcp_getsockopt_first_sf_only() in different conditions, which makes the code a bit redundant. The first call to tcp_getsockopt() when the first subflow exists can be replaced by going to a new label "get" before the second call. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/sockopt.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 3caa0a9d3b3885ce6399570f2d98a2e8f103638d..afa54fba51e215bc2efb21f16ed= 7d0a0fb120972 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -914,10 +914,8 @@ static int mptcp_getsockopt_first_sf_only(struct mptcp= _sock *msk, int level, int =20 lock_sock(sk); ssk =3D msk->first; - if (ssk) { - ret =3D tcp_getsockopt(ssk, level, optname, optval, optlen); - goto out; - } + if (ssk) + goto get; =20 ssk =3D __mptcp_nmpc_sk(msk); if (IS_ERR(ssk)) { @@ -925,6 +923,7 @@ static int mptcp_getsockopt_first_sf_only(struct mptcp_= sock *msk, int level, int goto out; } =20 +get: ret =3D tcp_getsockopt(ssk, level, optname, optval, optlen); =20 out: --=20 2.48.1 From nobody Wed Sep 17 18:05:36 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 353B72F4338; Wed, 16 Jul 2025 10:28:24 +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=1752661705; cv=none; b=dXtOD2aP/HOJGqm9+PQizDdvGX+PVpS0tglmF1ojACMHa+M8hATmhjqcYNOobW3L8wjmLCqgKiUSNm7S6HDvBr9+SkSyu0VFikkwr0AWllV2yUuIB8mEpNWThp6I1/02pE29IF0WUe8nlb7TrVCUlJ5LgPBDCkXFQfVsfg+cTjI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752661705; c=relaxed/simple; bh=d/K4zvv9MxpgoQvOcpDtuXY79iYulEVOCEgNeH9/IL4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oOU/0cSeCq1hEOiiu67xZmwXl7MCtOm/gWZk6f10WChnNAboJAJKYsxZUd5dBPFHetAeTBtsKGx7Atg8cAopi2QHQa/KsMXABqY+O4oX5dFtEaCyyRRnw0uKiYp7OIeKzDlkicqYckI0QvntcjWeZ8vlim5l7BSB9JyZiowpxQI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rqzfetkJ; 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="rqzfetkJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6BB8CC4CEF7; Wed, 16 Jul 2025 10:28:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752661704; bh=d/K4zvv9MxpgoQvOcpDtuXY79iYulEVOCEgNeH9/IL4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=rqzfetkJTFJApP9gcXoUSJLQjCn0WqXo64+wfDuwHpV1TOHOvVS7W4kiyxWj0cTBj xOLYSoWz8jEP7oLYAQeJCgm4ld3ZFhbfZW/IdXkMKbNlyq2VFmDN6wr5U0z/VHN6vi MU6HuPglqsrejH4kdku55sEJx6g5LMRl8vMxqWvoqMcxwQo962neMggCFeaaZ1WRQ/ ZLcYPsEyxCB0Ht7HC3PdCt6hDVWoPPUs6WgWBmQKWHEXU0OjI6dLBHJ+18x99t6ZUu 1iBt7uR56aEeiW3CtE1dWkwbWaf+/WcQtyuWsk9hxUvI7+AEwAy2nE4lcoau6Wdd3p 41aaIcdnKSIug== From: "Matthieu Baerts (NGI0)" Date: Wed, 16 Jul 2025 12:28:04 +0200 Subject: [PATCH net-next 2/4] tcp: add tcp_sock_set_maxseg Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250716-net-next-mptcp-tcp_maxseg-v1-2-548d3a5666f6@kernel.org> References: <20250716-net-next-mptcp-tcp_maxseg-v1-0-548d3a5666f6@kernel.org> In-Reply-To: <20250716-net-next-mptcp-tcp_maxseg-v1-0-548d3a5666f6@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2283; i=matttbe@kernel.org; h=from:subject:message-id; bh=8TcURbsq0AerY3ivfODQZ8O8rffsXv6kU9jfm8HF060=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLK6/bpFv13TJWLa/nzkF1Qb8G7cn6VlJOynyaqvnI7P VPFpMepo5SFQYyLQVZMkUW6LTJ/5vMq3hIvPwuYOaxMIEMYuDgFYCL6fxkZrrkzpArN2/fMzpWt RDXS7OfveJfrMWp/F6/erdT6JkX7DiPD40XVl8/o6W46ZL4/9Z6AqcSchvxVN4OcDAXNla4umvG ZAwA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang Add a helper tcp_sock_set_maxseg() to directly set the TCP_MAXSEG sockopt from kernel space. This new helper will be used in the following patch from MPTCP. Signed-off-by: Geliang Tang Acked-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- include/linux/tcp.h | 1 + net/ipv4/tcp.c | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 1a5737b3753d06165bc71e257a261bcd7a0085ce..57e478bfaef20369f5dba1cff54= 0e52c9302ebf4 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -621,6 +621,7 @@ void tcp_sock_set_nodelay(struct sock *sk); void tcp_sock_set_quickack(struct sock *sk, int val); int tcp_sock_set_syncnt(struct sock *sk, int val); int tcp_sock_set_user_timeout(struct sock *sk, int val); +int tcp_sock_set_maxseg(struct sock *sk, int val); =20 static inline bool dst_tcp_usec_ts(const struct dst_entry *dst) { diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 31149a0ac849192b46c67dd569efeeeb0a041a0b..c9cdc4e99c4f11a75471b8895b9= c52ad8da3a7ff 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3751,6 +3751,19 @@ int tcp_set_window_clamp(struct sock *sk, int val) return 0; } =20 +int tcp_sock_set_maxseg(struct sock *sk, int val) +{ + /* Values greater than interface MTU won't take effect. However + * at the point when this call is done we typically don't yet + * know which interface is going to be used + */ + if (val && (val < TCP_MIN_MSS || val > MAX_TCP_WINDOW)) + return -EINVAL; + + tcp_sk(sk)->rx_opt.user_mss =3D val; + return 0; +} + /* * Socket option code for TCP. */ @@ -3883,15 +3896,7 @@ int do_tcp_setsockopt(struct sock *sk, int level, in= t optname, =20 switch (optname) { case TCP_MAXSEG: - /* Values greater than interface MTU won't take effect. However - * at the point when this call is done we typically don't yet - * know which interface is going to be used - */ - if (val && (val < TCP_MIN_MSS || val > MAX_TCP_WINDOW)) { - err =3D -EINVAL; - break; - } - tp->rx_opt.user_mss =3D val; + tcp_sock_set_maxseg(sk, val); break; =20 case TCP_NODELAY: --=20 2.48.1 From nobody Wed Sep 17 18:05:36 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 2D7192F4A0B; Wed, 16 Jul 2025 10:28:27 +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=1752661708; cv=none; b=RpqqW1Jaf0EFmTNrLxs187UBOVA38mLaKSESaBsXOKL7tnqCp65LQ/5htO/qWggdwq0zooQQLX3nsU1tv9M9nkxJ36Sh6CuwkJqNNil9pKij1ExGY7to+opgg+dfWfESQKk/XOICgKbAUMHIO27TQa8QH6jxJY1tpHDPVeX2BmM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752661708; c=relaxed/simple; bh=481cka8erGmjKbyjTt7K9jn11qoN9jnG5VVx4IklCeM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MpTvC7T748hvF+M31NW5IlZ+m8mZP1ngTIpVFxmcihfa+yi6xOYXq4eSc4dfocjB2Qy12kSQxhLvrAXr30UIgC6TTZ2of09PfeVF253oYAs3L1WEGlgdz8OvFSKSiLyPPvVn5XFZeyG59OQZL4X7tw+zkRYWli3G6GrcXMPi7uk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BtCCEsGT; 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="BtCCEsGT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45A6AC4CEF0; Wed, 16 Jul 2025 10:28:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752661707; bh=481cka8erGmjKbyjTt7K9jn11qoN9jnG5VVx4IklCeM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=BtCCEsGTgsQwGuMt35pKV0JZkMensIQODAfEWoU6GiwPYYVZWiu8InG57PLetPinG Ehl4vZ9xfQGXWHG2dG7OQ2q9VfxuT5X6QkL3DnAi7HGLsT6hjRcv0hUFP/8XLq5apT WolbfftPuYhEqndSfxeS+ERvz5YbNIuRxloEuAnu/DG8uP7JPijApc7fzaqr7RNPNw kqFkWeSz4OlXlAfuX02R5LOl54cmwJQW6mPK6pjTlSxSIf8T+mSKBhLDTALDTw09Op EmFC/EwXKTwR8eA5Xd+DqAl7FNBTg4WZve8RqbDlcczIOB0Muw4VeTBy6ShKEd7L9b 3bAkY8Yv0YWAw== From: "Matthieu Baerts (NGI0)" Date: Wed, 16 Jul 2025 12:28:05 +0200 Subject: [PATCH net-next 3/4] mptcp: add TCP_MAXSEG sockopt support Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250716-net-next-mptcp-tcp_maxseg-v1-3-548d3a5666f6@kernel.org> References: <20250716-net-next-mptcp-tcp_maxseg-v1-0-548d3a5666f6@kernel.org> In-Reply-To: <20250716-net-next-mptcp-tcp_maxseg-v1-0-548d3a5666f6@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" , Geliang Tang X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3597; i=matttbe@kernel.org; h=from:subject:message-id; bh=qOHsJBqU1N3UcL7j8IzEZR4JZWaMj7+gDpL8lzuOm88=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLK6/Zn7Yk+O3vm5zQu1+LG3pWHrifsYn4wQ3+rZsS9n csMNnkndpSyMIhxMciKKbJIt0Xmz3xexVvi5WcBM4eVCWQIAxenAEyk9yAjw47j5nsi/Mp0vtV1 OJ851LEp8NJmo2ksnbvFWm8XStmaOzH8FROT0N6XNv+jT/P8B3su9fp8Csw78yr9YNXGsPQ5TwK 1uAA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang The TCP_MAXSEG socket option is currently not supported by MPTCP, mainly because it has never been requested before. But there are still valid use-cases, e.g. with HAProxy. This patch adds its support in MPTCP by propagating the value to all subflows. The get part looks at the value on the first subflow, to be as closed as possible to TCP. Only one value can be returned for the cached MSS, so this can come only from one subflow. Similar to mptcp_setsockopt_first_sf_only(), a generic helper mptcp_setsockopt_all_subflows() is added to set sockopt for each subflows of the mptcp socket. Add a new member for struct mptcp_sock to store the TCP_MAXSEG value, and return this value in getsockopt. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/515 Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- net/mptcp/protocol.h | 1 + net/mptcp/sockopt.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 3dd11dd3ba16e8c1d3741b6eb5b526bb4beae15b..9c43a1f037e71243e202f907608= ad42086dbde4b 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -326,6 +326,7 @@ struct mptcp_sock { int keepalive_cnt; int keepalive_idle; int keepalive_intvl; + int maxseg; struct work_struct work; struct sk_buff *ooo_last_skb; struct rb_root out_of_order_queue; diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index afa54fba51e215bc2efb21f16ed7d0a0fb120972..379a02a46b7bf706480cf66a88c= 6cf2357d2a62b 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -798,6 +798,23 @@ static int mptcp_setsockopt_first_sf_only(struct mptcp= _sock *msk, int level, int return ret; } =20 +static int mptcp_setsockopt_all_sf(struct mptcp_sock *msk, int level, + int optname, sockptr_t optval, + unsigned int optlen) +{ + struct mptcp_subflow_context *subflow; + + mptcp_for_each_subflow(msk, subflow) { + struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); + int ret =3D 0; + + ret =3D tcp_setsockopt(ssk, level, optname, optval, optlen); + if (ret) + return ret; + } + return 0; +} + static int mptcp_setsockopt_sol_tcp(struct mptcp_sock *msk, int optname, sockptr_t optval, unsigned int optlen) { @@ -859,6 +876,11 @@ static int mptcp_setsockopt_sol_tcp(struct mptcp_sock = *msk, int optname, &msk->keepalive_cnt, val); break; + case TCP_MAXSEG: + msk->maxseg =3D val; + ret =3D mptcp_setsockopt_all_sf(msk, SOL_TCP, optname, optval, + optlen); + break; default: ret =3D -ENOPROTOOPT; } @@ -1406,6 +1428,9 @@ static int mptcp_getsockopt_sol_tcp(struct mptcp_sock= *msk, int optname, return mptcp_put_int_option(msk, optval, optlen, msk->notsent_lowat); case TCP_IS_MPTCP: return mptcp_put_int_option(msk, optval, optlen, 1); + case TCP_MAXSEG: + return mptcp_getsockopt_first_sf_only(msk, SOL_TCP, optname, + optval, optlen); } return -EOPNOTSUPP; } @@ -1552,6 +1577,7 @@ static void sync_socket_options(struct mptcp_sock *ms= k, struct sock *ssk) tcp_sock_set_keepidle_locked(ssk, msk->keepalive_idle); tcp_sock_set_keepintvl(ssk, msk->keepalive_intvl); tcp_sock_set_keepcnt(ssk, msk->keepalive_cnt); + tcp_sock_set_maxseg(ssk, msk->maxseg); =20 inet_assign_bit(TRANSPARENT, ssk, inet_test_bit(TRANSPARENT, sk)); inet_assign_bit(FREEBIND, ssk, inet_test_bit(FREEBIND, sk)); --=20 2.48.1 From nobody Wed Sep 17 18:05:36 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 1BF662F5093; Wed, 16 Jul 2025 10:28:30 +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=1752661711; cv=none; b=oEuZMys7TeU0Q8dwWh/cxqdInK79uHaVvMBaambL6j/mSXnc7dZ1IYs8kkzMxdqpwa901Ie6n5vf/JuCquFleiufJiOBfJfcG4rGPIlb/DwP8vxcPsZVpfxZ3d0rZQcVz1Mdu11jUOvBmj4SrJFRFG/4EqthuUblTY+TdPfYSe8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752661711; c=relaxed/simple; bh=ATxwF3oK0AHq0rXjzmSH/f3UnehAxyGxmt7OLGdPkmA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Q9UYqrIzeb9viZqFoZqsQIBq4q68WHCsqhF3n0+CJY7udQ8UrxbHrt2xvdMYos508IyS9U1xxH7Gn7jU7oreNqbmpYvXQA5eV9cnN5JXJVKoVSWkCWuXG2+TbLS6DUYHi59ruSOwdVRwFmT5Z8nWdWVHdRU8yEjZOl7E0asQylM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=mYcQbXxG; 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="mYcQbXxG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 20169C4CEF1; Wed, 16 Jul 2025 10:28:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1752661710; bh=ATxwF3oK0AHq0rXjzmSH/f3UnehAxyGxmt7OLGdPkmA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=mYcQbXxGtb1oAsBu7hrvRL8MiKu5qcMJm8rztJIBHtSKFwrcXckcdNnxLHFxq6d+q xULshS0b4cD/g4A6YwJLfM2shtVbpDWPEuSo3LGKJhHt4rpvNkzYuUs0LoS/rGSVTw x7kOWJo49ozFTNyVnv2Gooc+JHD8e1t3pU8OweKRkFwRdd0ODEmWuNACcgFG6Mbmaa nFk2zw7aMDeJw0k69MrQx6SSWOhpannQfJBu+IXxChr49Gh5JzztMkYzz+fw1myz7F JWZoMcr9nYQWbCN+tgNxhcicT0UKjOBV6Aao/BaH3UR6x69F3XMxPUWQZjnoJ10/EE oSKVbuGVTRn0A== From: "Matthieu Baerts (NGI0)" Date: Wed, 16 Jul 2025 12:28:06 +0200 Subject: [PATCH net-next 4/4] mptcp: fix typo in a comment Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250716-net-next-mptcp-tcp_maxseg-v1-4-548d3a5666f6@kernel.org> References: <20250716-net-next-mptcp-tcp_maxseg-v1-0-548d3a5666f6@kernel.org> In-Reply-To: <20250716-net-next-mptcp-tcp_maxseg-v1-0-548d3a5666f6@kernel.org> To: mptcp@lists.linux.dev, Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Neal Cardwell , Kuniyuki Iwashima , David Ahern Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" , moyuanhao X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1302; i=matttbe@kernel.org; h=from:subject:message-id; bh=Ik5twdxPJJpwUw1wx5+zdFE+/xcyShWLAB0UWSDSQCY=; b=owGbwMvMwCVWo/Th0Gd3rumMp9WSGDLK6/Yr7A6LzDKVuiq8TLFL+QZT//dFC1uLZ1mem/uBc 1rMayeZjlIWBjEuBlkxRRbptsj8mc+reEu8/Cxg5rAygQxh4OIUgIksDWNkWLazomR2icXrXsut BbUbc544Oaksk+ZoqvOv8+Zd0RbTz/A/1XbPLu9f0SuezBGuOFBxzHHXIxn3iL+bfbMtsmbMKfB lBQA= X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: moyuanhao This patch fixes the follow spelling mistake in a comment: greter -> greater Signed-off-by: moyuanhao Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- Notes: - The same patch has already been sent to the netdev ML, but when net-next was closed: https://lore.kernel.org/20250530181004.261417-1-moyuanhao3676@163.com --- 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 5f904fc5ac4c63e8b6c7c9aa79f17e8dcdf1a007..fe3135cd778a98d4f270d684c10= 1af30d261ee71 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1377,7 +1377,7 @@ struct sock *mptcp_subflow_get_send(struct mptcp_sock= *msk) * - estimate the faster flow linger time * - use the above to estimate the amount of byte transferred * by the faster flow - * - check that the amount of queued data is greter than the above, + * - check that the amount of queued data is greater than the above, * otherwise do not use the picked, slower, subflow * We select the subflow with the shorter estimated time to flush * the queued mem, which basically ensure the above. We just need --=20 2.48.1