X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_worker.c;h=13a3edec486a6cf3ee02c8def1093b7a34d0a494;hb=534468e9f768ae7465ef722520dadfd916cdc9fb;hp=bb51cb71f03689ebfb20ecfd3e2d9c7a8fc85018;hpb=62ddc030296e9f65c59cd25fa81112e0a09cf20d;p=vpp.git

diff --git a/src/vnet/session/application_worker.c b/src/vnet/session/application_worker.c
index bb51cb71f03..13a3edec486 100644
--- a/src/vnet/session/application_worker.c
+++ b/src/vnet/session/application_worker.c
@@ -32,7 +32,7 @@ app_worker_alloc (application_t * app)
   app_wrk->app_index = app->app_index;
   app_wrk->wrk_map_index = ~0;
   app_wrk->connects_seg_manager = APP_INVALID_SEGMENT_MANAGER_INDEX;
-  app_wrk->first_segment_manager = APP_INVALID_SEGMENT_MANAGER_INDEX;
+  clib_spinlock_init (&app_wrk->detached_seg_managers_lock);
   APP_DBG ("New app %v worker %u", app->name, app_wrk->wrk_index);
   return app_wrk;
 }
@@ -56,8 +56,9 @@ app_worker_free (app_worker_t * app_wrk)
 {
   application_t *app = application_get (app_wrk->app_index);
   vnet_unlisten_args_t _a, *a = &_a;
-  u64 handle, *handles = 0;
+  u64 handle, *handles = 0, *sm_indices = 0;
   segment_manager_t *sm;
+  session_handle_t *sh;
   session_t *ls;
   u32 sm_index;
   int i;
@@ -70,19 +71,29 @@ app_worker_free (app_worker_t * app_wrk)
   hash_foreach (handle, sm_index, app_wrk->listeners_table, ({
     ls = listen_session_get_from_handle (handle);
     vec_add1 (handles, app_listen_session_handle (ls));
+    vec_add1 (sm_indices, sm_index);
     sm = segment_manager_get (sm_index);
-    sm->app_wrk_index = SEGMENT_MANAGER_INVALID_APP_INDEX;
   }));
   /* *INDENT-ON* */
 
   for (i = 0; i < vec_len (handles); i++)
     {
+      /* Cleanup listener */
       a->app_index = app->app_index;
       a->wrk_map_index = app_wrk->wrk_map_index;
       a->handle = handles[i];
-      /* seg manager is removed when unbind completes */
       (void) vnet_unlisten (a);
+
+      sm = segment_manager_get_if_valid (sm_indices[i]);
+      if (sm && !segment_manager_app_detached (sm))
+	{
+	  sm->first_is_protected = 0;
+	  segment_manager_init_free (sm);
+	}
     }
+  vec_reset_length (handles);
+  vec_free (sm_indices);
+  hash_free (app_wrk->listeners_table);
 
   /*
    * Connects segment manager cleanup
@@ -96,18 +107,25 @@ app_worker_free (app_worker_t * app_wrk)
       segment_manager_init_free (sm);
     }
 
-  /* If first segment manager is used by a listener */
-  if (app_wrk->first_segment_manager != APP_INVALID_SEGMENT_MANAGER_INDEX
-      && app_wrk->first_segment_manager != app_wrk->connects_seg_manager)
+  /*
+   * Half-open cleanup
+   */
+
+  pool_foreach (sh, app_wrk->half_open_table)
+    session_cleanup_half_open (*sh);
+
+  pool_free (app_wrk->half_open_table);
+
+  /*
+   * Detached listener segment managers cleanup
+   */
+  for (i = 0; i < vec_len (app_wrk->detached_seg_managers); i++)
     {
-      sm = segment_manager_get (app_wrk->first_segment_manager);
-      sm->first_is_protected = 0;
-      sm->app_wrk_index = SEGMENT_MANAGER_INVALID_APP_INDEX;
-      /* .. and has no fifos, e.g. it might be used for redirected sessions,
-       * remove it */
-      if (!segment_manager_has_fifos (sm))
-	segment_manager_free (sm);
+      sm = segment_manager_get (app_wrk->detached_seg_managers[i]);
+      segment_manager_init_free (sm);
     }
+  vec_free (app_wrk->detached_seg_managers);
+  clib_spinlock_free (&app_wrk->detached_seg_managers_lock);
 
   if (CLIB_DEBUG)
     clib_memset (app_wrk, 0xfe, sizeof (*app_wrk));
@@ -127,20 +145,11 @@ app_worker_get_app (u32 wrk_index)
 static segment_manager_t *
 app_worker_alloc_segment_manager (app_worker_t * app_wrk)
 {
-  segment_manager_t *sm = 0;
-
-  /* If the first segment manager is not in use, don't allocate a new one */
-  if (app_wrk->first_segment_manager != APP_INVALID_SEGMENT_MANAGER_INDEX
-      && app_wrk->first_segment_manager_in_use == 0)
-    {
-      sm = segment_manager_get (app_wrk->first_segment_manager);
-      app_wrk->first_segment_manager_in_use = 1;
-      return sm;
-    }
+  segment_manager_t *sm;
 
   sm = segment_manager_alloc ();
   sm->app_wrk_index = app_wrk->wrk_index;
-
+  segment_manager_init (sm);
   return sm;
 }
 
@@ -154,10 +163,10 @@ app_worker_alloc_session_fifos (segment_manager_t * sm, session_t * s)
 						 &rx_fifo, &tx_fifo)))
     return rv;
 
