{
app_worker_t *app_wrk = app_worker_get (s->app_wrk_index);
svm_msg_q_msg_t _msg, *msg = &_msg;
+ session_accepted_msg_t m = { 0 };
svm_msg_q_t *app_mq;
fifo_segment_t *eq_seg;
session_t *listener;
- session_accepted_msg_t *mp;
session_event_t *evt;
application_t *app;
app = application_get (app_wrk->app_index);
- app_mq = app_wrk->event_queue;
- if (mq_try_lock_and_alloc_msg (app_mq, msg))
- return SESSION_E_MQ_MSG_ALLOC;
- evt = svm_msg_q_msg_data (app_mq, msg);
- clib_memset (evt, 0, sizeof (*evt));
- evt->event_type = SESSION_CTRL_EVT_ACCEPTED;
- mp = (session_accepted_msg_t *) evt->data;
- clib_memset (mp, 0, sizeof (*mp));
- mp->context = app->app_index;
- mp->server_rx_fifo = fifo_segment_fifo_offset (s->rx_fifo);
- mp->server_tx_fifo = fifo_segment_fifo_offset (s->tx_fifo);
- mp->segment_handle = session_segment_handle (s);
- mp->flags = s->flags;
+ m.context = app->app_index;
+ m.server_rx_fifo = fifo_segment_fifo_offset (s->rx_fifo);
+ m.server_tx_fifo = fifo_segment_fifo_offset (s->tx_fifo);
+ m.segment_handle = session_segment_handle (s);
+ m.flags = s->flags;
- eq_seg = session_main_get_evt_q_segment ();
+ eq_seg = application_get_rx_mqs_segment (app);
if (session_has_transport (s))
{
listener = listen_session_get_from_handle (s->listener_handle);
- mp->listener_handle = app_listen_session_handle (listener);
+ m.listener_handle = app_listen_session_handle (listener);
if (application_is_proxy (app))
{
listener =
app_worker_first_listener (app_wrk, session_get_fib_proto (s),
session_get_transport_proto (s));
if (listener)
- mp->listener_handle = listen_session_get_handle (listener);
+ m.listener_handle = listen_session_get_handle (listener);
}
- mp->vpp_event_queue_address =
+ m.vpp_event_queue_address =
fifo_segment_msg_q_offset (eq_seg, s->thread_index);
- mp->mq_index = s->thread_index;
- mp->handle = session_handle (s);
+ m.mq_index = s->thread_index;
+ m.handle = session_handle (s);
- session_get_endpoint (s, &mp->rmt, 0 /* is_lcl */ );
+ session_get_endpoint (s, &m.rmt, 0 /* is_lcl */);
}
else
{
ct = (ct_connection_t *) session_get_transport (s);
listener = listen_session_get_from_handle (s->listener_handle);
- mp->listener_handle = app_listen_session_handle (listener);
- mp->rmt.is_ip4 = session_type_is_ip4 (listener->session_type);
- mp->rmt.port = ct->c_rmt_port;
- mp->handle = session_handle (s);
- mp->vpp_event_queue_address =
+ m.listener_handle = app_listen_session_handle (listener);
+ m.rmt.is_ip4 = session_type_is_ip4 (listener->session_type);
+ m.rmt.port = ct->c_rmt_port;
+ m.handle = session_handle (s);
+ m.vpp_event_queue_address =
fifo_segment_msg_q_offset (eq_seg, s->thread_index);
- mp->mq_index = s->thread_index;
+ m.mq_index = s->thread_index;
}
+
+ app_mq = app_wrk->event_queue;
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return SESSION_E_MQ_MSG_ALLOC;
+
+ evt = svm_msg_q_msg_data (app_mq, msg);
+ clib_memset (evt, 0, sizeof (*evt));
+ evt->event_type = SESSION_CTRL_EVT_ACCEPTED;
+ clib_memcpy_fast (evt->data, &m, sizeof (m));
svm_msg_q_add_and_unlock (app_mq, msg);
return 0;
session_t * s, session_error_t err)
{
svm_msg_q_msg_t _msg, *msg = &_msg;
- session_connected_msg_t *mp;
+ session_connected_msg_t m = { 0 };
svm_msg_q_t *app_mq;
transport_connection_t *tc;
fifo_segment_t *eq_seg;
app_worker_t *app_wrk;
session_event_t *evt;
+ application_t *app;
app_wrk = app_worker_get (app_wrk_index);
- app_mq = app_wrk->event_queue;
- if (!app_mq)
- {
- clib_warning ("app %u with api index: %u not attached",
- app_wrk->app_index, app_wrk->api_client_index);
- return -1;
- }
- if (mq_try_lock_and_alloc_msg (app_mq, msg))
- return SESSION_E_MQ_MSG_ALLOC;
-
- evt = svm_msg_q_msg_data (app_mq, msg);
- clib_memset (evt, 0, sizeof (*evt));
- evt->event_type = SESSION_CTRL_EVT_CONNECTED;
- mp = (session_connected_msg_t *) evt->data;
- clib_memset (mp, 0, sizeof (*mp));
- mp->context = api_context;
+ m.context = api_context;
+ m.retval = err;
if (err)
- goto done;
+ goto snd_msg;
- eq_seg = session_main_get_evt_q_segment ();
+ app = application_get (app_wrk->app_index);
+ eq_seg = application_get_rx_mqs_segment (app);
if (session_has_transport (s))
{
if (!tc)
{
clib_warning ("failed to retrieve transport!");
- err = SESSION_E_REFUSED;
- goto done;
+ m.retval = SESSION_E_REFUSED;
+ goto snd_msg;
}
- mp->handle = session_handle (s);
- mp->vpp_event_queue_address =
+ m.handle = session_handle (s);
+ m.vpp_event_queue_address =
fifo_segment_msg_q_offset (eq_seg, s->thread_index);
- session_get_endpoint (s, &mp->lcl, 1 /* is_lcl */ );
+ session_get_endpoint (s, &m.lcl, 1 /* is_lcl */);
- mp->server_rx_fifo = fifo_segment_fifo_offset (s->rx_fifo);
- mp->server_tx_fifo = fifo_segment_fifo_offset (s->tx_fifo);
- mp->segment_handle = session_segment_handle (s);
+ m.server_rx_fifo = fifo_segment_fifo_offset (s->rx_fifo);
+ m.server_tx_fifo = fifo_segment_fifo_offset (s->tx_fifo);
+ m.segment_handle = session_segment_handle (s);
+ s->rx_fifo->shr->client_session_index = api_context;
+ s->tx_fifo->shr->client_session_index = api_context;
}
else
{
session_t *ss;
cct = (ct_connection_t *) session_get_transport (s);
- mp->handle = session_handle (s);
- mp->lcl.port = cct->c_lcl_port;
- mp->lcl.is_ip4 = cct->c_is_ip4;
- mp->vpp_event_queue_address =
+ m.handle = session_handle (s);
+ m.lcl.port = cct->c_lcl_port;
+ m.lcl.is_ip4 = cct->c_is_ip4;
+ m.vpp_event_queue_address =
fifo_segment_msg_q_offset (eq_seg, s->thread_index);
- mp->server_rx_fifo = fifo_segment_fifo_offset (s->rx_fifo);
- mp->server_tx_fifo = fifo_segment_fifo_offset (s->tx_fifo);
- mp->segment_handle = session_segment_handle (s);
+ m.server_rx_fifo = fifo_segment_fifo_offset (s->rx_fifo);
+ m.server_tx_fifo = fifo_segment_fifo_offset (s->tx_fifo);
+ m.segment_handle = session_segment_handle (s);
ss = ct_session_get_peer (s);
- mp->ct_rx_fifo = fifo_segment_fifo_offset (ss->tx_fifo);
- mp->ct_tx_fifo = fifo_segment_fifo_offset (ss->rx_fifo);
- mp->ct_segment_handle = session_segment_handle (ss);
+ m.ct_rx_fifo = fifo_segment_fifo_offset (ss->tx_fifo);
+ m.ct_tx_fifo = fifo_segment_fifo_offset (ss->rx_fifo);
+ m.ct_segment_handle = session_segment_handle (ss);
}
-done:
- mp->retval = err;
+snd_msg:
+
+ app_mq = app_wrk->event_queue;
+
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return SESSION_E_MQ_MSG_ALLOC;
+
+ evt = svm_msg_q_msg_data (app_mq, msg);
+ clib_memset (evt, 0, sizeof (*evt));
+ evt->event_type = SESSION_CTRL_EVT_CONNECTED;
+ clib_memcpy_fast (evt->data, &m, sizeof (m));
svm_msg_q_add_and_unlock (app_mq, msg);
return 0;
session_handle_t handle, int rv)
{
svm_msg_q_msg_t _msg, *msg = &_msg;
+ session_bound_msg_t m = { 0 };
svm_msg_q_t *app_mq;
transport_endpoint_t tep;
- session_bound_msg_t *mp;
fifo_segment_t *eq_seg;
app_worker_t *app_wrk;
session_event_t *evt;
+ application_t *app;
app_listener_t *al;
session_t *ls = 0;
- app_wrk = app_worker_get (app_wrk_index);
- app_mq = app_wrk->event_queue;
- if (!app_mq)
- {
- clib_warning ("app %u with api index: %u not attached",
- app_wrk->app_index, app_wrk->api_client_index);
- return -1;
- }
- if (mq_try_lock_and_alloc_msg (app_mq, msg))
- return SESSION_E_MQ_MSG_ALLOC;
+ app_wrk = app_worker_get (app_wrk_index);
- evt = svm_msg_q_msg_data (app_mq, msg);
- clib_memset (evt, 0, sizeof (*evt));
- evt->event_type = SESSION_CTRL_EVT_BOUND;
- mp = (session_bound_msg_t *) evt->data;
- mp->context = api_context;
+ m.context = api_context;
+ m.retval = rv;
if (rv)
- goto done;
+ goto snd_msg;
- mp->handle = handle;
+ m.handle = handle;
al = app_listener_get_w_handle (handle);
if (al->session_index != SESSION_INVALID_INDEX)
ls = app_listener_get_session (al);
else
ls = app_listener_get_local_session (al);
- session_get_endpoint (ls, &tep, 1 /* is_lcl */ );
- mp->lcl_port = tep.port;
- mp->lcl_is_ip4 = tep.is_ip4;
- clib_memcpy_fast (mp->lcl_ip, &tep.ip, sizeof (tep.ip));
-
- eq_seg = session_main_get_evt_q_segment ();
- mp->vpp_evt_q = fifo_segment_msg_q_offset (eq_seg, ls->thread_index);
+ session_get_endpoint (ls, &tep, 1 /* is_lcl */);
+ m.lcl_port = tep.port;
+ m.lcl_is_ip4 = tep.is_ip4;
+ clib_memcpy_fast (m.lcl_ip, &tep.ip, sizeof (tep.ip));
+ app = application_get (app_wrk->app_index);
+ eq_seg = application_get_rx_mqs_segment (app);
+ m.vpp_evt_q = fifo_segment_msg_q_offset (eq_seg, ls->thread_index);
- if (session_transport_service_type (ls) == TRANSPORT_SERVICE_CL)
+ if (session_transport_service_type (ls) == TRANSPORT_SERVICE_CL &&
+ ls->rx_fifo)
{
- mp->rx_fifo = fifo_segment_fifo_offset (ls->rx_fifo);
- mp->tx_fifo = fifo_segment_fifo_offset (ls->tx_fifo);
- mp->segment_handle = session_segment_handle (ls);
+ m.rx_fifo = fifo_segment_fifo_offset (ls->rx_fifo);
+ m.tx_fifo = fifo_segment_fifo_offset (ls->tx_fifo);
+ m.segment_handle = session_segment_handle (ls);
}
-done:
- mp->retval = rv;
+snd_msg:
+
+ app_mq = app_wrk->event_queue;
+
+ if (mq_try_lock_and_alloc_msg (app_mq, msg))
+ return SESSION_E_MQ_MSG_ALLOC;
+
+ evt = svm_msg_q_msg_data (app_mq, msg);
+ clib_memset (evt, 0, sizeof (*evt));
+ evt->event_type = SESSION_CTRL_EVT_BOUND;
+ clib_memcpy_fast (evt->data, &m, sizeof (m));
+
svm_msg_q_add_and_unlock (app_mq, msg);
return 0;
}
mq_send_session_migrate_cb (session_t * s, session_handle_t new_sh)
{
svm_msg_q_msg_t _msg, *msg = &_msg;
- session_migrated_msg_t *mp;
+ session_migrated_msg_t m = { 0 };
fifo_segment_t *eq_seg;
app_worker_t *app_wrk;
session_event_t *evt;
svm_msg_q_t *app_mq;
+ application_t *app;
u32 thread_index;
thread_index = session_thread_from_handle (new_sh);
- eq_seg = session_main_get_evt_q_segment ();
-
app_wrk = app_worker_get (s->app_wrk_index);
app_mq = app_wrk->event_queue;
+ app = application_get (app_wrk->app_index);
+ eq_seg = application_get_rx_mqs_segment (app);
+
+ m.handle = session_handle (s);
+ m.new_handle = new_sh;
+ m.vpp_thread_index = thread_index;
+ m.vpp_evt_q = fifo_segment_msg_q_offset (eq_seg, thread_index);
+ m.segment_handle = SESSION_INVALID_HANDLE;
+
if (mq_try_lock_and_alloc_msg (app_mq, msg))
return;
evt = svm_msg_q_msg_data (app_mq, msg);
clib_memset (evt, 0, sizeof (*evt));
evt->event_type = SESSION_CTRL_EVT_MIGRATED;
- mp = (session_migrated_msg_t *) evt->data;
- mp->handle = session_handle (s);
- mp->new_handle = new_sh;
- mp->vpp_thread_index = thread_index;
- mp->vpp_evt_q = fifo_segment_msg_q_offset (eq_seg, thread_index);
- mp->segment_handle = SESSION_INVALID_HANDLE;
+ clib_memcpy_fast (evt->data, &m, sizeof (m));
+
svm_msg_q_add_and_unlock (app_mq, msg);
}
static void
vl_api_app_attach_t_handler (vl_api_app_attach_t * mp)
{
- int rv = 0, fds[SESSION_N_FD_TYPE], n_fds = 0;
- vl_api_app_attach_reply_t *rmp;
- fifo_segment_t *segp, *evt_q_segment = 0;
+ int rv = 0, *fds = 0, n_fds = 0, n_workers, i;
+ fifo_segment_t *segp, *rx_mqs_seg = 0;
vnet_app_attach_args_t _a, *a = &_a;
+ vl_api_app_attach_reply_t *rmp;
u8 fd_flags = 0, ctrl_thread;
vl_api_registration_t *reg;
+ svm_msg_q_t *rx_mq;
+ application_t *app;
reg = vl_api_client_index_to_registration (mp->client_index);
if (!reg)
return;
+ n_workers = vlib_num_workers ();
if (!session_main_is_enabled () || appns_sapi_enabled ())
{
rv = VNET_API_ERROR_FEATURE_DISABLED;
}
vec_free (a->namespace_id);
- /* Send event queues segment */
- if ((evt_q_segment = session_main_get_evt_q_segment ()))
- {
- fd_flags |= SESSION_FD_F_VPP_MQ_SEGMENT;
- fds[n_fds] = evt_q_segment->ssvm.fd;
- n_fds += 1;
- }
+ vec_validate (fds, 3 /* segs + tx evtfd */ + n_workers);
+
+ /* Send rx mqs segment */
+ app = application_get (a->app_index);
+ rx_mqs_seg = application_get_rx_mqs_segment (app);
+
+ fd_flags |= SESSION_FD_F_VPP_MQ_SEGMENT;
+ fds[n_fds] = rx_mqs_seg->ssvm.fd;
+ n_fds += 1;
+
/* Send fifo segment fd if needed */
if (ssvm_type (a->segment) == SSVM_SEGMENT_MEMFD)
{
n_fds += 1;
}
+ if (application_use_private_rx_mqs ())
+ {
+ fd_flags |= SESSION_FD_F_VPP_MQ_EVENTFD;
+ for (i = 0; i < n_workers + 1; i++)
+ {
+ rx_mq = application_rx_mq_get (app, i);
+ fds[n_fds] = svm_msg_q_get_eventfd (rx_mq);
+ n_fds += 1;
+ }
+ }
+
done:
/* *INDENT-OFF* */
REPLY_MACRO2 (VL_API_APP_ATTACH_REPLY, ({
if (!rv)
{
- ctrl_thread = vlib_num_workers () ? 1 : 0;
+ ctrl_thread = n_workers ? 1 : 0;
segp = (fifo_segment_t *) a->segment;
rmp->app_index = clib_host_to_net_u32 (a->app_index);
rmp->app_mq = fifo_segment_msg_q_offset (segp, 0);
- rmp->vpp_ctrl_mq =
- fifo_segment_msg_q_offset (evt_q_segment, ctrl_thread);
+ rmp->vpp_ctrl_mq = fifo_segment_msg_q_offset (rx_mqs_seg, ctrl_thread);
rmp->vpp_ctrl_mq_thread = ctrl_thread;
rmp->n_fds = n_fds;
rmp->fd_flags = fd_flags;
if (n_fds)
session_send_fds (reg, fds, n_fds);
+ vec_free (fds);
}
static void
session_api_attach_handler (app_namespace_t * app_ns, clib_socket_t * cs,
app_sapi_attach_msg_t * mp)
{
- int rv = 0, fds[SESSION_N_FD_TYPE], n_fds = 0;
+ int rv = 0, *fds = 0, n_fds = 0, i, n_workers;
vnet_app_attach_args_t _a, *a = &_a;
app_sapi_attach_reply_msg_t *rmp;
- fifo_segment_t *evt_q_segment;
u8 fd_flags = 0, ctrl_thread;
app_ns_api_handle_t *handle;
+ fifo_segment_t *rx_mqs_seg;
app_sapi_msg_t msg = { 0 };
app_worker_t *app_wrk;
application_t *app;
+ svm_msg_q_t *rx_mq;
/* Make sure name is null terminated */
mp->name[63] = 0;
goto done;
}
+ n_workers = vlib_num_workers ();
+ vec_validate (fds, 3 /* segs + tx evtfd */ + n_workers);
+
/* Send event queues segment */
- if ((evt_q_segment = session_main_get_evt_q_segment ()))
- {
- fd_flags |= SESSION_FD_F_VPP_MQ_SEGMENT;
- fds[n_fds] = evt_q_segment->ssvm.fd;
- n_fds += 1;
- }
+ app = application_get (a->app_index);
+ rx_mqs_seg = application_get_rx_mqs_segment (app);
+
+ fd_flags |= SESSION_FD_F_VPP_MQ_SEGMENT;
+ fds[n_fds] = rx_mqs_seg->ssvm.fd;
+ n_fds += 1;
+
/* Send fifo segment fd if needed */
if (ssvm_type (a->segment) == SSVM_SEGMENT_MEMFD)
{
n_fds += 1;
}
+ if (application_use_private_rx_mqs ())
+ {
+ fd_flags |= SESSION_FD_F_VPP_MQ_EVENTFD;
+ for (i = 0; i < n_workers + 1; i++)
+ {
+ rx_mq = application_rx_mq_get (app, i);
+ fds[n_fds] = svm_msg_q_get_eventfd (rx_mq);
+ n_fds += 1;
+ }
+ }
+
done:
msg.type = APP_SAPI_MSG_TYPE_ATTACH_REPLY;
rmp->retval = rv;
if (!rv)
{
- ctrl_thread = vlib_num_workers ()? 1 : 0;
+ ctrl_thread = n_workers ? 1 : 0;
rmp->app_index = a->app_index;
rmp->app_mq =
fifo_segment_msg_q_offset ((fifo_segment_t *) a->segment, 0);
- rmp->vpp_ctrl_mq =
- fifo_segment_msg_q_offset (evt_q_segment, ctrl_thread);
+ rmp->vpp_ctrl_mq = fifo_segment_msg_q_offset (rx_mqs_seg, ctrl_thread);
rmp->vpp_ctrl_mq_thread = ctrl_thread;
rmp->n_fds = n_fds;
rmp->fd_flags = fd_flags;
/* Update app index for socket */
handle = (app_ns_api_handle_t *) & cs->private_data;
- app = application_get (a->app_index);
app_wrk = application_get_worker (app, 0);
handle->aah_app_wrk_index = app_wrk->wrk_index;
}
clib_socket_sendmsg (cs, &msg, sizeof (msg), fds, n_fds);
vec_free (a->name);
+ vec_free (fds);
}
static void
Code Review / vpp.git / blobdiff