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 326432701B1 for ; Wed, 23 Apr 2025 09:40:51 +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=1745401253; cv=none; b=ewOx48mYrvndCrLUPs6n4ZnHXguFgd5S9TL6zPwRrsQaNAlqZ8S9rHPqxzNBCD0ppNryJgNGPEsHq4iW4vhkpXankIQdhTSSHrZJ4BdiHsGj8tLzpWgjhDl3Ep7Ck4gui02g9sp7sI7RSPEdF53fJnAd649ck8UhnMtV+sBMgAM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745401253; c=relaxed/simple; bh=MhAHx5bVmBey5XvXe90ZD+YCTc0dE13hi9qKwowki4Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gcgfJXzHeLUgHvGLNkE7GlgBa6GTUQt//tAr4F8KQge3WJq1heCftWA8E5ZCYLVnOcNKyLloydd1ZOlU3q2zjqFchPCHnJ3qni3WwGJNWs0nouXFGaw8VVtJlCmF0KLRPimoZhC2QGTmboS4Cg2ZjKs/klqeWSme1bSfoi6vHUA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GJdZNcDK; 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="GJdZNcDK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 79F3AC4CEE2; Wed, 23 Apr 2025 09:40:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745401251; bh=MhAHx5bVmBey5XvXe90ZD+YCTc0dE13hi9qKwowki4Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GJdZNcDKQ1zmnop1OStxOcEXmoMZCb5SPU9BSBNDczDSMhVM0sHmGtANhSYDk89Fh y7Oi2AdRw9go9D8lox9ipF9dokxSNa6ILOdgul0F82b+6+11APWsxZLV+xPyv2rUHd WqnxRfZxeeO4zK89zeH/qlfYwXE+lgRPsfk2VOR4JmznPDaL26EmyId3ZHjnnajtbF hnDe9fvQEKS8xbSLjQST+s7FXyXUB1ebbX6xfhfvRWCqaBFt+anAAoQ4Aklu36+kP/ Ow4+jD1fnNXnVj27UHsfTEtlxJ5tgoLOI7jbg672bpRbwu1gyzB/Ol6Jbzo95jn9yo HWf3bxabFnOVw== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 1/3] tcp: add tcp_sock_set_maxseg Date: Wed, 23 Apr 2025 17:40:40 +0800 Message-ID: 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 Add a helper tcp_sock_set_maxseg() to directly set the TCP_MAXSEG sockopt from kernel space. Signed-off-by: Geliang Tang Acked-by: Matthieu Baerts (NGI0) --- include/linux/tcp.h | 1 + net/ipv4/tcp.c | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 1669d95bb0f9..0041bc0aaee9 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h @@ -623,6 +623,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 4516f93f6cd2..402f4a9b3fd1 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -3725,6 +3725,20 @@ 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; +} +EXPORT_SYMBOL(tcp_sock_set_maxseg); + /* * Socket option code for TCP. */ @@ -3857,15 +3871,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.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 2D0162701B1 for ; Wed, 23 Apr 2025 09:40: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=1745401255; cv=none; b=ZcxB0ChL2s1F2LqFl4/TBtySPEWTL8BxuqekIxPJcG7+lRmrBQh6toIXOSTKfdCcs27wNUbB3Y4bJjgLmQ4+eM8ErHJAHQFN1V1cNFxGijFS9rf22g6fFr/bSgN0EzxVGbY5m8IQr5B8MRSaBp12fNA89QEfyUHxE8tmrs7AW10= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745401255; c=relaxed/simple; bh=itfQbPsn1BntUraeR373sWvbaxL8NsijCSxuKEkhTgE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ex3eKoZujAE4oUp6+5eWMmmfOrQCXV79sqtXIEx2hrbZvWEP9HfkFtbgKSx8ds2a8+u/yyk9olMMihFaMHuhdLVnkznQe0oy/5n0ja59YZhRZuKhbaEt1vbXMC4ZHFCowBn4kI1PenBVGrXG3PstgG5c5j3IXJzaebXuvBvQ4Ho= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=e0sEFbIQ; 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="e0sEFbIQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52920C4CEEC; Wed, 23 Apr 2025 09:40:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745401253; bh=itfQbPsn1BntUraeR373sWvbaxL8NsijCSxuKEkhTgE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e0sEFbIQDFJt0upXQAJuoUx7mx3MuDBEaXTF+s3r0hoOfYF2XRcrOqzbTbH2EOzQL kZsUJGIS7UeWslB8tlEZFkOc+sJ7rcGLAseEB+wQUtgO9olDiswAVW+JWNSeArymx5 b8Itiwb3snVTLzWizt6mtkhTrj+Fn2iuUJ5jKLnbVlEbLrmWlrXzZuU4QbQY7WDRfU 8jgEmmBhI2THp6aPCvquyGWwkFRPDmv0xVMbgq+daSXnQB+wBKmqlOscrhKuC/5NkD zUK8YgnSrvPPihKtzE1v6iX0Uv4tL4aO9pkKcMMqjv7UkBmezzSEApYF8ZaEE2X69q WpZ0L1ZG+fVXA== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 2/3] mptcp: add TCP_MAXSEG sockopt support Date: Wed, 23 Apr 2025 17:40:41 +0800 Message-ID: <8160ae5fd83c0815cee2f5998948199200574bc7.1745401025.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 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. 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 --- net/mptcp/protocol.h | 1 + net/mptcp/sockopt.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 64aa091cb685..91aaed17fe56 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -327,6 +327,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 3caa0a9d3b38..a7992cbc5ed9 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -798,6 +798,22 @@ static int mptcp_setsockopt_first_sf_only(struct mptcp= _sock *msk, int level, int return ret; } =20 +static int mptcp_setsockopt_all_subflows(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 +875,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_subflows(msk, SOL_TCP, optname, + optval, optlen); + break; default: ret =3D -ENOPROTOOPT; } @@ -1407,6 +1428,8 @@ 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_put_int_option(msk, optval, optlen, msk->maxseg); } return -EOPNOTSUPP; } @@ -1553,6 +1576,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.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 F39D72701B1 for ; Wed, 23 Apr 2025 09:40: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=1745401256; cv=none; b=mEBdUAxgOv8S7uHMxdTbRXurwgHtJgMdftWvakJZM3+F4s8GIb+kKGBVFqx9sXqe5RsKO6cFfFwy1vtKdDpwd2VAmiB3FMLZVwNIzzDaICUajNrA0AFraqArohKll2DtketomNkQQ481FQBnAVRcnh+LlDlKcXeMZealv+JjzBU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745401256; c=relaxed/simple; bh=N1fim+dFf1Fcz3Xapnqlp34Y7CX2Cvt81omK14EyvG8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OhaKw+lC0rfaqfrGrTKrHNrfQTrOxuiLfRL0oSG0186BMUC7Lex65OUKfABM0aj8i+RXSloelfiUUBVJJNXZ5L8O6dR9HtdRXYZRrRsIiWXXJaZhcNxtSpnGgEDS3SoIz2Y9+bJdJzit6x8wvmsXs/Fj0KtCHKDb48sLxFSQzvA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GJgSfK++; 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="GJgSfK++" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60570C4CEE2; Wed, 23 Apr 2025 09:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745401255; bh=N1fim+dFf1Fcz3Xapnqlp34Y7CX2Cvt81omK14EyvG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GJgSfK++1GuBrfT6cBEX95SwrQg+BWK8nsv/4y/7xkFgigHZrcJrSy4GLE5r4zmYY /14h2UxIesow5a62F7bI7mGOs4UeVEzYOFf0CuN44ZCG+r5xllmozN+I8cA2lwJDRL NFPVpSBnjlq0AGRj4z7hESBv6sS2qbHKsmG+FPzgJ1dWhRHysOocJvsfPGHzCsGR6X lhjT5fcKu5C9xoZzaIOkDZLsgWTKPfiSU9O7nsv3wnC+cGCJaBCYFaHhiYSFZhlupP 6rVi7X9Ieje1VNvlg6ahI4ykRjMERNbu5/g6OwUp4z7FxmiU0Rxuy7U134JMC6Uj0B 4fMtNzEC571gg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 3/3] selftests: mptcp: sockopt: add TCP_MAXSEG sockopt tests Date: Wed, 23 Apr 2025 17:40:42 +0800 Message-ID: <2a5c52d491de283397c9fad972350298de74d8c3.1745401025.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 This patch adds the TCP_MAXSEG sockopt tests in mptcp_sockopt.c. Since in getsockopt TCP_MAXSEG, the "user_mss" value can be obtained only in the LISTEN state (see do_tcp_getsockopt in net/ipv4/tcp.c), the test items are added to server() instead of client(). Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/mptcp_sockopt.c | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 9934a68df237..5ad1e9ed2fe6 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -697,6 +697,26 @@ static int xaccept(int s) return fd; } =20 +static void test_tcp_maxseg_sockopt(int fd) +{ + int maxseg =3D 1000; + socklen_t s; + int r; + + s =3D sizeof(maxseg); + r =3D setsockopt(fd, IPPROTO_TCP, TCP_MAXSEG, &maxseg, s); + if (r !=3D 0) + die_perror("setsockopt TCP_MAXSEG"); + + maxseg =3D 0; + r =3D getsockopt(fd, IPPROTO_TCP, TCP_MAXSEG, &maxseg, &s); + if (r !=3D -1 && errno !=3D EINVAL) + die_perror("getsockopt TCP_MAXSEG did not indicate -EINVAL"); + + if (maxseg !=3D 1000) + xerror("maxseg=3D%d", maxseg); +} + static int server(int pipefd) { int fd =3D -1, r; @@ -721,6 +741,8 @@ static int server(int pipefd) =20 process_one_client(r, pipefd); =20 + test_tcp_maxseg_sockopt(fd); + return 0; } =20 --=20 2.43.0