vcl: add support for multi-worker apps

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

diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c
index d573261..78c05c3 100755 (executable)
--- a/src/vnet/session/session_api.c
+++ b/src/vnet/session/session_api.c
@@ -147,7 +147,8 @@ send_del_segment_callback (u32 api_client_index, const ssvm_private_t * fs)
 }
 
 static int
-send_app_cut_through_registration_add (u32 api_client_index, u64 mq_addr,
+send_app_cut_through_registration_add (u32 api_client_index,
+                                      u32 wrk_map_index, u64 mq_addr,
                                       u64 peer_mq_addr)
 {
   vl_api_app_cut_through_registration_add_t *mp;
@@ -169,6 +170,7 @@ send_app_cut_through_registration_add (u32 api_client_index, u64 mq_addr,
 
   mp->evt_q_address = mq_addr;
   mp->peer_evt_q_address = peer_mq_addr;
+  mp->wrk_index = wrk_map_index;
 
   mq = uword_to_pointer (mq_addr, svm_msg_q_t *);
   peer_mq = uword_to_pointer (peer_mq_addr, svm_msg_q_t *);
@@ -475,6 +477,7 @@ mq_send_session_accepted_cb (stream_session_t * s)
       u8 main_thread = vlib_num_workers ()? 1 : 0;
 
       send_app_cut_through_registration_add (app->api_client_index,
+                                            app_wrk->wrk_map_index,
                                             ls->server_evt_q,
                                             ls->client_evt_q);
 
@@ -615,6 +618,7 @@ mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context,
       u8 main_thread = vlib_num_workers ()? 1 : 0;
 
       send_app_cut_through_registration_add (app->api_client_index,
+                                            app_wrk->wrk_map_index,
                                             ls->client_evt_q,
                                             ls->server_evt_q);
 
@@ -636,6 +640,72 @@ done:
   return 0;
 }
 
+static int
+mq_send_session_bound_cb (u32 app_wrk_index, u32 api_context,
+                         session_handle_t handle, int rv)
+{
+  svm_msg_q_msg_t _msg, *msg = &_msg;
+  svm_msg_q_t *app_mq, *vpp_evt_q;
+  transport_connection_t *tc;
+  stream_session_t *ls = 0;
+  session_bound_msg_t *mp;
+  app_worker_t *app_wrk;
+  session_event_t *evt;
+  application_t *app;
+
+  app_wrk = app_worker_get (app_wrk_index);
+  app = application_get (app_wrk->app_index);
+  app_mq = app_wrk->event_queue;
+  if (!app_mq)
+    {
+      clib_warning ("app %u with api index: %u not attached", app->app_index,
+                   app->api_client_index);
+      return -1;
+    }
+
+  svm_msg_q_lock_and_alloc_msg_w_ring (app_mq, SESSION_MQ_CTRL_EVT_RING,
+                                      SVM_Q_WAIT, msg);
+  svm_msg_q_unlock (app_mq);
+  evt = svm_msg_q_msg_data (app_mq, msg);
+  memset (evt, 0, sizeof (*evt));
+  evt->event_type = SESSION_CTRL_EVT_BOUND;
+  mp = (session_bound_msg_t *) evt->data;
+  mp->context = api_context;
+
+  if (rv)
+    goto done;
+
+  mp->handle = handle;
+  if (application_has_global_scope (app))
+    {
+      ls = listen_session_get_from_handle (handle);
+      tc = listen_session_get_transport (ls);
+      mp->lcl_port = tc->lcl_port;
+      mp->lcl_is_ip4 = tc->is_ip4;
+      clib_memcpy (mp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip));
+    }
+  else
+    {
+      local_session_t *local;
+      local = application_get_local_listen_session_from_handle (handle);
+      mp->lcl_port = local->port;
+      mp->lcl_is_ip4 = session_type_is_ip4 (local->session_type);
+    }
+
+  if (ls && session_transport_service_type (ls) == TRANSPORT_SERVICE_CL)
+    {
+      mp->rx_fifo = pointer_to_uword (ls->server_rx_fifo);
+      mp->tx_fifo = pointer_to_uword (ls->server_tx_fifo);
+      vpp_evt_q = session_manager_get_vpp_event_queue (0);
+      mp->vpp_evt_q = pointer_to_uword (vpp_evt_q);
+    }
+
+done:
+  mp->retval = rv;
+  svm_msg_q_add (app_mq, msg, SVM_Q_WAIT);
+  return 0;
+}
+
 static session_cb_vft_t session_mq_cb_vft = {
   .session_accept_callback = mq_send_session_accepted_cb,
   .session_disconnect_callback = mq_send_session_disconnected_cb,
@@ -791,6 +861,7 @@ vl_api_bind_uri_t_handler (vl_api_bind_uri_t * mp)
   stream_session_t *s;
   application_t *app = 0;
   svm_msg_q_t *vpp_evt_q;
+  app_worker_t *app_wrk;
   int rv;
 
   if (session_manager_is_enabled () == 0)
@@ -837,6 +908,14 @@ done:
       }
   }));
   /* *INDENT-ON* */
+
+  /* If app uses mq for control messages, send an mq message as well */
+  if (app && application_use_mq_for_ctrl (app))
+    {
+      app_wrk = application_get_worker (app, 0);
+      mq_send_session_bound_cb (app_wrk->wrk_index, mp->context, a->handle,
+                               rv);
+    }
 }
 
 static void
@@ -1070,6 +1149,7 @@ vl_api_bind_sock_t_handler (vl_api_bind_sock_t * mp)
   int rv = 0;
   clib_error_t *error;
   application_t *app = 0;
+  app_worker_t *app_wrk;
   stream_session_t *s;
   transport_connection_t *tc = 0;
   ip46_address_t *ip46;
@@ -1129,6 +1209,14 @@ done:
       }
   }));
   /* *INDENT-ON* */
+
+  /* If app uses mq for control messages, send an mq message as well */
+  if (app && application_use_mq_for_ctrl (app))
+    {
+      app_wrk = application_get_worker (app, mp->wrk_index);
+      mq_send_session_bound_cb (app_wrk->wrk_index, mp->context, a->handle,
+                               rv);
+    }
 }
 
 static void
@@ -1261,6 +1349,9 @@ vl_api_app_worker_add_del_t_handler (vl_api_app_worker_add_del_t * mp)
       goto done;
     }
 
+  /* Make coverity happy */
+  ASSERT (args.evt_q && args.segment);
+
   /* Send fifo segment fd if needed */
   if (ssvm_type (args.segment) == SSVM_SEGMENT_MEMFD)
     {