X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_api.c;h=f54a46b39ba9779437d67b4228e17eea87e77066;hb=5724aecd20e8f5e50aba418d2a021ef02275d589;hp=89a30d2626dd37d75b56b595ab2f30719be1682e;hpb=cc7c88e529eb3a2ca0934f27eb048c8ca3788f95;p=vpp.git diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c index 89a30d2626d..f54a46b39ba 100644 --- a/src/vnet/session/session_api.c +++ b/src/vnet/session/session_api.c @@ -49,8 +49,6 @@ _(SESSION_ENABLE_DISABLE, session_enable_disable) \ _(APP_NAMESPACE_ADD_DEL, app_namespace_add_del) \ _(SESSION_RULE_ADD_DEL, session_rule_add_del) \ _(SESSION_RULES_DUMP, session_rules_dump) \ -_(APPLICATION_TLS_CERT_ADD, application_tls_cert_add) \ -_(APPLICATION_TLS_KEY_ADD, application_tls_key_add) \ _(APP_ADD_CERT_KEY_PAIR, app_add_cert_key_pair) \ _(APP_DEL_CERT_KEY_PAIR, app_del_cert_key_pair) \ _(APP_WORKER_ADD_DEL, app_worker_add_del) \ @@ -130,45 +128,41 @@ mq_send_session_accepted_cb (session_t * s) { app_worker_t *app_wrk = app_worker_get (s->app_wrk_index); svm_msg_q_msg_t _msg, *msg = &_msg; - svm_msg_q_t *vpp_queue, *app_mq; + 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 = pointer_to_uword (s->rx_fifo); - mp->server_tx_fifo = pointer_to_uword (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 = 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); } - vpp_queue = session_main_get_vpp_event_queue (s->thread_index); - mp->vpp_event_queue_address = pointer_to_uword (vpp_queue); - mp->handle = session_handle (s); + m.vpp_event_queue_address = + fifo_segment_msg_q_offset (eq_seg, s->thread_index); + 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 { @@ -176,13 +170,23 @@ mq_send_session_accepted_cb (session_t * s) 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); - vpp_queue = session_main_get_vpp_event_queue (0); - mp->vpp_event_queue_address = pointer_to_uword (vpp_queue); + 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); + 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; @@ -221,9 +225,9 @@ mq_notify_close_subscribers (u32 app_index, session_handle_t sh, if (!app) return; - for (i = 0; i < f->n_subscribers; i++) + for (i = 0; i < f->shr->n_subscribers; i++) { - if (!(app_wrk = application_get_worker (app, f->subscribers[i]))) + if (!(app_wrk = application_get_worker (app, f->shr->subscribers[i]))) continue; mq_send_session_close_evt (app_wrk, sh, SESSION_CTRL_EVT_DISCONNECTED); } @@ -261,33 +265,24 @@ mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context, session_t * s, session_error_t err) { svm_msg_q_msg_t _msg, *msg = &_msg; - session_connected_msg_t *mp; - svm_msg_q_t *vpp_mq, *app_mq; + 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; + + app = application_get (app_wrk->app_index); + eq_seg = application_get_rx_mqs_segment (app); if (session_has_transport (s)) { @@ -295,19 +290,21 @@ mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context, if (!tc) { clib_warning ("failed to retrieve transport!"); - err = SESSION_E_REFUSED; - goto done; + m.retval = SESSION_E_REFUSED; + goto snd_msg; } - vpp_mq = session_main_get_vpp_event_queue (s->thread_index); - mp->handle = session_handle (s); - mp->vpp_event_queue_address = pointer_to_uword (vpp_mq); + 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 = pointer_to_uword (s->rx_fifo); - mp->server_tx_fifo = pointer_to_uword (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 { @@ -315,22 +312,31 @@ mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context, 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; - vpp_mq = session_main_get_vpp_event_queue (0); - mp->vpp_event_queue_address = pointer_to_uword (vpp_mq); - mp->server_rx_fifo = pointer_to_uword (s->rx_fifo); - mp->server_tx_fifo = pointer_to_uword (s->tx_fifo); - mp->segment_handle = session_segment_handle (s); + 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); + 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 = pointer_to_uword (ss->tx_fifo); - mp->ct_tx_fifo = pointer_to_uword (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; @@ -341,57 +347,59 @@ 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; + 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)); - - vpp_evt_q = session_main_get_vpp_event_queue (0); - mp->vpp_evt_q = pointer_to_uword (vpp_evt_q); + 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 = pointer_to_uword (ls->rx_fifo); - mp->tx_fifo = pointer_to_uword (ls->tx_fifo); + 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; } @@ -423,26 +431,34 @@ static void 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; - svm_msg_q_t *vpp_evt_q; + 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); 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 = session_thread_from_handle (new_sh); - vpp_evt_q = session_main_get_vpp_event_queue (mp->vpp_thread_index); - mp->vpp_evt_q = pointer_to_uword (vpp_evt_q); + clib_memcpy_fast (evt->data, &m, sizeof (m)); + svm_msg_q_add_and_unlock (app_mq, msg); } @@ -597,23 +613,31 @@ vl_api_session_enable_disable_t_handler (vl_api_session_enable_disable_t * mp) 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; - ssvm_private_t *segp, *evt_q_segment; + 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 *ctrl_mq; + 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; goto done; } + /* Only support binary api with socket transport */ + if (vl_api_registration_file_index (reg) == VL_API_INVALID_FI) + { + rv = VNET_API_ERROR_APP_UNSUPPORTED_CFG; + goto done; + } STATIC_ASSERT (sizeof (u64) * APP_OPTIONS_N_OPTIONS <= sizeof (mp->options), @@ -623,7 +647,6 @@ vl_api_app_attach_t_handler (vl_api_app_attach_t * mp) a->api_client_index = mp->client_index; a->options = mp->options; a->session_cb_vft = &session_mq_cb_vft; - a->namespace_id = vl_api_from_api_to_new_vec (mp, &mp->namespace_id); if ((rv = vnet_application_attach (a))) @@ -634,13 +657,16 @@ vl_api_app_attach_t_handler (vl_api_app_attach_t * mp) } 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->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) { @@ -651,29 +677,39 @@ vl_api_app_attach_t_handler (vl_api_app_attach_t * mp) if (a->options[APP_OPTIONS_FLAGS] & APP_OPTIONS_FLAGS_EVT_MQ_USE_EVENTFD) { fd_flags |= SESSION_FD_F_MQ_EVENTFD; - fds[n_fds] = svm_msg_q_get_producer_eventfd (a->app_evt_q); + fds[n_fds] = svm_msg_q_get_eventfd (a->app_evt_q); 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_mq = session_main_get_vpp_event_queue (ctrl_thread); - segp = a->segment; + 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 = pointer_to_uword (a->app_evt_q); - rmp->vpp_ctrl_mq = pointer_to_uword (ctrl_mq); + rmp->app_mq = fifo_segment_msg_q_offset (segp, 0); + 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 (vec_len (segp->name)) + if (vec_len (segp->ssvm.name)) { - vl_api_vec_to_api_string (segp->name, &rmp->segment_name); + vl_api_vec_to_api_string (segp->ssvm.name, &rmp->segment_name); } - rmp->segment_size = segp->ssvm_size; + rmp->segment_size = segp->ssvm.ssvm_size; rmp->segment_handle = clib_host_to_net_u64 (a->segment_handle); } })); @@ -681,6 +717,7 @@ done: if (n_fds) session_send_fds (reg, fds, n_fds); + vec_free (fds); } static void @@ -735,7 +772,7 @@ vl_api_app_worker_add_del_t_handler (vl_api_app_worker_add_del_t * mp) if (application_segment_manager_properties (app)->use_mq_eventfd) { fd_flags |= SESSION_FD_F_MQ_EVENTFD; - fds[n_fds] = svm_msg_q_get_producer_eventfd (args.evt_q); + fds[n_fds] = svm_msg_q_get_eventfd (args.evt_q); n_fds += 1; } @@ -747,13 +784,14 @@ done: rmp->segment_handle = clib_host_to_net_u64 (args.segment_handle); if (!rv && mp->is_add) { + rmp->app_event_queue_address = + fifo_segment_msg_q_offset ((fifo_segment_t *) args.segment, 0); + rmp->n_fds = n_fds; + rmp->fd_flags = fd_flags; if (vec_len (args.segment->name)) { vl_api_vec_to_api_string (args.segment->name, &rmp->segment_name); } - rmp->app_event_queue_address = pointer_to_uword (args.evt_q); - rmp->n_fds = n_fds; - rmp->fd_flags = fd_flags; } })); /* *INDENT-ON* */ @@ -964,12 +1002,12 @@ send_session_rules_table_details (session_rules_table_t * srt, u8 fib_proto, u8 *tag = 0; /* *INDENT-OFF* */ srt16 = &srt->session_rules_tables_16; - pool_foreach (rule16, srt16->rules, ({ + pool_foreach (rule16, srt16->rules) { ri = mma_rules_table_rule_index_16 (srt16, rule16); tag = session_rules_table_rule_tag (srt, ri, 1); send_session_rule_details4 (rule16, is_local, tp, appns_index, tag, reg, context); - })); + } /* *INDENT-ON* */ } if (is_local || fib_proto == FIB_PROTOCOL_IP6) @@ -977,18 +1015,18 @@ send_session_rules_table_details (session_rules_table_t * srt, u8 fib_proto, u8 *tag = 0; /* *INDENT-OFF* */ srt40 = &srt->session_rules_tables_40; - pool_foreach (rule40, srt40->rules, ({ + pool_foreach (rule40, srt40->rules) { ri = mma_rules_table_rule_index_40 (srt40, rule40); tag = session_rules_table_rule_tag (srt, ri, 1); send_session_rule_details6 (rule40, is_local, tp, appns_index, tag, reg, context); - })); + } /* *INDENT-ON* */ } } static void -vl_api_session_rules_dump_t_handler (vl_api_one_map_server_dump_t * mp) +vl_api_session_rules_dump_t_handler (vl_api_session_rules_dump_t * mp) { vl_api_registration_t *reg; session_table_t *st; @@ -1046,13 +1084,11 @@ vl_api_app_add_cert_key_pair_t_handler (vl_api_app_add_cert_key_pair_t * mp) } clib_memset (a, 0, sizeof (*a)); - vec_validate (a->cert, cert_len); - vec_validate (a->key, key_len); - clib_memcpy_fast (a->cert, mp->certkey, cert_len); - clib_memcpy_fast (a->key, mp->certkey + cert_len, key_len); + a->cert = mp->certkey; + a->key = mp->certkey + cert_len; + a->cert_len = cert_len; + a->key_len = key_len; rv = vnet_app_add_cert_key_pair (a); - vec_free (a->cert); - vec_free (a->key); done: /* *INDENT-OFF* */ @@ -1081,73 +1117,6 @@ done: REPLY_MACRO (VL_API_APP_DEL_CERT_KEY_PAIR_REPLY); } -/* ### WILL BE DEPRECATED POST 20.01 ### */ -static void -vl_api_application_tls_cert_add_t_handler (vl_api_application_tls_cert_add_t * - mp) -{ - vl_api_application_tls_cert_add_reply_t *rmp; - app_cert_key_pair_t *ckpair; - application_t *app; - u32 cert_len; - int rv = 0; - if (session_main_is_enabled () == 0) - { - rv = VNET_API_ERROR_FEATURE_DISABLED; - goto done; - } - if (!(app = application_lookup (mp->client_index))) - { - rv = VNET_API_ERROR_APPLICATION_NOT_ATTACHED; - goto done; - } - cert_len = clib_net_to_host_u16 (mp->cert_len); - if (cert_len > 10000) - { - rv = VNET_API_ERROR_INVALID_VALUE; - goto done; - } - ckpair = app_cert_key_pair_get_default (); - vec_validate (ckpair->cert, cert_len); - clib_memcpy_fast (ckpair->cert, mp->cert, cert_len); - -done: - REPLY_MACRO (VL_API_APPLICATION_TLS_CERT_ADD_REPLY); -} - -/* ### WILL BE DEPRECATED POST 20.01 ### */ -static void -vl_api_application_tls_key_add_t_handler (vl_api_application_tls_key_add_t * - mp) -{ - vl_api_application_tls_key_add_reply_t *rmp; - app_cert_key_pair_t *ckpair; - application_t *app; - u32 key_len; - int rv = 0; - if (session_main_is_enabled () == 0) - { - rv = VNET_API_ERROR_FEATURE_DISABLED; - goto done; - } - if (!(app = application_lookup (mp->client_index))) - { - rv = VNET_API_ERROR_APPLICATION_NOT_ATTACHED; - goto done; - } - key_len = clib_net_to_host_u16 (mp->key_len); - if (key_len > 10000) - { - rv = VNET_API_ERROR_INVALID_VALUE; - goto done; - } - ckpair = app_cert_key_pair_get_default (); - vec_validate (ckpair->key, key_len); - clib_memcpy_fast (ckpair->key, mp->key, key_len); -done: - REPLY_MACRO (VL_API_APPLICATION_TLS_KEY_ADD_REPLY); -} - static clib_error_t * application_reaper_cb (u32 client_index) { @@ -1225,6 +1194,8 @@ sapi_send_fds (app_worker_t * app_wrk, int *fds, int n_fds) app_ns = app_namespace_get (app->ns_index); cs_index = appns_sapi_handle_sock_index (app_wrk->api_client_index); cs = appns_sapi_get_socket (app_ns, cs_index); + if (PREDICT_FALSE (!cs)) + return; /* There's no payload for the message only the type */ smsg.type = APP_SAPI_MSG_TYPE_SEND_FDS; @@ -1323,16 +1294,16 @@ 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; - ssvm_private_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; - svm_msg_q_t *ctrl_mq; application_t *app; + svm_msg_q_t *rx_mq; /* Make sure name is null terminated */ mp->name[63] = 0; @@ -1351,13 +1322,17 @@ session_api_attach_handler (app_namespace_t * app_ns, clib_socket_t * cs, 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->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) { @@ -1368,10 +1343,21 @@ session_api_attach_handler (app_namespace_t * app_ns, clib_socket_t * cs, if (a->options[APP_OPTIONS_FLAGS] & APP_OPTIONS_FLAGS_EVT_MQ_USE_EVENTFD) { fd_flags |= SESSION_FD_F_MQ_EVENTFD; - fds[n_fds] = svm_msg_q_get_producer_eventfd (a->app_evt_q); + fds[n_fds] = svm_msg_q_get_eventfd (a->app_evt_q); 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; @@ -1379,11 +1365,11 @@ done: rmp->retval = rv; if (!rv) { - ctrl_thread = vlib_num_workers ()? 1 : 0; - ctrl_mq = session_main_get_vpp_event_queue (ctrl_thread); + ctrl_thread = n_workers ? 1 : 0; rmp->app_index = a->app_index; - rmp->app_mq = pointer_to_uword (a->app_evt_q); - rmp->vpp_ctrl_mq = pointer_to_uword (ctrl_mq); + rmp->app_mq = + fifo_segment_msg_q_offset ((fifo_segment_t *) a->segment, 0); + 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; @@ -1394,13 +1380,13 @@ done: /* 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 @@ -1476,7 +1462,7 @@ sapi_add_del_worker_handler (app_namespace_t * app_ns, if (application_segment_manager_properties (app)->use_mq_eventfd) { fd_flags |= SESSION_FD_F_MQ_EVENTFD; - fds[n_fds] = svm_msg_q_get_producer_eventfd (args.evt_q); + fds[n_fds] = svm_msg_q_get_eventfd (args.evt_q); n_fds += 1; } @@ -1492,7 +1478,8 @@ done: if (!rv && mp->is_add) { /* No segment name and size. This supports only memfds */ - rmp->app_event_queue_address = pointer_to_uword (args.evt_q); + rmp->app_event_queue_address = + fifo_segment_msg_q_offset ((fifo_segment_t *) args.segment, 0); rmp->n_fds = n_fds; rmp->fd_flags = fd_flags; @@ -1534,6 +1521,7 @@ static clib_error_t * sapi_sock_read_ready (clib_file_t * cf) { app_ns_api_handle_t *handle = (app_ns_api_handle_t *) & cf->private_data; + vlib_main_t *vm = vlib_get_main (); app_sapi_msg_t msg = { 0 }; app_namespace_t *app_ns; clib_error_t *err = 0; @@ -1554,6 +1542,8 @@ sapi_sock_read_ready (clib_file_t * cf) handle = (app_ns_api_handle_t *) & cs->private_data; + vlib_worker_thread_barrier_sync (vm); + switch (msg.type) { case APP_SAPI_MSG_TYPE_ATTACH: @@ -1568,6 +1558,8 @@ sapi_sock_read_ready (clib_file_t * cf) break; } + vlib_worker_thread_barrier_release (vm); + error: return 0; } @@ -1631,14 +1623,14 @@ sapi_sock_accept_ready (clib_file_t * scf) cf.file_descriptor = ccs->fd; /* File points to app namespace and socket */ handle.aah_sock_index = appns_sapi_socket_index (app_ns, ccs); - cf.private_data = handle.as_uword; + cf.private_data = handle.as_u64; cf.description = format (0, "app sock conn fd: %d", ccs->fd); /* Poll until we get an attach message. Socket points to file and * application that owns the socket */ handle.aah_app_wrk_index = APP_INVALID_INDEX; handle.aah_file_index = clib_file_add (&file_main, &cf); - ccs->private_data = handle.as_uword; + ccs->private_data = handle.as_u64; return err;