diff options
author | Eric Dumazet <edumazet@google.com> | 2018-11-11 09:41:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-11-11 16:54:53 -0500 |
commit | 1c09f7d073b1d1ce85765c5552e4b40a6b6ba770 (patch) | |
tree | 74234c3415f009f5bbe0be7e9dfa81a04e090dab /net/ipv4/tcp_output.c | |
parent | 5e13a0d3f5c11df7eb297e6583cf874a79a00374 (diff) |
tcp: do not try to defer skbs with eor mark (MSG_EOR)
Applications using MSG_EOR are giving a strong hint to TCP stack :
Subsequent sendmsg() can not append more bytes to skbs having
the EOR mark.
Do not try to TSO defer suchs skbs, there is really no hope.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Soheil Hassas Yeganeh <soheil@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r-- | net/ipv4/tcp_output.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 9c34b97d365d..35feadf48030 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -1944,6 +1944,10 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb, | |||
1944 | if ((skb != tcp_write_queue_tail(sk)) && (limit >= skb->len)) | 1944 | if ((skb != tcp_write_queue_tail(sk)) && (limit >= skb->len)) |
1945 | goto send_now; | 1945 | goto send_now; |
1946 | 1946 | ||
1947 | /* If this packet won't get more data, do not wait. */ | ||
1948 | if (TCP_SKB_CB(skb)->eor) | ||
1949 | goto send_now; | ||
1950 | |||
1947 | win_divisor = READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_tso_win_divisor); | 1951 | win_divisor = READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_tso_win_divisor); |
1948 | if (win_divisor) { | 1952 | if (win_divisor) { |
1949 | u32 chunk = min(tp->snd_wnd, tp->snd_cwnd * tp->mss_cache); | 1953 | u32 chunk = min(tp->snd_wnd, tp->snd_cwnd * tp->mss_cache); |