-  rx_fifo->master_session_index = s->session_index;
+  rx_fifo->shr->master_session_index = s->session_index;
   rx_fifo->master_thread_index = s->thread_index;
 
-  tx_fifo->master_session_index = s->session_index;
+  tx_fifo->shr->master_session_index = s->session_index;
   tx_fifo->master_thread_index = s->thread_index;
 
   s->rx_fifo = rx_fifo;
@@ -173,16 +182,17 @@ app_worker_init_listener (app_worker_t * app_wrk, session_t * ls)
   /* Allocate segment manager. All sessions derived out of a listen session
    * have fifos allocated by the same segment manager. */
   if (!(sm = app_worker_alloc_segment_manager (app_wrk)))
-    return -1;
+    return SESSION_E_ALLOC;
 
   /* Keep track of the segment manager for the listener or this worker */
   hash_set (app_wrk->listeners_table, listen_session_get_handle (ls),
 	    segment_manager_index (sm));
 
-  if (session_transport_service_type (ls) == TRANSPORT_SERVICE_CL)
+  if (transport_connection_is_cless (session_get_transport (ls)))
     {
-      if (!ls->rx_fifo && app_worker_alloc_session_fifos (sm, ls))
-	return -1;
+      if (ls->rx_fifo)
+	return SESSION_E_NOSUPPORT;
+      return app_worker_alloc_session_fifos (sm, ls);
     }
   return 0;
 }
