]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
tcp: do not try to defer skbs with eor mark (MSG_EOR)
authorEric Dumazet <edumazet@google.com>
Sun, 11 Nov 2018 14:41:29 +0000 (06:41 -0800)
committerDavid S. Miller <davem@davemloft.net>
Sun, 11 Nov 2018 21:54:53 +0000 (13:54 -0800)
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>
net/ipv4/tcp_output.c

index 9c34b97d365d719ff76250bc9fe7fa20495a3ed2..35feadf480300cd061411d65257f06ee658daa3c 100644 (file)
@@ -1944,6 +1944,10 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb,
        if ((skb != tcp_write_queue_tail(sk)) && (limit >= skb->len))
                goto send_now;
 
+       /* If this packet won't get more data, do not wait. */
+       if (TCP_SKB_CB(skb)->eor)
+               goto send_now;
+
        win_divisor = READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_tso_win_divisor);
        if (win_divisor) {
                u32 chunk = min(tp->snd_wnd, tp->snd_cwnd * tp->mss_cache);