tcp: fast retransmit improvements

[vpp.git] / src / vnet / tcp / tcp.c

diff --git a/src/vnet/tcp/tcp.c b/src/vnet/tcp/tcp.c
index 884602d..cb05b8c 100644 (file)
--- a/src/vnet/tcp/tcp.c
+++ b/src/vnet/tcp/tcp.c
@@ -77,7 +77,7 @@ tcp_connection_bind (u32 session_index, transport_endpoint_t * lcl)
   void *iface_ip;
 
   pool_get (tm->listener_pool, listener);
-  memset (listener, 0, sizeof (*listener));
+  clib_memset (listener, 0, sizeof (*listener));
 
   listener->c_c_index = listener - tm->listener_pool;
   listener->c_lcl_port = lcl->port;
@@ -121,7 +121,7 @@ tcp_connection_unbind (u32 listener_index)
 
   /* Poison the entry */
   if (CLIB_DEBUG > 0)
-    memset (tc, 0xFA, sizeof (*tc));
+    clib_memset (tc, 0xFA, sizeof (*tc));
 
   pool_put_index (tm->listener_pool, listener_index);
 }
@@ -153,7 +153,7 @@ tcp_half_open_connection_del (tcp_connection_t * tc)
   clib_spinlock_lock_if_init (&tm->half_open_lock);
   pool_put_index (tm->half_open_connections, tc->c_c_index);
   if (CLIB_DEBUG)
-    memset (tc, 0xFA, sizeof (*tc));
+    clib_memset (tc, 0xFA, sizeof (*tc));
   clib_spinlock_unlock_if_init (&tm->half_open_lock);
 }
 
@@ -185,7 +185,7 @@ tcp_half_open_connection_new (void)
   tcp_connection_t *tc = 0;
   ASSERT (vlib_get_thread_index () == 0);
   pool_get (tm->half_open_connections, tc);
-  memset (tc, 0, sizeof (*tc));
+  clib_memset (tc, 0, sizeof (*tc));
   tc->c_c_index = tc - tm->half_open_connections;
   return tc;
 }
@@ -210,7 +210,8 @@ tcp_connection_cleanup (tcp_connection_t * tc)
       /* Try to remove the half-open connection. If this is not the owning
        * thread, tc won't be removed. Retransmit or establish timers will
        * eventually expire and call again cleanup on the right thread. */
-      tcp_half_open_connection_cleanup (tc);
+      if (tcp_half_open_connection_cleanup (tc))
+       tc->flags |= TCP_CONN_HALF_OPEN_DONE;
     }
   else
     {
@@ -224,7 +225,7 @@ tcp_connection_cleanup (tcp_connection_t * tc)
 
       /* Poison the entry */
       if (CLIB_DEBUG > 0)
-       memset (tc, 0xFA, sizeof (*tc));
+       clib_memset (tc, 0xFA, sizeof (*tc));
       pool_put (tm->connections[thread_index], tc);
     }
 }
@@ -251,7 +252,7 @@ tcp_connection_new (u8 thread_index)
   tcp_connection_t *tc;
 
   pool_get (tm->connections[thread_index], tc);
-  memset (tc, 0, sizeof (*tc));
+  clib_memset (tc, 0, sizeof (*tc));
   tc->c_c_index = tc - tm->connections[thread_index];
   tc->c_thread_index = thread_index;
   return tc;
@@ -322,8 +323,10 @@ tcp_connection_close (tcp_connection_t * tc)
       tc->state = TCP_STATE_CLOSED;
       break;
     case TCP_STATE_SYN_RCVD:
+      tcp_connection_timers_reset (tc);
       tcp_send_fin (tc);
       tc->state = TCP_STATE_FIN_WAIT_1;
+      tcp_timer_update (tc, TCP_TIMER_WAITCLOSE, TCP_CLEANUP_TIME);
       break;
     case TCP_STATE_ESTABLISHED:
       if (!session_tx_fifo_max_dequeue (&tc->connection))