@@ -192,9 +202,10 @@ app_worker_start_listen (app_worker_t * app_wrk,
 			 app_listener_t * app_listener)
 {
   session_t *ls;
+  int rv;
 
   if (clib_bitmap_get (app_listener->workers, app_wrk->wrk_map_index))
-    return VNET_API_ERROR_ADDRESS_IN_USE;
+    return SESSION_E_ALREADY_LISTENING;
 
   app_listener->workers = clib_bitmap_set (app_listener->workers,
 					   app_wrk->wrk_map_index, 1);
@@ -202,43 +213,87 @@ app_worker_start_listen (app_worker_t * app_wrk,
   if (app_listener->session_index != SESSION_INVALID_INDEX)
     {
       ls = session_get (app_listener->session_index, 0);
-      if (app_worker_init_listener (app_wrk, ls))
-	return -1;
+      if ((rv = app_worker_init_listener (app_wrk, ls)))
+	return rv;
     }
 
   if (app_listener->local_index != SESSION_INVALID_INDEX)
     {
       ls = session_get (app_listener->local_index, 0);
-      if (app_worker_init_listener (app_wrk, ls))
-	return -1;
+      if ((rv = app_worker_init_listener (app_wrk, ls)))
+	return rv;
     }
 
   return 0;
 }
 
+static void
+app_worker_add_detached_sm (app_worker_t * app_wrk, u32 sm_index)
+{
+  vec_add1 (app_wrk->detached_seg_managers, sm_index);
+}
+
+void
+app_worker_del_detached_sm (app_worker_t * app_wrk, u32 sm_index)
+{
+  u32 i;
+
+  clib_spinlock_lock (&app_wrk->detached_seg_managers_lock);
+  for (i = 0; i < vec_len (app_wrk->detached_seg_managers); i++)
+    {
+      if (app_wrk->detached_seg_managers[i] == sm_index)
+	{
+	  vec_del1 (app_wrk->detached_seg_managers, i);
+	  break;
+	}
+    }
+  clib_spinlock_unlock (&app_wrk->detached_seg_managers_lock);
+}
+
 static void
 app_worker_stop_listen_session (app_worker_t * app_wrk, session_t * ls)
 {
   session_handle_t handle;
   segment_manager_t *sm;
   uword *sm_indexp;
+  session_state_t *states = 0;
 
   handle = listen_session_get_handle (ls);
   sm_indexp = hash_get (app_wrk->listeners_table, handle);
   if (PREDICT_FALSE (!sm_indexp))
     return;
 
-  sm = segment_manager_get (*sm_indexp);
-  if (app_wrk->first_segment_manager == *sm_indexp)
+  /* Dealloc fifos, if any (dgram listeners) */
+  if (ls->rx_fifo)
     {
-      /* Delete sessions but don't remove segment manager */
-      app_wrk->first_segment_manager_in_use = 0;
-      segment_manager_del_sessions (sm);
+      segment_manager_dealloc_fifos (ls->rx_fifo, ls->tx_fifo);
+      ls->tx_fifo = ls->rx_fifo = 0;
     }
-  else
+
+  /* Try to cleanup segment manager */
+  sm = segment_manager_get (*sm_indexp);
+  if (sm)
     {
-      segment_manager_init_free (sm);
+      segment_manager_app_detach (sm);
+      if (!segment_manager_has_fifos (sm))
+	{
+	  /* Empty segment manager, cleanup it up */
+	  segment_manager_free (sm);
+	}
+      else
+	{
+	  /* Delete sessions in CREATED state */
+	  vec_add1 (states, SESSION_STATE_CREATED);
+	  segment_manager_del_sessions_filter (sm, states);
+	  vec_free (states);
+
+	  /* Track segment manager in case app detaches and all the
+	   * outstanding sessions need to be closed */
+	  app_worker_add_detached_sm (app_wrk, *sm_indexp);
+	  sm->flags |= SEG_MANAGER_F_DETACHED_LISTENER;
+	}
     }
+
   hash_unset (app_wrk->listeners_table, handle);
 }
 
@@ -275,11 +330,16 @@ app_worker_init_accepted (session_t * s)
   app_worker_t *app_wrk;
   segment_manager_t *sm;
   session_t *listener;
+  application_t *app;
 
   listener = listen_session_get_from_handle (s->listener_handle);
   app_wrk = application_listener_select_worker (listener);
   s->app_wrk_index = app_wrk->wrk_index;
 
+  app = application_get (app_wrk->app_index);
+  if (app->cb_fns.fifo_tuning_callback)
+    s->flags |= SESSION_F_CUSTOM_FIFO_TUNING;
+
   sm = app_worker_get_listen_segment_manager (app_wrk, listener);
   if (app_worker_alloc_session_fifos (sm, s))
     return -1;
@@ -300,22 +360,44 @@ app_worker_init_connected (app_worker_t * app_wrk, session_t * s)
   application_t *app = application_get (app_wrk->app_index);
   segment_manager_t *sm;
 
+  if (app->cb_fns.fifo_tuning_callback)
+    s->flags |= SESSION_F_CUSTOM_FIFO_TUNING;
+
   /* Allocate fifos for session, unless the app is a builtin proxy */
-  if (!application_is_builtin_proxy (app))
-    {
-      sm = app_worker_get_connect_segment_manager (app_wrk);
-      if (app_worker_alloc_session_fifos (sm, s))
-	return -1;
-    }
-  return 0;
+  if (application_is_builtin_proxy (app))
+    return 0;
+
+  sm = app_worker_get_connect_segment_manager (app_wrk);
+  return app_worker_alloc_session_fifos (sm, s);
 }
 
 int
