1 files changed, 39 insertions, 5 deletions

diff --git a/src/vnet/tcp/tcp_cubic.c b/src/vnet/tcp/tcp_cubic.c
index b9a1c3da06a..55bbcca3497 100644
--- a/src/vnet/tcp/tcp_cubic.c
+++ b/src/vnet/tcp/tcp_cubic.c
@@ -20,6 +20,15 @@
 #define cubic_c		0.4
 #define west_const 	(3 * (1 - beta_cubic) / (1 + beta_cubic))
 
+typedef struct cubic_cfg_
+{
+  u8 fast_convergence;
+} cubic_cfg_t;
+
+static cubic_cfg_t cubic_cfg = {
+  .fast_convergence = 1,
+};
+
 typedef struct cubic_data_
 {
   /** time period (in seconds) needed to increase the current window
@@ -29,7 +38,7 @@ typedef struct cubic_data_
   /** time (in sec) since the start of current congestion avoidance */
   f64 t_start;
 
-  /** Inflection point of the cubic function */
+  /** Inflection point of the cubic function (in snd_mss segments) */
   u32 w_max;
 
 } __clib_packed cubic_data_t;
@@ -84,8 +93,13 @@ static void
 cubic_congestion (tcp_connection_t * tc)
 {
   cubic_data_t *cd = (cubic_data_t *) tcp_cc_data (tc);
+  u32 w_max;
+
+  w_max = tc->cwnd / tc->snd_mss;
+  if (cubic_cfg.fast_convergence && w_max < cd->w_max)
+    w_max = w_max * ((1.0 + beta_cubic) / 2.0);
 
-  cd->w_max = tc->cwnd / tc->snd_mss;
+  cd->w_max = w_max;
   tc->ssthresh = clib_max (tc->cwnd * beta_cubic, 2 * tc->snd_mss);
 }
 
@@ -120,7 +134,7 @@ cubic_rcv_ack (tcp_connection_t * tc)
   rtt_sec = clib_min (tc->mrtt_us, (f64) tc->srtt * TCP_TICK);
 
   w_cubic = W_cubic (cd, t + rtt_sec) * tc->snd_mss;
-  w_aimd = W_est (cd, t, rtt_sec) * tc->snd_mss;
+  w_aimd = (u64) W_est (cd, t, rtt_sec) * tc->snd_mss;
   if (w_cubic < w_aimd)
     {
       tcp_cwnd_accumulate (tc, tc->cwnd, tc->bytes_acked);
@@ -148,7 +162,7 @@ cubic_rcv_ack (tcp_connection_t * tc)
       else
 	{
 	  /* Practically we can't increment so just inflate threshold */
-	  thresh = 1000 * tc->cwnd;
+	  thresh = 50 * tc->cwnd;
 	}
       tcp_cwnd_accumulate (tc, thresh, tc->bytes_acked);
     }
@@ -165,12 +179,32 @@ cubic_conn_init (tcp_connection_t * tc)
   cd->t_start = cubic_time (tc->c_thread_index);
 }
 
+static uword
+cubic_unformat_config (unformat_input_t * input)
+{
+  if (!input)
+    return 0;
+
+  unformat_skip_white_space (input);
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "no-fast-convergence"))
+	cubic_cfg.fast_convergence = 0;
+      else
+	return 0;
+    }
+  return 1;
+}
+
 const static tcp_cc_algorithm_t tcp_cubic = {
+  .name = "cubic",
+  .unformat_cfg = cubic_unformat_config,
   .congestion = cubic_congestion,
   .recovered = cubic_recovered,
   .rcv_ack = cubic_rcv_ack,
   .rcv_cong_ack = newreno_rcv_cong_ack,
-  .init = cubic_conn_init
+  .init = cubic_conn_init,
 };
 
 clib_error_t *