X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvcl%2Fvcl_bapi.c;h=724409897279d7e87176a6b5921730f5bfdf573d;hp=a98b18121833abb0adb8bb5dd5ed04c1df1229a4;hb=36217e3ca;hpb=39d69112fcec114fde34955ceb41555221d3ba11 diff --git a/src/vcl/vcl_bapi.c b/src/vcl/vcl_bapi.c index a98b1812183..72440989727 100644 --- a/src/vcl/vcl_bapi.c +++ b/src/vcl/vcl_bapi.c @@ -15,25 +15,16 @@ #include #include -#include -#define vl_typedefs /* define message structures */ -#include -#undef vl_typedefs +#include +#include +#include -/* declare message handlers for each api */ +#define REPLY_MSG_ID_BASE msg_id_base -#define vl_endianfun /* define message structures */ -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) -#define vl_printfun -#include -#undef vl_printfun +static u16 msg_id_base; -u8 * +static u8 * format_api_error (u8 * s, va_list * args) { i32 error = va_arg (*args, u32); @@ -52,69 +43,25 @@ static void vl_api_session_enable_disable_reply_t_handler (vl_api_session_enable_disable_reply_t * mp) { + vcl_worker_t *wrk = vcl_worker_get (0); + if (mp->retval) { clib_warning ("VCL<%d>: session_enable_disable failed: %U", getpid (), format_api_error, ntohl (mp->retval)); } else - vcm->app_state = STATE_APP_ENABLED; -} - -static int -vcl_segment_attach (u64 segment_handle, char *name, ssvm_segment_type_t type, - int fd) -{ - fifo_segment_create_args_t _a, *a = &_a; - int rv; - - memset (a, 0, sizeof (*a)); - a->segment_name = (char *) name; - a->segment_type = type; - - if (type == SSVM_SEGMENT_MEMFD) - a->memfd_fd = fd; - - if ((rv = fifo_segment_attach (&vcm->segment_main, a))) - { - clib_warning ("svm_fifo_segment_attach ('%s') failed", name); - return rv; - } - vcl_segment_table_add (segment_handle, a->new_segment_indices[0]); - vec_reset_length (a->new_segment_indices); - return 0; -} - -static void -vcl_segment_detach (u64 segment_handle) -{ - fifo_segment_main_t *sm = &vcm->segment_main; - fifo_segment_t *segment; - u32 segment_index; - - segment_index = vcl_segment_table_lookup (segment_handle); - if (segment_index == (u32) ~ 0) - return; - segment = fifo_segment_get_segment (sm, segment_index); - fifo_segment_delete (sm, segment); - vcl_segment_table_del (segment_handle); - VDBG (0, "detached segment %u handle %u", segment_index, segment_handle); -} - -static u64 -vcl_vpp_worker_segment_handle (u32 wrk_index) -{ - return (VCL_INVALID_SEGMENT_HANDLE - wrk_index - 1); + wrk->bapi_app_state = STATE_APP_ENABLED; } static void vl_api_app_attach_reply_t_handler (vl_api_app_attach_reply_t * mp) { vcl_worker_t *wrk = vcl_worker_get (0); - svm_msg_q_t *ctrl_mq; u64 segment_handle; - int *fds = 0, i; + int *fds = 0, i, rv; u32 n_fds = 0; + char *segment_name = 0; if (mp->retval) { @@ -122,11 +69,8 @@ vl_api_app_attach_reply_t_handler (vl_api_app_attach_reply_t * mp) goto failed; } - wrk->app_event_queue = uword_to_pointer (mp->app_mq, svm_msg_q_t *); - ctrl_mq = uword_to_pointer (mp->vpp_ctrl_mq, svm_msg_q_t *); - vec_validate (wrk->vpp_event_queues, mp->vpp_ctrl_mq_thread); - wrk->vpp_event_queues[mp->vpp_ctrl_mq_thread] = ctrl_mq; - vcm->ctrl_mq = wrk->ctrl_mq = ctrl_mq; + vcl_set_worker_index (0); + segment_handle = clib_net_to_host_u64 (mp->segment_handle); if (segment_handle == VCL_INVALID_SEGMENT_HANDLE) { @@ -137,7 +81,8 @@ vl_api_app_attach_reply_t_handler (vl_api_app_attach_reply_t * mp) if (mp->n_fds) { vec_validate (fds, mp->n_fds); - if (vl_socket_client_recv_fd_msg (fds, mp->n_fds, 5)) + if (vl_socket_client_recv_fd_msg2 (&wrk->bapi_sock_ctx, fds, mp->n_fds, + 5)) goto failed; if (mp->fd_flags & SESSION_FD_F_VPP_MQ_SEGMENT) @@ -147,32 +92,52 @@ vl_api_app_attach_reply_t_handler (vl_api_app_attach_reply_t * mp) goto failed; if (mp->fd_flags & SESSION_FD_F_MEMFD_SEGMENT) - if (vcl_segment_attach (segment_handle, (char *) mp->segment_name, - SSVM_SEGMENT_MEMFD, fds[n_fds++])) - goto failed; + { + segment_name = vl_api_from_api_to_new_c_string (&mp->segment_name); + rv = + vcl_segment_attach (segment_handle, segment_name, + SSVM_SEGMENT_MEMFD, fds[n_fds++]); + vec_free (segment_name); + if (rv != 0) + goto failed; + } + + vcl_segment_attach_mq (segment_handle, mp->app_mq, 0, + &wrk->app_event_queue); if (mp->fd_flags & SESSION_FD_F_MQ_EVENTFD) { - svm_msg_q_set_consumer_eventfd (wrk->app_event_queue, fds[n_fds]); + svm_msg_q_set_eventfd (wrk->app_event_queue, fds[n_fds]); vcl_mq_epoll_add_evfd (wrk, wrk->app_event_queue); n_fds++; } + vcl_segment_discover_mqs (vcl_vpp_worker_segment_handle (0), fds + n_fds, + mp->n_fds - n_fds); + vcl_segment_attach_mq (vcl_vpp_worker_segment_handle (0), + mp->vpp_ctrl_mq, mp->vpp_ctrl_mq_thread, + &wrk->ctrl_mq); + vcm->ctrl_mq = wrk->ctrl_mq; + vec_free (fds); } else { - if (vcl_segment_attach (segment_handle, (char *) mp->segment_name, - SSVM_SEGMENT_SHM, -1)) + segment_name = vl_api_from_api_to_new_c_string (&mp->segment_name); + rv = + vcl_segment_attach (segment_handle, segment_name, SSVM_SEGMENT_SHM, + -1); + vec_free (segment_name); + if (rv != 0) goto failed; } vcm->app_index = clib_net_to_host_u32 (mp->app_index); - vcm->app_state = STATE_APP_ATTACHED; + wrk->bapi_app_state = STATE_APP_ATTACHED; return; failed: - vcm->app_state = STATE_APP_FAILED; + wrk->bapi_app_state = STATE_APP_FAILED; for (i = clib_max (n_fds - 1, 0); i < vec_len (fds); i++) close (fds[i]); vec_free (fds); @@ -182,17 +147,11 @@ static void vl_api_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t * mp) { - int n_fds = 0, *fds = 0, i; + int n_fds = 0, *fds = 0, i, rv; u64 segment_handle; vcl_worker_t *wrk; u32 wrk_index; - - if (mp->retval) - { - clib_warning ("VCL<%d>: add/del worker failed: %U", getpid (), - format_api_error, ntohl (mp->retval)); - goto failed; - } + char *segment_name = 0; if (!mp->is_add) return; @@ -202,9 +161,15 @@ vl_api_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t * if (!wrk) return; + if (mp->retval) + { + clib_warning ("VCL<%d>: add/del worker failed: %U", getpid (), + format_api_error, ntohl (mp->retval)); + goto failed; + } + + vcl_set_worker_index (wrk_index); wrk->vpp_wrk_index = clib_net_to_host_u32 (mp->wrk_index); - wrk->app_event_queue = uword_to_pointer (mp->app_event_queue_address, - svm_msg_q_t *); wrk->ctrl_mq = vcm->ctrl_mq; segment_handle = clib_net_to_host_u64 (mp->segment_handle); @@ -217,7 +182,8 @@ vl_api_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t * if (mp->n_fds) { vec_validate (fds, mp->n_fds); - if (vl_socket_client_recv_fd_msg (fds, mp->n_fds, 5)) + if (vl_socket_client_recv_fd_msg2 (&wrk->bapi_sock_ctx, fds, mp->n_fds, + 5)) goto failed; if (mp->fd_flags & SESSION_FD_F_VPP_MQ_SEGMENT) @@ -227,13 +193,22 @@ vl_api_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t * goto failed; if (mp->fd_flags & SESSION_FD_F_MEMFD_SEGMENT) - if (vcl_segment_attach (segment_handle, (char *) mp->segment_name, - SSVM_SEGMENT_MEMFD, fds[n_fds++])) - goto failed; + { + segment_name = vl_api_from_api_to_new_c_string (&mp->segment_name); + rv = + vcl_segment_attach (segment_handle, segment_name, + SSVM_SEGMENT_MEMFD, fds[n_fds++]); + vec_free (segment_name); + if (rv != 0) + goto failed; + } + + vcl_segment_attach_mq (segment_handle, mp->app_event_queue_address, 0, + &wrk->app_event_queue); if (mp->fd_flags & SESSION_FD_F_MQ_EVENTFD) { - svm_msg_q_set_consumer_eventfd (wrk->app_event_queue, fds[n_fds]); + svm_msg_q_set_eventfd (wrk->app_event_queue, fds[n_fds]); vcl_mq_epoll_add_evfd (wrk, wrk->app_event_queue); n_fds++; } @@ -242,98 +217,93 @@ vl_api_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t * } else { - if (vcl_segment_attach (segment_handle, (char *) mp->segment_name, - SSVM_SEGMENT_SHM, -1)) + segment_name = vl_api_from_api_to_new_c_string (&mp->segment_name); + rv = + vcl_segment_attach (segment_handle, segment_name, SSVM_SEGMENT_SHM, + -1); + vec_free (segment_name); + if (rv != 0) goto failed; } - vcm->app_state = STATE_APP_READY; + wrk->bapi_app_state = STATE_APP_READY; VDBG (0, "worker %u vpp-worker %u added", wrk_index, wrk->vpp_wrk_index); return; failed: - vcm->app_state = STATE_APP_FAILED; + wrk->bapi_app_state = STATE_APP_FAILED; for (i = clib_max (n_fds - 1, 0); i < vec_len (fds); i++) close (fds[i]); vec_free (fds); } static void -vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp) +vl_api_app_add_cert_key_pair_reply_t_handler ( + vl_api_app_add_cert_key_pair_reply_t *mp) { - ssvm_segment_type_t seg_type = SSVM_SEGMENT_SHM; - u64 segment_handle; - int fd = -1; - - if (mp->fd_flags) - { - vl_socket_client_recv_fd_msg (&fd, 1, 5); - seg_type = SSVM_SEGMENT_MEMFD; - } + vcl_worker_t *wrk = vcl_worker_get_current (); - segment_handle = clib_net_to_host_u64 (mp->segment_handle); - if (segment_handle == VCL_INVALID_SEGMENT_HANDLE) + if (mp->retval) { - clib_warning ("invalid segment handle"); + VDBG (0, "Adding cert and key failed: %U", format_api_error, + ntohl (mp->retval)); return; } + wrk->bapi_return = clib_net_to_host_u32 (mp->index); + wrk->bapi_app_state = STATE_APP_READY; +} - if (vcl_segment_attach (segment_handle, (char *) mp->segment_name, - seg_type, fd)) +static void +vl_api_app_del_cert_key_pair_reply_t_handler ( + vl_api_app_del_cert_key_pair_reply_t *mp) +{ + if (mp->retval) { - clib_warning ("VCL<%d>: svm_fifo_segment_attach ('%s') failed", - getpid (), mp->segment_name); + VDBG (0, "Deleting cert and key failed: %U", format_api_error, + ntohl (mp->retval)); return; } - - VDBG (1, "VCL<%d>: mapped new segment '%s' size %d", getpid (), - mp->segment_name, mp->segment_size); } -static void -vl_api_unmap_segment_t_handler (vl_api_unmap_segment_t * mp) -{ - u64 segment_handle = clib_net_to_host_u64 (mp->segment_handle); - vcl_segment_detach (segment_handle); - VDBG (1, "Unmapped segment: %d", segment_handle); -} +#define foreach_sock_msg \ + _ (SESSION_ENABLE_DISABLE_REPLY, session_enable_disable_reply) \ + _ (APP_ATTACH_REPLY, app_attach_reply) \ + _ (APP_ADD_CERT_KEY_PAIR_REPLY, app_add_cert_key_pair_reply) \ + _ (APP_DEL_CERT_KEY_PAIR_REPLY, app_del_cert_key_pair_reply) \ + _ (APP_WORKER_ADD_DEL_REPLY, app_worker_add_del_reply) -static void - vl_api_application_tls_cert_add_reply_t_handler - (vl_api_application_tls_cert_add_reply_t * mp) -{ - if (mp->retval) - VDBG (0, "add cert failed: %U", format_api_error, ntohl (mp->retval)); - vcm->app_state = STATE_APP_READY; -} +#define vl_print(handle, ...) fformat (handle, __VA_ARGS__) +#define vl_endianfun /* define message structures */ +#include +#undef vl_endianfun + +/* instantiate all the print functions we know about */ +#define vl_printfun +#include +#undef vl_printfun + +#define vl_api_version(n, v) static u32 api_version = v; +#include +#undef vl_api_version static void - vl_api_application_tls_key_add_reply_t_handler - (vl_api_application_tls_key_add_reply_t * mp) +vcl_bapi_hookup (void) { - if (mp->retval) - VDBG (0, "add key failed: %U", format_api_error, ntohl (mp->retval)); - vcm->app_state = STATE_APP_READY; -} + u8 *msg_base_lookup_name = format (0, "session_%08x%c", api_version, 0); -#define foreach_sock_msg \ -_(SESSION_ENABLE_DISABLE_REPLY, session_enable_disable_reply) \ -_(APP_ATTACH_REPLY, app_attach_reply) \ -_(APPLICATION_TLS_CERT_ADD_REPLY, application_tls_cert_add_reply) \ -_(APPLICATION_TLS_KEY_ADD_REPLY, application_tls_key_add_reply) \ -_(MAP_ANOTHER_SEGMENT, map_another_segment) \ -_(UNMAP_SEGMENT, unmap_segment) \ -_(APP_WORKER_ADD_DEL_REPLY, app_worker_add_del_reply) \ + REPLY_MSG_ID_BASE = + vl_client_get_first_plugin_msg_id ((char *) msg_base_lookup_name); -void -vppcom_api_hookup (void) -{ -#define _(N, n) \ - vl_msg_api_set_handlers(VL_API_##N, #n, \ - vl_api_##n##_t_handler, \ - vl_noop_handler, \ - vl_api_##n##_t_endian, \ - vl_api_##n##_t_print, \ - sizeof(vl_api_##n##_t), 1); + vec_free (msg_base_lookup_name); + + if (REPLY_MSG_ID_BASE == (u16) ~0) + return; + +#define _(N, n) \ + vl_msg_api_set_handlers ( \ + REPLY_MSG_ID_BASE + VL_API_##N, #n, vl_api_##n##_t_handler, \ + vl_noop_handler, vl_api_##n##_t_endian, vl_api_##n##_t_print, \ + sizeof (vl_api_##n##_t), 1, vl_api_##n##_t_print_json, \ + vl_api_##n##_t_tojson, vl_api_##n##_t_fromjson); foreach_sock_msg; #undef _ } @@ -341,23 +311,23 @@ vppcom_api_hookup (void) /* * VPP-API message functions */ -void -vppcom_send_session_enable_disable (u8 is_enable) +static void +vcl_bapi_send_session_enable_disable (u8 is_enable) { vcl_worker_t *wrk = vcl_worker_get_current (); vl_api_session_enable_disable_t *bmp; bmp = vl_msg_api_alloc (sizeof (*bmp)); memset (bmp, 0, sizeof (*bmp)); - bmp->_vl_msg_id = ntohs (VL_API_SESSION_ENABLE_DISABLE); - bmp->client_index = wrk->my_client_index; + bmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_SESSION_ENABLE_DISABLE); + bmp->client_index = wrk->api_client_handle; bmp->context = htonl (0xfeedface); bmp->is_enable = is_enable; vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & bmp); } void -vppcom_app_send_attach (void) +vcl_bapi_send_attach (void) { vcl_worker_t *wrk = vcl_worker_get_current (); u8 tls_engine = CRYPTO_ENGINE_OPENSSL; @@ -371,8 +341,8 @@ vppcom_app_send_attach (void) bmp = vl_msg_api_alloc (sizeof (*bmp)); memset (bmp, 0, sizeof (*bmp)); - bmp->_vl_msg_id = ntohs (VL_API_APP_ATTACH); - bmp->client_index = wrk->my_client_index; + bmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_APP_ATTACH); + bmp->client_index = wrk->api_client_handle; bmp->context = htonl (0xfeedface); bmp->options[APP_OPTIONS_FLAGS] = APP_OPTIONS_FLAGS_ACCEPT_REDIRECT | APP_OPTIONS_FLAGS_ADD_SEGMENT | @@ -393,29 +363,28 @@ vppcom_app_send_attach (void) bmp->options[APP_OPTIONS_TLS_ENGINE] = tls_engine; if (nsid_len) { - bmp->namespace_id_len = nsid_len; - clib_memcpy_fast (bmp->namespace_id, vcm->cfg.namespace_id, nsid_len); + vl_api_vec_to_api_string (vcm->cfg.namespace_id, &bmp->namespace_id); bmp->options[APP_OPTIONS_NAMESPACE_SECRET] = vcm->cfg.namespace_secret; } vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & bmp); } void -vppcom_app_send_detach (void) +vcl_bapi_send_detach (void) { vcl_worker_t *wrk = vcl_worker_get_current (); vl_api_application_detach_t *bmp; bmp = vl_msg_api_alloc (sizeof (*bmp)); memset (bmp, 0, sizeof (*bmp)); - bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_DETACH); - bmp->client_index = wrk->my_client_index; + bmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_APPLICATION_DETACH); + bmp->client_index = wrk->api_client_handle; bmp->context = htonl (0xfeedface); vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & bmp); } -void -vcl_send_app_worker_add_del (u8 is_add) +static void +vcl_bapi_send_app_worker_add_del (u8 is_add) { vcl_worker_t *wrk = vcl_worker_get_current (); vl_api_app_worker_add_del_t *mp; @@ -423,8 +392,8 @@ vcl_send_app_worker_add_del (u8 is_add) mp = vl_msg_api_alloc (sizeof (*mp)); memset (mp, 0, sizeof (*mp)); - mp->_vl_msg_id = ntohs (VL_API_APP_WORKER_ADD_DEL); - mp->client_index = wrk->my_client_index; + mp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_APP_WORKER_ADD_DEL); + mp->client_index = wrk->api_client_handle; mp->app_index = clib_host_to_net_u32 (vcm->app_index); mp->context = wrk->wrk_index; mp->is_add = is_add; @@ -434,8 +403,8 @@ vcl_send_app_worker_add_del (u8 is_add) vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & mp); } -void -vcl_send_child_worker_del (vcl_worker_t * child_wrk) +static void +vcl_bapi_send_child_worker_del (vcl_worker_t * child_wrk) { vcl_worker_t *wrk = vcl_worker_get_current (); vl_api_app_worker_add_del_t *mp; @@ -443,8 +412,8 @@ vcl_send_child_worker_del (vcl_worker_t * child_wrk) mp = vl_msg_api_alloc (sizeof (*mp)); memset (mp, 0, sizeof (*mp)); - mp->_vl_msg_id = ntohs (VL_API_APP_WORKER_ADD_DEL); - mp->client_index = wrk->my_client_index; + mp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_APP_WORKER_ADD_DEL); + mp->client_index = wrk->api_client_handle; mp->app_index = clib_host_to_net_u32 (vcm->app_index); mp->context = wrk->wrk_index; mp->is_add = 0; @@ -453,49 +422,52 @@ vcl_send_child_worker_del (vcl_worker_t * child_wrk) vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & mp); } -void -vppcom_send_application_tls_cert_add (vcl_session_t * session, char *cert, - u32 cert_len) +static void +vcl_bapi_send_app_add_cert_key_pair (vppcom_cert_key_pair_t *ckpair) { vcl_worker_t *wrk = vcl_worker_get_current (); - vl_api_application_tls_cert_add_t *cert_mp; - - cert_mp = vl_msg_api_alloc (sizeof (*cert_mp) + cert_len); - clib_memset (cert_mp, 0, sizeof (*cert_mp)); - cert_mp->_vl_msg_id = ntohs (VL_API_APPLICATION_TLS_CERT_ADD); - cert_mp->client_index = wrk->my_client_index; - cert_mp->context = session->session_index; - cert_mp->cert_len = clib_host_to_net_u16 (cert_len); - clib_memcpy_fast (cert_mp->cert, cert, cert_len); - vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & cert_mp); + u32 cert_len = ckpair->cert_len; + u32 key_len = ckpair->key_len; + vl_api_app_add_cert_key_pair_t *bmp; + + bmp = vl_msg_api_alloc (sizeof (*bmp) + cert_len + key_len); + clib_memset (bmp, 0, sizeof (*bmp) + cert_len + key_len); + + bmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_APP_ADD_CERT_KEY_PAIR); + bmp->client_index = wrk->api_client_handle; + bmp->context = wrk->wrk_index; + bmp->cert_len = clib_host_to_net_u16 (cert_len); + bmp->certkey_len = clib_host_to_net_u16 (key_len + cert_len); + clib_memcpy_fast (bmp->certkey, ckpair->cert, cert_len); + clib_memcpy_fast (bmp->certkey + cert_len, ckpair->key, key_len); + + vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) &bmp); } -void -vppcom_send_application_tls_key_add (vcl_session_t * session, char *key, - u32 key_len) +static void +vcl_bapi_send_app_del_cert_key_pair (u32 ckpair_index) { vcl_worker_t *wrk = vcl_worker_get_current (); - vl_api_application_tls_key_add_t *key_mp; - - key_mp = vl_msg_api_alloc (sizeof (*key_mp) + key_len); - clib_memset (key_mp, 0, sizeof (*key_mp)); - key_mp->_vl_msg_id = ntohs (VL_API_APPLICATION_TLS_KEY_ADD); - key_mp->client_index = wrk->my_client_index; - key_mp->context = session->session_index; - key_mp->key_len = clib_host_to_net_u16 (key_len); - clib_memcpy_fast (key_mp->key, key, key_len); - vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & key_mp); + vl_api_app_del_cert_key_pair_t *bmp; + bmp = vl_msg_api_alloc (sizeof (*bmp)); + clib_memset (bmp, 0, sizeof (*bmp)); + + bmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_APP_DEL_CERT_KEY_PAIR); + bmp->client_index = wrk->api_client_handle; + bmp->context = wrk->wrk_index; + bmp->index = clib_host_to_net_u32 (ckpair_index); + vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) &bmp); } u32 -vcl_max_nsid_len (void) +vcl_bapi_max_nsid_len (void) { - vl_api_application_attach_t *mp; + vl_api_app_attach_t *mp; return (sizeof (mp->namespace_id) - 1); } -void -vppcom_init_error_string_table (void) +static void +vcl_bapi_init_error_string_table (void) { vcm->error_string_by_error_number = hash_create (0, sizeof (uword)); @@ -506,63 +478,294 @@ vppcom_init_error_string_table (void) hash_set (vcm->error_string_by_error_number, 99, "Misc"); } -int -vppcom_connect_to_vpp (char *app_name) +static void +vcl_bapi_cleanup (void) { - vcl_worker_t *wrk = vcl_worker_get_current (); + socket_client_main_t *scm = &socket_client_main; api_main_t *am = vlibapi_get_main (); + + am->my_client_index = ~0; + am->my_registration = 0; + am->vl_input_queue = 0; + am->msg_index_by_name_and_crc = 0; + scm->socket_fd = 0; + + vl_client_api_unmap (); +} + +static int +vcl_bapi_connect_to_vpp (void) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); vppcom_cfg_t *vcl_cfg = &vcm->cfg; + int rv = VPPCOM_OK; + api_main_t *am; + u8 *wrk_name; + + wrk_name = format (0, "%v-wrk-%u%c", vcm->app_name, wrk->wrk_index, 0); + + /* Make sure api is cleaned up in case this is a connect from a + * forked worker */ + vcl_bapi_cleanup (); - if (vcl_cfg->vpp_api_socket_name) + vlibapi_set_main (&wrk->bapi_api_ctx); + vlibapi_set_memory_client_main (&wrk->bapi_mem_ctx); + + if (!vcl_cfg->vpp_bapi_socket_name) { - if (vl_socket_client_connect ((char *) vcl_cfg->vpp_api_socket_name, - app_name, 0 /* default rx/tx buffer */ )) - { - VERR ("app (%s) socket connect failed!", app_name); - return VPPCOM_ECONNREFUSED; - } + rv = VPPCOM_EINVAL; + goto error; + } - if (vl_socket_client_init_shm (0, 1 /* want_pthread */ )) - { - VERR ("app (%s) init shm failed!", app_name); - return VPPCOM_ECONNREFUSED; - } + if (vl_socket_client_connect2 (&wrk->bapi_sock_ctx, + (char *) vcl_cfg->vpp_bapi_socket_name, + (char *) wrk_name, + 0 /* default rx/tx buffer */ )) + { + VERR ("app (%s) socket connect failed!", wrk_name); + rv = VPPCOM_ECONNREFUSED; + goto error; } + + if (vl_socket_client_init_shm2 (&wrk->bapi_sock_ctx, 0, + 1 /* want_pthread */ )) + { + VERR ("app (%s) init shm failed!", wrk_name); + rv = VPPCOM_ECONNREFUSED; + goto error; + } + vcl_bapi_hookup (); + + am = vlibapi_get_main (); + wrk->vl_input_queue = am->shmem_hdr->vl_input_queue; + wrk->api_client_handle = (u32) am->my_client_index; + + VDBG (0, "app (%s) is connected to VPP!", wrk_name); + vcl_evt (VCL_EVT_INIT, vcm); + +error: + vec_free (wrk_name); + return rv; +} + +void +vcl_bapi_disconnect_from_vpp (void) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + vppcom_cfg_t *vcl_cfg = &vcm->cfg; + + if (vcl_cfg->vpp_bapi_socket_name) + vl_socket_client_disconnect2 (&wrk->bapi_sock_ctx); else + vl_client_disconnect_from_vlib (); +} + +static const char * +vcl_bapi_app_state_str (vcl_bapi_app_state_t state) +{ + char *st; + + switch (state) + { + case STATE_APP_START: + st = "STATE_APP_START"; + break; + + case STATE_APP_CONN_VPP: + st = "STATE_APP_CONN_VPP"; + break; + + case STATE_APP_ENABLED: + st = "STATE_APP_ENABLED"; + break; + + case STATE_APP_ATTACHED: + st = "STATE_APP_ATTACHED"; + break; + + default: + st = "UNKNOWN_APP_STATE"; + break; + } + + return st; +} + +static int +vcl_bapi_wait_for_wrk_state_change (vcl_bapi_app_state_t app_state) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + f64 timeout = clib_time_now (&wrk->clib_time) + vcm->cfg.app_timeout; + + while (clib_time_now (&wrk->clib_time) < timeout) { - if (!vcl_cfg->vpp_api_filename) - vcl_cfg->vpp_api_filename = format (0, "/vpe-api%c", 0); + if (wrk->bapi_app_state == app_state) + return VPPCOM_OK; + if (wrk->bapi_app_state == STATE_APP_FAILED) + return VPPCOM_ECONNABORTED; + } + VDBG (0, "timeout waiting for state %s, current state %d", + vcl_bapi_app_state_str (app_state), wrk->bapi_app_state); + vcl_evt (VCL_EVT_SESSION_TIMEOUT, vcm, bapi_app_state); + + return VPPCOM_ETIMEDOUT; +} - VDBG (0, "app (%s) connecting to VPP api (%s)...", - app_name, vcl_cfg->vpp_api_filename); +static int +vcl_bapi_session_enable (void) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + int rv; - if (vl_client_connect_to_vlib ((char *) vcl_cfg->vpp_api_filename, - app_name, vcm->cfg.vpp_api_q_length) < 0) + if (wrk->bapi_app_state != STATE_APP_ENABLED) + { + vcl_bapi_send_session_enable_disable (1 /* is_enabled == TRUE */ ); + rv = vcl_bapi_wait_for_wrk_state_change (STATE_APP_ENABLED); + if (PREDICT_FALSE (rv)) { - VERR ("app (%s) connect failed!", app_name); - return VPPCOM_ECONNREFUSED; + VDBG (0, "application session enable timed out! returning %d (%s)", + rv, vppcom_retval_str (rv)); + return rv; } + } + return VPPCOM_OK; +} + +static int +vcl_bapi_init (void) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + int rv; + wrk->bapi_app_state = STATE_APP_START; + vcl_bapi_init_error_string_table (); + rv = vcl_bapi_connect_to_vpp (); + if (rv) + { + VERR ("couldn't connect to VPP!"); + return rv; + } + VDBG (0, "sending session enable"); + rv = vcl_bapi_session_enable (); + if (rv) + { + VERR ("vppcom_app_session_enable() failed!"); + return rv; } - wrk->vl_input_queue = am->shmem_hdr->vl_input_queue; - wrk->my_client_index = (u32) am->my_client_index; - wrk->wrk_state = STATE_APP_CONN_VPP; + return 0; +} - VDBG (0, "app (%s) is connected to VPP!", app_name); - vcl_evt (VCL_EVT_INIT, vcm); - return VPPCOM_OK; +int +vcl_bapi_attach (void) +{ + int rv; + + /* API hookup and connect to VPP */ + if ((rv = vcl_bapi_init ())) + return rv; + + vcl_bapi_send_attach (); + rv = vcl_bapi_wait_for_wrk_state_change (STATE_APP_ATTACHED); + if (PREDICT_FALSE (rv)) + { + VDBG (0, "application attach timed out! returning %d (%s)", rv, + vppcom_retval_str (rv)); + return rv; + } + + return 0; +} + +int +vcl_bapi_app_worker_add (void) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + + if (vcl_bapi_connect_to_vpp ()) + return -1; + + wrk->bapi_app_state = STATE_APP_ADDING_WORKER; + vcl_bapi_send_app_worker_add_del (1 /* is_add */ ); + if (vcl_bapi_wait_for_wrk_state_change (STATE_APP_READY)) + return -1; + return 0; } void -vppcom_disconnect_from_vpp (void) +vcl_bapi_app_worker_del (vcl_worker_t * wrk) { - vppcom_cfg_t *vcl_cfg = &vcm->cfg; + /* Notify vpp that the worker is going away */ + if (wrk->wrk_index == vcl_get_worker_index ()) + vcl_bapi_send_app_worker_add_del (0 /* is_add */ ); + else + vcl_bapi_send_child_worker_del (wrk); - if (vcl_cfg->vpp_api_socket_name) - vl_socket_client_disconnect (); + /* Disconnect the binary api */ + if (vec_len (vcm->workers) == 1) + vcl_bapi_disconnect_from_vpp (); else - vl_client_disconnect_from_vlib (); + vl_client_send_disconnect (1 /* vpp should cleanup */ ); +} + +int +vcl_bapi_recv_fds (vcl_worker_t * wrk, int *fds, int n_fds) +{ + clib_error_t *err; + + if ((err = vl_socket_client_recv_fd_msg2 (&wrk->bapi_sock_ctx, fds, n_fds, + 5))) + { + clib_error_report (err); + return -1; + } + + return 0; +} + +int +vcl_bapi_add_cert_key_pair (vppcom_cert_key_pair_t *ckpair) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + + if (ckpair->key_len == 0 || ckpair->key_len == ~0) + return VPPCOM_EINVAL; + + vcl_bapi_send_app_add_cert_key_pair (ckpair); + wrk->bapi_app_state = STATE_APP_ADDING_TLS_DATA; + vcl_bapi_wait_for_wrk_state_change (STATE_APP_READY); + if (wrk->bapi_app_state == STATE_APP_READY) + return wrk->bapi_return; + return VPPCOM_EFAULT; +} + +int +vcl_bapi_del_cert_key_pair (u32 ckpair_index) +{ + /* Don't wait for reply */ + vcl_bapi_send_app_del_cert_key_pair (ckpair_index); + return 0; +} + +int +vcl_bapi_worker_set (void) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + int i; + + /* Find the first worker with the same pid */ + for (i = 0; i < vec_len (vcm->workers); i++) + { + if (i == wrk->wrk_index) + continue; + if (vcm->workers[i].current_pid == wrk->current_pid) + { + wrk->vl_input_queue = vcm->workers[i].vl_input_queue; + wrk->api_client_handle = vcm->workers[i].api_client_handle; + return 0; + } + } + return -1; } /*