summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Dumazet <edumazet@google.com>2018-12-05 14:24:31 -0800
committerDavid S. Miller <davem@davemloft.net>2018-12-05 16:31:59 -0800
commit41727549de3e7281feb174d568c6e46823db8684 (patch)
tree3f09b74ec1221e468e4036cb13c0cdc038ce970b
parente37d05a538a6656e108f7704ad66e1ccc13d6f68 (diff)
downloadlinux-stable-41727549de3e7281feb174d568c6e46823db8684.tar.gz
linux-stable-41727549de3e7281feb174d568c6e46823db8684.tar.bz2
linux-stable-41727549de3e7281feb174d568c6e46823db8684.zip
tcp: Do not underestimate rwnd_limited
If available rwnd is too small, tcp_tso_should_defer() can decide it is worth waiting before splitting a TSO packet. This really means we are rwnd limited. Fixes: 5615f88614a4 ("tcp: instrument how long TCP is limited by receive window") Signed-off-by: Eric Dumazet <edumazet@google.com> Acked-by: Soheil Hassas Yeganeh <soheil@google.com> Reviewed-by: Yuchung Cheng <ycheng@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv4/tcp_output.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index 68b5326f7321..318690234758 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -2356,8 +2356,11 @@ static bool tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle,
} else {
if (!push_one &&
tcp_tso_should_defer(sk, skb, &is_cwnd_limited,
- max_segs))
+ max_segs)) {
+ if (!is_cwnd_limited)
+ is_rwnd_limited = true;
break;
+ }
}
limit = mss_now;