tcp: consume incoming buffers instead of reusing

[vpp.git] / src / vnet / session / transport.c

diff --git a/src/vnet/session/transport.c b/src/vnet/session/transport.c
index 0dd9ccd..06c541a 100644 (file)
--- a/src/vnet/session/transport.c
+++ b/src/vnet/session/transport.c
@@ -47,7 +47,8 @@ static clib_spinlock_t local_endpoints_lock;
  */
 static double transport_pacer_period;
 
-#define TRANSPORT_PACER_MIN_MSS 1460
+#define TRANSPORT_PACER_MIN_MSS        1460
+#define TRANSPORT_PACER_MIN_BURST      TRANSPORT_PACER_MIN_MSS
 
 u8 *
 format_transport_proto (u8 * s, va_list * args)
@@ -518,7 +519,8 @@ spacer_update_bucket (spacer_t * pacer, u32 bytes)
 static inline void
 spacer_update_max_burst_size (spacer_t * pacer, u32 max_burst_bytes)
 {
-  pacer->max_burst_size = clib_max (max_burst_bytes, TRANSPORT_PACER_MIN_MSS);
+  pacer->max_burst_size = clib_max (max_burst_bytes,
+                                   TRANSPORT_PACER_MIN_BURST);
 }
 
 static inline void
@@ -529,32 +531,40 @@ spacer_set_pace_rate (spacer_t * pacer, u64 rate_bytes_per_sec)
 }
 
 void
-transport_connection_tx_pacer_init (transport_connection_t * tc,
-                                   u32 rate_bytes_per_sec,
-                                   u32 initial_bucket)
+transport_connection_tx_pacer_reset (transport_connection_t * tc,
+                                    u32 rate_bytes_per_sec,
+                                    u32 start_bucket, u64 time_now)
 {
-  vlib_main_t *vm = vlib_get_main ();
-  u64 time_now = vm->clib_time.last_cpu_time;
   spacer_t *pacer = &tc->pacer;
   f64 dispatch_period;
   u32 burst_size;
 
-  tc->flags |= TRANSPORT_CONNECTION_F_IS_TX_PACED;
   dispatch_period = transport_dispatch_period (tc->thread_index);
   burst_size = rate_bytes_per_sec * dispatch_period;
   spacer_update_max_burst_size (&tc->pacer, burst_size);
   spacer_set_pace_rate (&tc->pacer, rate_bytes_per_sec);
   pacer->last_update = time_now >> SPACER_CPU_TICKS_PER_PERIOD_SHIFT;
-  pacer->bucket = initial_bucket;
+  pacer->bucket = start_bucket;
+}
+
+void
+transport_connection_tx_pacer_init (transport_connection_t * tc,
+                                   u32 rate_bytes_per_sec,
+                                   u32 initial_bucket)
+{
+  vlib_main_t *vm = vlib_get_main ();
+  tc->flags |= TRANSPORT_CONNECTION_F_IS_TX_PACED;
+  transport_connection_tx_pacer_reset (tc, rate_bytes_per_sec,
+                                      initial_bucket,
+                                      vm->clib_time.last_cpu_time);
 }
 
 void
 transport_connection_tx_pacer_update (transport_connection_t * tc,
                                      u64 bytes_per_sec)
 {
-  u32 burst_size;
-
-  burst_size = bytes_per_sec * transport_dispatch_period (tc->thread_index);
+  f64 dispatch_period = transport_dispatch_period (tc->thread_index);
+  u32 burst_size = 1.1 * bytes_per_sec * dispatch_period;
   spacer_set_pace_rate (&tc->pacer, bytes_per_sec);
   spacer_update_max_burst_size (&tc->pacer, burst_size);
 }