[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <fe04c8823b6d17fc45430f4991322f400228ba1e.camel@kernel.org>
Date: Thu, 17 Jul 2025 09:25:45 +0800
From: Geliang Tang <geliang@...nel.org>
To: "Matthieu Baerts (NGI0)" <matttbe@...nel.org>, mptcp@...ts.linux.dev,
Mat Martineau <martineau@...nel.org>, "David S. Miller"
<davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski
<kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>, Simon Horman
<horms@...nel.org>, Neal Cardwell <ncardwell@...gle.com>, Kuniyuki
Iwashima <kuniyu@...gle.com>, David Ahern <dsahern@...nel.org>
Cc: netdev@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH net-next 2/4] tcp: add tcp_sock_set_maxseg
Hi Matt,
On Wed, 2025-07-16 at 12:28 +0200, Matthieu Baerts (NGI0) wrote:
> From: Geliang Tang <tanggeliang@...inos.cn>
>
> 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 <tanggeliang@...inos.cn>
> Acked-by: Matthieu Baerts (NGI0) <matttbe@...nel.org>
> Signed-off-by: Matthieu Baerts (NGI0) <matttbe@...nel.org>
> ---
> 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);
>
> 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;
> }
>
> +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 = val;
> + return 0;
> +}
> +
> /*
> * Socket option code for TCP.
> */
> @@ -3883,15 +3896,7 @@ int do_tcp_setsockopt(struct sock *sk, int
> level, int optname,
>
> 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 = -EINVAL;
> - break;
> - }
> - tp->rx_opt.user_mss = val;
> + tcp_sock_set_maxseg(sk, val);
Sorry, I forgot to set the return value here, it should be:
err = tcp_sock_set_maxseg(sk, val);
I'll send a squash-to patch to fix this.
Thanks,
-Geliang
> break;
>
> case TCP_NODELAY:
Powered by blists - more mailing lists