Fix tcp tx buffer allocation

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

diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c
index 48000a6..4ba1529 100644 (file)
--- a/src/vnet/session/session.c
+++ b/src/vnet/session/session.c
@@ -64,7 +64,8 @@ stream_session_create_i (segment_manager_t * sm, transport_connection_t * tc,
   s->server_tx_fifo = server_tx_fifo;
 
   /* Initialize state machine, such as it is... */
-  s->session_type = tc->proto;
+  s->session_type = session_type_from_proto_and_ip (tc->transport_proto,
+                                                   tc->is_ip4);
   s->session_state = SESSION_STATE_CONNECTING;
   s->svm_segment_index = fifo_segment_index;
   s->thread_index = thread_index;
@@ -354,8 +355,7 @@ stream_session_init_fifos_pointers (transport_connection_t * tc,
 }
 
 int
-stream_session_connect_notify (transport_connection_t * tc, u8 sst,
-                              u8 is_fail)
+stream_session_connect_notify (transport_connection_t * tc, u8 is_fail)
 {
   application_t *app;
   stream_session_t *new_s = 0;
@@ -365,7 +365,7 @@ stream_session_connect_notify (transport_connection_t * tc, u8 sst,
 
   handle = stream_session_half_open_lookup_handle (&tc->lcl_ip, &tc->rmt_ip,
                                                   tc->lcl_port, tc->rmt_port,
-                                                  tc->proto);
+                                                  tc->transport_proto);
   if (handle == HALF_OPEN_LOOKUP_INVALID_VALUE)
     {
       clib_warning ("This can't be good!");
@@ -391,7 +391,7 @@ stream_session_connect_notify (transport_connection_t * tc, u8 sst,
        new_s->app_index = app->index;
     }
 
-  /* Notify client */
+  /* Notify client application */
   if (app->cb_fns.session_connected_callback (app->index, api_context, new_s,
                                              is_fail))
     {
@@ -406,7 +406,7 @@ stream_session_connect_notify (transport_connection_t * tc, u8 sst,
     }
 
   /* Cleanup session lookup */
-  stream_session_half_open_table_del (sst, tc);
+  stream_session_half_open_table_del (tc);
 
   return error;
 }
@@ -567,7 +567,7 @@ stream_session_open (u32 app_index, session_type_t st,
   handle = (((u64) app_index) << 32) | (u64) tc->c_index;
 
   /* Add to the half-open lookup table */
-  stream_session_half_open_table_add (st, tc, handle);
+  stream_session_half_open_table_add (tc, handle);
 
   *res = tc;
 
@@ -759,6 +759,7 @@ session_manager_main_enable (vlib_main_t * vm)
   session_manager_main_t *smm = &session_manager_main;
   vlib_thread_main_t *vtm = vlib_get_thread_main ();
   u32 num_threads;
+  u32 preallocated_sessions_per_worker;
   int i;
 
   num_threads = 1 /* main thread */  + vtm->n_threads;
@@ -795,15 +796,35 @@ session_manager_main_enable (vlib_main_t * vm)
   for (i = 0; i < vec_len (smm->vpp_event_queues); i++)
     session_vpp_event_queue_allocate (smm, i);
 
-  /* $$$$ preallocate hack config parameter */
-  for (i = 0; i < smm->preallocated_sessions; i++)
+  /* Preallocate sessions */
+  if (num_threads == 1)
     {
-      stream_session_t *ss __attribute__ ((unused));
-      pool_get_aligned (smm->sessions[0], ss, CLIB_CACHE_LINE_BYTES);
+      for (i = 0; i < smm->preallocated_sessions; i++)
+       {
+         stream_session_t *ss __attribute__ ((unused));
+         pool_get_aligned (smm->sessions[0], ss, CLIB_CACHE_LINE_BYTES);
+       }
+
+      for (i = 0; i < smm->preallocated_sessions; i++)
+       pool_put_index (smm->sessions[0], i);
     }
+  else
+    {
+      int j;
+      preallocated_sessions_per_worker = smm->preallocated_sessions /
+       (num_threads - 1);
 
-  for (i = 0; i < smm->preallocated_sessions; i++)
-    pool_put_index (smm->sessions[0], i);
+      for (j = 1; j < num_threads; j++)
+       {
+         for (i = 0; i < preallocated_sessions_per_worker; i++)
+           {
+             stream_session_t *ss __attribute__ ((unused));
+             pool_get_aligned (smm->sessions[j], ss, CLIB_CACHE_LINE_BYTES);
+           }
+         for (i = 0; i < preallocated_sessions_per_worker; i++)
+           pool_put_index (smm->sessions[j], i);
+       }
+    }
 
   session_lookup_init ();
 
@@ -863,6 +884,7 @@ session_config_fn (vlib_main_t * vm, unformat_input_t * input)
 {
   session_manager_main_t *smm = &session_manager_main;
   u32 nitems;
+  uword tmp;
 
   while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
     {
@@ -873,9 +895,53 @@ session_config_fn (vlib_main_t * vm, unformat_input_t * input)
          else
            clib_warning ("event queue length %d too small, ignored", nitems);
        }
-      if (unformat (input, "preallocated-sessions %d",
-                   &smm->preallocated_sessions))
+      else if (unformat (input, "preallocated-sessions %d",
+                        &smm->preallocated_sessions))
+       ;
+      else if (unformat (input, "v4-session-table-buckets %d",
+                        &smm->configured_v4_session_table_buckets))
        ;
+      else if (unformat (input, "v4-halfopen-table-buckets %d",
+                        &smm->configured_v4_halfopen_table_buckets))
+       ;
+      else if (unformat (input, "v6-session-table-buckets %d",
+                        &smm->configured_v6_session_table_buckets))
+       ;
+      else if (unformat (input, "v6-halfopen-table-buckets %d",
+                        &smm->configured_v6_halfopen_table_buckets))
+       ;
+      else if (unformat (input, "v4-session-table-memory %U",
+                        unformat_memory_size, &tmp))
+       {
+         if (tmp >= 0x100000000)
+           return clib_error_return (0, "memory size %llx (%lld) too large",
+                                     tmp, tmp);
+         smm->configured_v4_session_table_memory = tmp;
+       }
+      else if (unformat (input, "v4-halfopen-table-memory %U",
+                        unformat_memory_size, &tmp))
+       {
+         if (tmp >= 0x100000000)
+           return clib_error_return (0, "memory size %llx (%lld) too large",
+                                     tmp, tmp);
+         smm->configured_v4_halfopen_table_memory = tmp;
+       }
+      else if (unformat (input, "v6-session-table-memory %U",
+                        unformat_memory_size, &tmp))
+       {
+         if (tmp >= 0x100000000)
+           return clib_error_return (0, "memory size %llx (%lld) too large",
+                                     tmp, tmp);
+         smm->configured_v6_session_table_memory = tmp;
+       }
+      else if (unformat (input, "v6-halfopen-table-memory %U",
+                        unformat_memory_size, &tmp))
+       {
+         if (tmp >= 0x100000000)
+           return clib_error_return (0, "memory size %llx (%lld) too large",
+                                     tmp, tmp);
+         smm->configured_v6_halfopen_table_memory = tmp;
+       }
       else
        return clib_error_return (0, "unknown input `%U'",
                                  format_unformat_error, input);