]> nv-tegra.nvidia Code Review - linux-3.10.git/commitdiff
[TCP]: Fix stretch ACK performance killer when doing ucopy.
authorDavid S. Miller <davem@davemloft.net>
Mon, 23 May 2005 19:03:06 +0000 (12:03 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 23 May 2005 19:03:06 +0000 (12:03 -0700)
When we are doing ucopy, we try to defer the ACK generation to
cleanup_rbuf().  This works most of the time very well, but if the
ucopy prequeue is large, this ACKing behavior kills performance.

With TSO, it is possible to fill the prequeue so large that by the
time the ACK is sent and gets back to the sender, most of the window
has emptied of data and performance suffers significantly.

This behavior does help in some cases, so we should think about
re-enabling this trick in the future, using some kind of limit in
order to avoid the bug case.

Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp_input.c

index 79835a67a27420f4347aa2cab1139ae7c5724307..5bad504630a3b641158af85f402cc91da27e4d06 100644 (file)
@@ -4355,16 +4355,7 @@ int tcp_rcv_established(struct sock *sk, struct sk_buff *skb,
                                        goto no_ack;
                        }
 
                                        goto no_ack;
                        }
 
-                       if (eaten) {
-                               if (tcp_in_quickack_mode(tp)) {
-                                       tcp_send_ack(sk);
-                               } else {
-                                       tcp_send_delayed_ack(sk);
-                               }
-                       } else {
-                               __tcp_ack_snd_check(sk, 0);
-                       }
-
+                       __tcp_ack_snd_check(sk, 0);
 no_ack:
                        if (eaten)
                                __kfree_skb(skb);
 no_ack:
                        if (eaten)
                                __kfree_skb(skb);