tcp: tso: remove tp->tso_deferred

TSO relies on ability to defer sending a small amount of packets.
Heuristic is to wait for future ACKS in hope to send more packets at once.
Current algorithm uses a per socket tso_deferred field as a pseudo timer.

This pseudo timer relies on future ACK, but there is no guarantee
we receive them in time.

Fix would be to use a real timer, but cost of such timer is probably too
expensive for typical cases.

This patch changes the logic to test the time of last transmit,
because we should not add bursts of more than 1ms for any given flow.

We've used this patch for about two years at Google, before FQ/pacing
as it would reduce a fair amount of bursts.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Yuchung Cheng <ycheng@google.com>
Signed-off-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 1a7adb411647436feac207029d8e8efe19ac1193..97dbf16f7d9d236686f4c1beead17626b50ae4aa 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -236,7 +236,6 @@ struct tcp_sock {
        u32     lost_out;       /* Lost packets                 */
        u32     sacked_out;     /* SACK'd packets                       */
        u32     fackets_out;    /* FACK'd packets                       */
-       u32     tso_deferred;
 
        /* from STCP, retrans queue hinting */
        struct sk_buff* lost_skb_hint;

diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index a2a796c5536b032264e2a71f596f673e8307f25c..cb95c7a9d1e7c9fa24cc6bb443c65010a2039ab6 100644 (file)
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -1763,9 +1763,10 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb,
        if (icsk->icsk_ca_state != TCP_CA_Open)
                goto send_now;
 
-       /* Defer for less than two clock ticks. */
-       if (tp->tso_deferred &&
-           (((u32)jiffies << 1) >> 1) - (tp->tso_deferred >> 1) > 1)
+       /* Avoid bursty behavior by allowing defer
+        * only if the last write was recent.
+        */
+       if ((s32)(tcp_time_stamp - tp->lsndtime) > 0)
                goto send_now;
 
        in_flight = tcp_packets_in_flight(tp);
@@ -1807,11 +1808,7 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb,
                        goto send_now;
        }
 
-       /* Ok, it looks like it is advisable to defer.
-        * Do not rearm the timer if already set to not break TCP ACK clocking.
-        */
-       if (!tp->tso_deferred)
-               tp->tso_deferred = 1 | (jiffies << 1);
+       /* Ok, it looks like it is advisable to defer. */
 
        if (cong_win < send_win && cong_win < skb->len)
                *is_cwnd_limited = true;
@@ -1819,7 +1816,6 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb,
        return true;
 
 send_now:
-       tp->tso_deferred = 0;
        return false;
 }