tcp: enable mid stream window clamp
Subsystems (3)
PATCH v3 1/1 tcp: enable mid stream window clamp
The TCP_WINDOW_CLAMP socket option is defined in tcp(7) to "Bound the size of the advertised window to this value." Window clamping is distributed across two variables, window_clamp ("Maximal window to advertise" in tcp.h) and rcv_ssthresh ("Current window clamp").
This patch updates the function where the window clamp is set to also reduce the current window clamp, rcv_sshthresh, if needed. With this, setting the TCP_WINDOW_CLAMP option has the documented effect of limiting the window.
---
v2: - fix email formatting
v3: - address comments by setting rcv_ssthresh based on prior window
net/ipv4/tcp.c | 1 + 1 file changed, 1 insertion(+)
net/ipv4/tcp.c +1 -0
@@ -3338,6 +3338,7 @@ int tcp_set_window_clamp(struct sock *sk, int val) }else { tp->window_clamp = val <SOCK_MIN_RCVBUF /2 ?SOCK_MIN_RCVBUF /2 : val; + tp->rcv_ssthresh =min (tp->rcv_wnd, tp->window_clamp); }return 0 ; }
Signature · 1 line
2.30.2
Quoted 10 lines · Neil Spring
The
TCP_WINDOW_CLAMPsocket option is defined in tcp(7) to "Bound the size of the advertised window to this value." Window clamping is distributed across two variables,window_clamp("Maximal window to advertise" intcp.h) andrcv_ssthresh("Current window clamp").This patch updates the function where the window clamp is set to also reduce the current window clamp,
rcv_sshthresh, if needed. With this, setting theTCP_WINDOW_CLAMPoption has the documented effect of limiting the window.
This patch looks like a bug-fix so it should be applied to net not net-next?
Quoted 25 lines
Signed-off-by Neil Spring <[email protected]>---
v2: - fix email formattingv3: - address comments by setting
rcv_ssthreshbased on prior windownet/ipv4/tcp.c | 1 + 1 file changed, 1 insertion(+)net/ipv4/tcp.c +1
-1@@ -3338,6 +3338,7 @@ int tcp_set_window_clamp(struct sock *sk, int val) }else { tp->window_clamp = val <SOCK_MIN_RCVBUF /2 ?SOCK_MIN_RCVBUF /2 : val; + tp->rcv_ssthresh =min (tp->rcv_wnd, tp->window_clamp); }return 0 ; } --2.30.2
Quoted 8 lines · Yuchung Cheng
Quoted 6 lines · Neil Spring
The
TCP_WINDOW_CLAMPsocket option is defined in tcp(7) to "Bound the size of the advertised window to this value." Window clamping is distributed across two variables,window_clamp("Maximal window to advertise" intcp.h) andrcv_ssthresh("Current window clamp").
Quoted 5 lines
Quoted 4 lines
This patch updates the function where the window clamp is set to also reduce the current window clamp,
rcv_sshthresh, if needed. With this, setting theTCP_WINDOW_CLAMPoption has the documented effect of limiting the window.This patch looks like a bug-fix so it should be applied to net not net-next?
It seems TCP_WINDOW_CLAMP never worked in this context, not sure if any application was expecting it to work.
Note that if we target net tree, we would like a Fixes: tag.
I will give my SOB a bit later in the day, I have to run some errands.
Thanks.
Quoted 10 lines · Neil Spring
The
TCP_WINDOW_CLAMPsocket option is defined in tcp(7) to "Bound the size of the advertised window to this value." Window clamping is distributed across two variables,window_clamp("Maximal window to advertise" intcp.h) andrcv_ssthresh("Current window clamp").This patch updates the function where the window clamp is set to also reduce the current window clamp,
rcv_sshthresh, if needed. With this, setting theTCP_WINDOW_CLAMPoption has the documented effect of limiting the window.
Quoted 6 lines
Signed-off-by Neil Spring <[email protected]>---
v2: - fix email formattingv3: - address comments by setting
rcv_ssthreshbased on prior window
SGTM, thanks.
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 11 lines · On Wed, 25 Aug 2021 14:01:17 -0700 you wrote:
The
TCP_WINDOW_CLAMPsocket option is defined in tcp(7) to "Bound the size of the advertised window to this value." Window clamping is distributed across two variables,window_clamp("Maximal window to advertise" intcp.h) andrcv_ssthresh("Current window clamp").This patch updates the function where the window clamp is set to also reduce the current window clamp,
rcv_sshthresh, if needed. With this, setting theTCP_WINDOW_CLAMPoption has the documented effect of limiting the window.[...]
Here is the summary with links:
- [net-next,v3] tcp: enable mid stream window clamp
https://git.kernel.org/netdev/net-next/c/3aa7857fe1d7
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html