-app_worker_connect_notify (app_worker_t * app_wrk, session_t * s, u32 opaque)
+app_worker_connect_notify (app_worker_t * app_wrk, session_t * s,
+			   session_error_t err, u32 opaque)
 {
   application_t *app = application_get (app_wrk->app_index);
   return app->cb_fns.session_connected_callback (app_wrk->wrk_index, opaque,
-						 s, s == 0 /* is_fail */ );
+						 s, err);
+}
+
+int
+app_worker_add_half_open (app_worker_t *app_wrk, session_handle_t sh)
+{
+  session_handle_t *shp;
+
+  ASSERT (vlib_get_thread_index () == 0);
+  pool_get (app_wrk->half_open_table, shp);
+  *shp = sh;
+
+  return (shp - app_wrk->half_open_table);
+}
+
+int
+app_worker_del_half_open (app_worker_t *app_wrk, u32 ho_index)
+{
+  ASSERT (vlib_get_thread_index () == 0);
+  pool_put_index (app_wrk->half_open_table, ho_index);
+  return 0;
 }
 
 int
@@ -402,7 +484,7 @@ app_worker_own_session (app_worker_t * app_wrk, session_t * s)
   s->rx_fifo = 0;
   s->tx_fifo = 0;
 
-  sm = app_worker_get_or_alloc_connect_segment_manager (app_wrk);
+  sm = app_worker_get_connect_segment_manager (app_wrk);
   if (app_worker_alloc_session_fifos (sm, s))
     return -1;
 
@@ -418,33 +500,24 @@ app_worker_own_session (app_worker_t * app_wrk, session_t * s)
 }
 
 int
-app_worker_connect_session (app_worker_t * app, session_endpoint_t * sep,
+app_worker_connect_session (app_worker_t * app_wrk, session_endpoint_t * sep,
 			    u32 api_context)
 {
   int rv;
 
-  /* Make sure we have a segment manager for connects */
-  app_worker_alloc_connects_segment_manager (app);
-
-  if ((rv = session_open (app->wrk_index, sep, api_context)))
+  if ((rv = session_open (app_wrk->wrk_index, sep, api_context)))
     return rv;
 
   return 0;
 }
 
 int
-app_worker_alloc_connects_segment_manager (app_worker_t * app_wrk)
+app_worker_session_fifo_tuning (app_worker_t * app_wrk, session_t * s,
+				svm_fifo_t * f,
+				session_ft_action_t act, u32 len)
 {
-  segment_manager_t *sm;
-
-  if (app_wrk->connects_seg_manager == APP_INVALID_SEGMENT_MANAGER_INDEX)
-    {
-      sm = app_worker_alloc_segment_manager (app_wrk);
-      if (sm == 0)
-	return -1;
-      app_wrk->connects_seg_manager = segment_manager_index (sm);
-    }
-  return 0;
+  application_t *app = application_get (app_wrk->app_index);
+  return app->cb_fns.fifo_tuning_callback (s, f, act, len);
 }
 
 segment_manager_t *
@@ -454,21 +527,13 @@ app_worker_get_connect_segment_manager (app_worker_t * app)
   return segment_manager_get (app->connects_seg_manager);
 }
 
-segment_manager_t *
-app_worker_get_or_alloc_connect_segment_manager (app_worker_t * app_wrk)
-{
-  if (app_wrk->connects_seg_manager == (u32) ~ 0)
-    app_worker_alloc_connects_segment_manager (app_wrk);
-  return segment_manager_get (app_wrk->connects_seg_manager);
-}
-
 segment_manager_t *
 app_worker_get_listen_segment_manager (app_worker_t * app,
 				       session_t * listener)
 {
   uword *smp;
   smp = hash_get (app->listeners_table, listen_session_get_handle (listener));
-  ASSERT (smp != 0);
+  ALWAYS_ASSERT (smp != 0);
   return segment_manager_get (*smp);
 }
 