@@ -432,7 +435,7 @@ tcp_connection_select_lb_bucket (tcp_connection_t * tc, const dpo_id_t * dpo,
   if (tc->c_is_ip4)
     {
       ip4_tcp_hdr_t hdr;
-      memset (&hdr, 0, sizeof (hdr));
+      clib_memset (&hdr, 0, sizeof (hdr));
       hdr.ip.protocol = IP_PROTOCOL_TCP;
       hdr.ip.address_pair.src.as_u32 = tc->c_lcl_ip.ip4.as_u32;
       hdr.ip.address_pair.dst.as_u32 = tc->c_rmt_ip.ip4.as_u32;
@@ -443,7 +446,7 @@ tcp_connection_select_lb_bucket (tcp_connection_t * tc, const dpo_id_t * dpo,
   else
     {
       ip6_tcp_hdr_t hdr;
-      memset (&hdr, 0, sizeof (hdr));
+      clib_memset (&hdr, 0, sizeof (hdr));
       hdr.ip.protocol = IP_PROTOCOL_TCP;
       clib_memcpy (&hdr.ip.src_address, &tc->c_lcl_ip.ip6,
                   sizeof (ip6_address_t));
@@ -947,7 +950,8 @@ format_tcp_scoreboard (u8 * s, va_list * args)
 
   hole = scoreboard_first_hole (sb);
   if (hole)
-    s = format (s, "\n head %u tail %u holes:\n", sb->head, sb->tail);
+    s = format (s, "\n head %u tail %u %u holes:\n", sb->head, sb->tail,
+               pool_elts (sb->holes));
 
   while (hole)
     {
@@ -1024,7 +1028,7 @@ tcp_snd_space_inline (tcp_connection_t * tc)
 {
   int snd_space, snt_limited;
 
-  if (PREDICT_TRUE (tcp_in_cong_recovery (tc) == 0))
+  if (PREDICT_TRUE (!tcp_in_fastrecovery (tc)))
     {
       snd_space = tcp_available_output_snd_space (tc);
 
@@ -1044,16 +1048,6 @@ tcp_snd_space_inline (tcp_connection_t * tc)
       return tcp_round_snd_space (tc, snd_space);
     }
 
-  if (tcp_in_recovery (tc))
-    {
-      tc->snd_nxt = tc->snd_una_max;
-      snd_space = tcp_available_snd_wnd (tc) - tc->snd_rxt_bytes
-       - (tc->snd_una_max - tc->snd_congestion);
-      if (snd_space <= 0 || (tc->snd_una_max - tc->snd_una) >= tc->snd_wnd)
-       return 0;
-      return tcp_round_snd_space (tc, snd_space);
-    }
-
   /* RFC 5681: When previously unsent data is available and the new value of
    * cwnd and the receiver's advertised window allow, a TCP SHOULD send 1*SMSS
    * bytes of previously unsent data. */
@@ -1100,6 +1094,7 @@ tcp_update_time (f64 now, u8 thread_index)
   tw_timer_expire_timers_16t_2w_512sl (&tcp_main.
                                       wrk_ctx[thread_index].timer_wheel,
                                       now);
+  tcp_do_fastretransmits (thread_index);
   tcp_flush_frames_to_output (thread_index);
 }
 
@@ -1450,7 +1445,7 @@ tcp_configure_v4_source_address_range (vlib_main_t * vm,
                              ip4_address_t * hi_addr, u32 fib_index,
                              int is_del);
 
-  memset (&prefix, 0, sizeof (prefix));
+  clib_memset (&prefix, 0, sizeof (prefix));
 
   fib_index = fib_table_find (FIB_PROTOCOL_IP4, table_id);
 
@@ -1535,7 +1530,7 @@ tcp_configure_v6_source_address_range (vlib_main_t * vm,
   fib_node_index_t fei;
   u32 sw_if_index;
 
-  memset (&prefix, 0, sizeof (prefix));
+  clib_memset (&prefix, 0, sizeof (prefix));
 
   fib_index = fib_table_find (FIB_PROTOCOL_IP6, table_id);
 
@@ -1760,7 +1755,7 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
   if (!tc)
     return s;
 
-  memset (dummy_tc, 0, sizeof (*dummy_tc));
+  clib_memset (dummy_tc, 0, sizeof (*dummy_tc));
   tcp_connection_timers_init (dummy_tc);
   scoreboard_init (&dummy_tc->sack_sb);
   dummy_tc->rcv_opts.flags |= TCP_OPTS_FLAG_SACK;