netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Neil Spring <ntspring@fb.com>
To: <davem@davemloft.net>, <edumazet@google.com>
Cc: <yoshfuji@linux-ipv6.org>, <dsahern@kernel.org>,
	<kuba@kernel.org>, <netdev@vger.kernel.org>,
	<ncardwell@google.com>, <ycheng@google.com>,
	Neil Spring <ntspring@fb.com>
Subject: [PATCH net-next v2] tcp: enable mid stream window clamp
Date: Thu, 19 Aug 2021 12:54:43 -0700	[thread overview]
Message-ID: <20210819195443.1191973-1-ntspring@fb.com> (raw)

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.

Signed-off-by: Neil Spring <ntspring@fb.com>
---
v2: - fix email formatting


 net/ipv4/tcp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index f931def6302e..2dc6212d5888 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3338,6 +3338,8 @@ 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_ssthresh,
+				       tp->window_clamp);
 	}
 	return 0;
 }
-- 
2.30.2


             reply	other threads:[~2021-08-19 19:55 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-19 19:54 Neil Spring [this message]
2021-08-25  2:44 ` [PATCH net-next v2] tcp: enable mid stream window clamp Eric Dumazet
2021-08-25 16:57   ` Neil Spring
2021-08-25 17:30     ` Eric Dumazet
2021-08-25 20:49       ` Neil Spring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210819195443.1191973-1-ntspring@fb.com \
    --to=ntspring@fb.com \
    --cc=davem@davemloft.net \
    --cc=dsahern@kernel.org \
    --cc=edumazet@google.com \
    --cc=kuba@kernel.org \
    --cc=ncardwell@google.com \
    --cc=netdev@vger.kernel.org \
    --cc=ycheng@google.com \
    --cc=yoshfuji@linux-ipv6.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).