@@ -526,7 +591,8 @@ int
 app_worker_add_segment_notify (app_worker_t * app_wrk, u64 segment_handle)
 {
   application_t *app = application_get (app_wrk->app_index);
-  return app->cb_fns.add_segment_callback (app_wrk->api_client_index,
+
+  return app->cb_fns.add_segment_callback (app_wrk->wrk_index,
 					   segment_handle);
 }
 
@@ -534,7 +600,7 @@ int
 app_worker_del_segment_notify (app_worker_t * app_wrk, u64 segment_handle)
 {
   application_t *app = application_get (app_wrk->app_index);
-  return app->cb_fns.del_segment_callback (app_wrk->api_client_index,
+  return app->cb_fns.del_segment_callback (app_wrk->wrk_index,
 					   segment_handle);
 }
 
@@ -554,12 +620,6 @@ app_send_io_evt_rx (app_worker_t * app_wrk, session_t * s)
   if (app_worker_application_is_builtin (app_wrk))
     return app_worker_builtin_rx (app_wrk, s);
 
-  /* Make sure the session is in established state within external apps.
-   * Should be removed once we confirm closes to apps */
-  if (PREDICT_FALSE (s->session_state != SESSION_STATE_READY
-		     && s->session_state != SESSION_STATE_LISTENING))
-    return 0;
-
   if (svm_fifo_has_event (s->rx_fifo))
     return 0;
 
@@ -582,7 +642,7 @@ app_send_io_evt_rx (app_worker_t * app_wrk, session_t * s)
 
   msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING);
   evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg);
-  evt->session_index = s->rx_fifo->client_session_index;
+  evt->session_index = s->rx_fifo->shr->client_session_index;
   evt->event_type = SESSION_IO_EVT_RX;
 
   (void) svm_fifo_set_event (s->rx_fifo);
@@ -621,7 +681,7 @@ app_send_io_evt_tx (app_worker_t * app_wrk, session_t * s)
   msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING);
   evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg);
   evt->event_type = SESSION_IO_EVT_TX;
-  evt->session_index = s->tx_fifo->client_session_index;
+  evt->session_index = s->tx_fifo->shr->client_session_index;
 
   svm_msg_q_add_and_unlock (mq, &msg);
   return 0;
@@ -663,10 +723,10 @@ format_app_worker_listener (u8 * s, va_list * args)
   if (!app_wrk)
     {
       if (verbose)
-	s = format (s, "%-40s%-25s%=10s%-15s%-15s%-10s", "Connection", "App",
+	s = format (s, "%-40s%-25s%-10s%-15s%-15s%-10s", "Connection", "App",
 		    "Wrk", "API Client", "ListenerID", "SegManager");
       else
-	s = format (s, "%-40s%-25s%=10s", "Connection", "App", "Wrk");
+	s = format (s, "%-40s%-25s%-10s", "Connection", "App", "Wrk");
 
       return s;
     }
@@ -677,13 +737,16 @@ format_app_worker_listener (u8 * s, va_list * args)
 
   if (verbose)
     {
-      char buf[32];
-      sprintf (buf, "%u(%u)", app_wrk->wrk_map_index, app_wrk->wrk_index);
-      s = format (s, "%-40s%-25s%=10s%-15u%-15u%-10u", str, app_name,
+      u8 *buf;
+      buf = format (0, "%u(%u)", app_wrk->wrk_map_index, app_wrk->wrk_index);
+      s = format (s, "%-40v%-25v%-10v%-15u%-15u%-10u", str, app_name,
 		  buf, app_wrk->api_client_index, handle, sm_index);
+      vec_free (buf);
     }
   else
-    s = format (s, "%-40s%-25s%=10u", str, app_name, app_wrk->wrk_map_index);
+    s = format (s, "%-40v%-25v%=10u", str, app_name, app_wrk->wrk_map_index);
+
+  vec_free (str);
 
   return s;
 }