X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvcl_bapi.c;h=7d241624d01c3d78ae9b8e24ff90ca3889812516;hb=a5a9efd4d;hp=ea8f2ce5651c3d6b7b1b700ba1ded4badf4d97a6;hpb=178cf493d009995b28fdf220f04c98860ff79a9b;p=vpp.git diff --git a/src/vcl/vcl_bapi.c b/src/vcl/vcl_bapi.c index ea8f2ce5651..7d241624d01 100644 --- a/src/vcl/vcl_bapi.c +++ b/src/vcl/vcl_bapi.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Cisco and/or its affiliates. + * Copyright (c) 2018-2019 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this * You may obtain a copy of the License at: @@ -33,7 +33,7 @@ #include #undef vl_printfun -u8 * +static u8 * format_api_error (u8 * s, va_list * args) { i32 error = va_arg (*args, u32); @@ -52,68 +52,72 @@ 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 -ssvm_segment_attach (char *name, ssvm_segment_type_t type, int fd) -{ - svm_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 = svm_fifo_segment_attach (a))) - { - clib_warning ("svm_fifo_segment_attach ('%s') failed", name); - return rv; - } - vec_reset_length (a->new_segment_indices); - return 0; + wrk->bapi_app_state = STATE_APP_ENABLED; } static void -vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t * - mp) +vl_api_app_attach_reply_t_handler (vl_api_app_attach_reply_t * mp) { vcl_worker_t *wrk = vcl_worker_get (0); + u64 segment_handle; + int *fds = 0, i, rv; u32 n_fds = 0; - int *fds = 0; + char *segment_name = 0; if (mp->retval) { - clib_warning ("VCL<%d>: attach failed: %U", getpid (), - format_api_error, ntohl (mp->retval)); - return; + VERR ("attach failed: %U", format_api_error, ntohl (mp->retval)); + goto failed; + } + + vcl_set_worker_index (0); + + segment_handle = clib_net_to_host_u64 (mp->segment_handle); + if (segment_handle == VCL_INVALID_SEGMENT_HANDLE) + { + VERR ("invalid segment handle"); + goto failed; } - wrk->app_event_queue = uword_to_pointer (mp->app_event_queue_address, - svm_msg_q_t *); if (mp->n_fds) { vec_validate (fds, mp->n_fds); - 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) - if (ssvm_segment_attach ("vpp-mq-seg", SSVM_SEGMENT_MEMFD, - fds[n_fds++])) - return; + if (vcl_segment_attach (vcl_vpp_worker_segment_handle (0), + "vpp-mq-seg", SSVM_SEGMENT_MEMFD, + fds[n_fds++])) + goto failed; + + 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; if (mp->fd_flags & SESSION_FD_F_MEMFD_SEGMENT) - if (ssvm_segment_attach ((char *) mp->segment_name, - SSVM_SEGMENT_MEMFD, fds[n_fds++])) - return; + { + 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) { @@ -126,21 +130,43 @@ vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t * } else { - if (ssvm_segment_attach ((char *) mp->segment_name, SSVM_SEGMENT_SHM, - -1)) - return; + 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_ATTACHED; + vcm->app_index = clib_net_to_host_u32 (mp->app_index); + wrk->bapi_app_state = STATE_APP_ATTACHED; + return; + +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_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t * mp) { - int n_fds = 0, *fds = 0; + int n_fds = 0, *fds = 0, i, rv; + u64 segment_handle; vcl_worker_t *wrk; u32 wrk_index; + char *segment_name = 0; + + if (!mp->is_add) + return; + + wrk_index = mp->context; + wrk = vcl_worker_get_if_valid (wrk_index); + if (!wrk) + return; if (mp->retval) { @@ -148,34 +174,44 @@ vl_api_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t * format_api_error, ntohl (mp->retval)); goto failed; } - wrk_index = clib_net_to_host_u32 (mp->wrk_index); - if (mp->context != wrk_index) + + vcl_set_worker_index (wrk_index); + wrk->vpp_wrk_index = clib_net_to_host_u32 (mp->wrk_index); + wrk->ctrl_mq = vcm->ctrl_mq; + + segment_handle = clib_net_to_host_u64 (mp->segment_handle); + if (segment_handle == VCL_INVALID_SEGMENT_HANDLE) { - clib_warning ("VCL<%d>: wrk numbering doesn't match ours: %u, vpp: %u", - getpid (), mp->context, wrk_index); + clib_warning ("invalid segment handle"); goto failed; } - if (!mp->is_add) - return; - - wrk = vcl_worker_get (wrk_index); - wrk->app_event_queue = uword_to_pointer (mp->app_event_queue_address, - svm_msg_q_t *); if (mp->n_fds) { vec_validate (fds, mp->n_fds); - 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) - if (ssvm_segment_attach ("vpp-worker-seg", SSVM_SEGMENT_MEMFD, - fds[n_fds++])) + if (vcl_segment_attach (vcl_vpp_worker_segment_handle (wrk_index), + "vpp-worker-seg", SSVM_SEGMENT_MEMFD, + fds[n_fds++])) goto failed; if (mp->fd_flags & SESSION_FD_F_MEMFD_SEGMENT) - if (ssvm_segment_attach ((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) { @@ -188,156 +224,62 @@ vl_api_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t * } else { - if (ssvm_segment_attach ((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_application_detach_reply_t_handler (vl_api_application_detach_reply_t * - mp) +vl_api_app_add_cert_key_pair_reply_t_handler ( + vl_api_app_add_cert_key_pair_reply_t *mp) { - if (mp->retval) - clib_warning ("VCL<%d>: detach failed: %U", getpid (), format_api_error, - ntohl (mp->retval)); - - vcm->app_state = STATE_APP_ENABLED; -} - -static void -vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp) -{ - ssvm_segment_type_t seg_type = SSVM_SEGMENT_SHM; - int fd = -1; - - vcm->mounting_segment = 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 (); - if (PREDICT_FALSE (ssvm_segment_attach ((char *) mp->segment_name, - seg_type, fd))) + if (mp->retval) { - clib_warning ("VCL<%d>: svm_fifo_segment_attach ('%s') failed", - getpid (), mp->segment_name); + VDBG (0, "Adding 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); - vcm->mounting_segment = 0; -} - -static void -vl_api_unmap_segment_t_handler (vl_api_unmap_segment_t * mp) -{ - -/* - * XXX Need segment_name to session_id hash, - * XXX - have sessionID by handle hash currently - */ - - VDBG (1, "Unmapped segment '%s'", mp->segment_name); + wrk->bapi_return = clib_net_to_host_u32 (mp->index); + wrk->bapi_app_state = STATE_APP_READY; } static void - vl_api_app_cut_through_registration_add_t_handler - (vl_api_app_cut_through_registration_add_t * mp) +vl_api_app_del_cert_key_pair_reply_t_handler ( + vl_api_app_del_cert_key_pair_reply_t *mp) { - vcl_cut_through_registration_t *ctr; - u32 mqc_index = ~0; - vcl_worker_t *wrk; - int *fds = 0; - - if (mp->n_fds) - { - ASSERT (mp->n_fds == 2); - vec_validate (fds, mp->n_fds); - vl_socket_client_recv_fd_msg (fds, mp->n_fds, 5); - } - - wrk = vcl_worker_get (mp->wrk_index); - ctr = vcl_ct_registration_lock_and_alloc (wrk); - ctr->mq = uword_to_pointer (mp->evt_q_address, svm_msg_q_t *); - ctr->peer_mq = uword_to_pointer (mp->peer_evt_q_address, svm_msg_q_t *); - VDBG (0, "Adding ct registration %u", vcl_ct_registration_index (wrk, ctr)); - - if (mp->n_fds && (mp->fd_flags & SESSION_FD_F_MQ_EVENTFD)) + if (mp->retval) { - svm_msg_q_set_consumer_eventfd (ctr->mq, fds[0]); - svm_msg_q_set_producer_eventfd (ctr->peer_mq, fds[1]); - mqc_index = vcl_mq_epoll_add_evfd (wrk, ctr->mq); - ctr->epoll_evt_conn_index = mqc_index; - vec_free (fds); + VDBG (0, "Deleting cert and key failed: %U", format_api_error, + ntohl (mp->retval)); + return; } - vcl_ct_registration_lookup_add (wrk, mp->evt_q_address, - vcl_ct_registration_index (wrk, ctr)); - vcl_ct_registration_unlock (wrk); -} - -static void -vl_api_bind_sock_reply_t_handler (vl_api_bind_sock_reply_t * mp) -{ - /* Expecting a similar message on mq. So ignore this */ - VDBG (1, "VCL<%d>: bapi msg vpp handle 0x%llx, sid %u: bind retval: %u!", - getpid (), mp->handle, mp->context, mp->retval); } -static void -vl_api_unbind_sock_reply_t_handler (vl_api_unbind_sock_reply_t * mp) -{ - if (mp->retval) - clib_warning ("VCL<%d>: ERROR: sid %u: unbind failed: %U", - getpid (), mp->context, format_api_error, - ntohl (mp->retval)); - - else - VDBG (1, "VCL<%d>: sid %u: unbind succeeded!", getpid (), mp->context); -} +#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_disconnect_session_reply_t_handler (vl_api_disconnect_session_reply_t * - mp) -{ - if (mp->retval) - clib_warning ("VCL<%d>: ERROR: sid %u: disconnect failed: %U", - getpid (), mp->context, format_api_error, - ntohl (mp->retval)); -} - -static void -vl_api_connect_session_reply_t_handler (vl_api_connect_sock_reply_t * mp) -{ - if (mp->retval) - clib_warning ("VCL<%d>: ERROR: sid %u: connect failed: %U", - getpid (), mp->context, format_api_error, - ntohl (mp->retval)); -} - -#define foreach_sock_msg \ -_(SESSION_ENABLE_DISABLE_REPLY, session_enable_disable_reply) \ -_(BIND_SOCK_REPLY, bind_sock_reply) \ -_(UNBIND_SOCK_REPLY, unbind_sock_reply) \ -_(CONNECT_SESSION_REPLY, connect_session_reply) \ -_(DISCONNECT_SESSION_REPLY, disconnect_session_reply) \ -_(APPLICATION_ATTACH_REPLY, application_attach_reply) \ -_(APPLICATION_DETACH_REPLY, application_detach_reply) \ -_(MAP_ANOTHER_SEGMENT, map_another_segment) \ -_(UNMAP_SEGMENT, unmap_segment) \ -_(APP_CUT_THROUGH_REGISTRATION_ADD, app_cut_through_registration_add) \ -_(APP_WORKER_ADD_DEL_REPLY, app_worker_add_del_reply) \ - -void -vppcom_api_hookup (void) +vcl_bapi_hookup (void) { #define _(N, n) \ vl_msg_api_set_handlers(VL_API_##N, #n, \ @@ -353,40 +295,44 @@ 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 = vcm->my_client_index; + bmp->client_index = wrk->api_client_handle; bmp->context = htonl (0xfeedface); bmp->is_enable = is_enable; - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp); + vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & bmp); } void -vppcom_app_send_attach (void) +vcl_bapi_send_attach (void) { - vl_api_application_attach_t *bmp; + vcl_worker_t *wrk = vcl_worker_get_current (); + u8 tls_engine = CRYPTO_ENGINE_OPENSSL; + vl_api_app_attach_t *bmp; u8 nsid_len = vec_len (vcm->cfg.namespace_id); u8 app_is_proxy = (vcm->cfg.app_proxy_transport_tcp || vcm->cfg.app_proxy_transport_udp); + tls_engine = vcm->cfg.tls_engine ? vcm->cfg.tls_engine : tls_engine; + bmp = vl_msg_api_alloc (sizeof (*bmp)); memset (bmp, 0, sizeof (*bmp)); - bmp->_vl_msg_id = ntohs (VL_API_APPLICATION_ATTACH); - bmp->client_index = vcm->my_client_index; + bmp->_vl_msg_id = ntohs (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 | (vcm->cfg.app_scope_local ? APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE : 0) | (vcm->cfg.app_scope_global ? APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE : 0) | (app_is_proxy ? APP_OPTIONS_FLAGS_IS_PROXY : 0) | - APP_OPTIONS_FLAGS_USE_MQ_FOR_CTRL_MSGS | (vcm->cfg.use_mq_eventfd ? APP_OPTIONS_FLAGS_EVT_MQ_USE_EVENTFD : 0); bmp->options[APP_OPTIONS_PROXY_TRANSPORT] = (u64) ((vcm->cfg.app_proxy_transport_tcp ? 1 << TRANSPORT_PROTO_TCP : 0) | @@ -398,143 +344,114 @@ vppcom_app_send_attach (void) bmp->options[APP_OPTIONS_PREALLOC_FIFO_PAIRS] = vcm->cfg.preallocated_fifo_pairs; bmp->options[APP_OPTIONS_EVT_QUEUE_SIZE] = vcm->cfg.event_queue_size; + 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 (vcm->vl_input_queue, (u8 *) & bmp); + 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 = vcm->my_client_index; + bmp->client_index = wrk->api_client_handle; bmp->context = htonl (0xfeedface); - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp); + 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; - u32 wrk_index = wrk->wrk_index; 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 = vcm->my_client_index; - mp->app_api_index = clib_host_to_net_u32 (vcm->my_client_index); - mp->context = wrk_index; + 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; if (!is_add) - mp->wrk_index = clib_host_to_net_u32 (wrk_index); - - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & mp); -} + mp->wrk_index = clib_host_to_net_u32 (wrk->vpp_wrk_index); -void -vppcom_send_connect_sock (vcl_session_t * session) -{ - vl_api_connect_sock_t *cmp; - - cmp = vl_msg_api_alloc (sizeof (*cmp)); - memset (cmp, 0, sizeof (*cmp)); - cmp->_vl_msg_id = ntohs (VL_API_CONNECT_SOCK); - cmp->client_index = vcm->my_client_index; - cmp->context = session->session_index; - cmp->wrk_index = vcl_get_worker_index (); - cmp->is_ip4 = session->transport.is_ip4; - clib_memcpy_fast (cmp->ip, &session->transport.rmt_ip, sizeof (cmp->ip)); - cmp->port = session->transport.rmt_port; - cmp->proto = session->session_type; - clib_memcpy_fast (cmp->options, session->options, sizeof (cmp->options)); - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & cmp); + vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & mp); } -void -vppcom_send_disconnect_session (u64 vpp_handle) +static void +vcl_bapi_send_child_worker_del (vcl_worker_t * child_wrk) { - vl_api_disconnect_session_t *dmp; - - dmp = vl_msg_api_alloc (sizeof (*dmp)); - memset (dmp, 0, sizeof (*dmp)); - dmp->_vl_msg_id = ntohs (VL_API_DISCONNECT_SESSION); - dmp->client_index = vcm->my_client_index; - dmp->handle = vpp_handle; - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & dmp); -} + vcl_worker_t *wrk = vcl_worker_get_current (); + vl_api_app_worker_add_del_t *mp; -/* VPP combines bind and listen as one operation. VCL manages the separation - * of bind and listen locally via vppcom_session_bind() and - * vppcom_session_listen() */ -void -vppcom_send_bind_sock (vcl_session_t * session) -{ - vl_api_bind_sock_t *bmp; + mp = vl_msg_api_alloc (sizeof (*mp)); + memset (mp, 0, sizeof (*mp)); - /* Assumes caller has acquired spinlock: vcm->sessions_lockp */ - bmp = vl_msg_api_alloc (sizeof (*bmp)); - memset (bmp, 0, sizeof (*bmp)); + mp->_vl_msg_id = ntohs (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; + mp->wrk_index = clib_host_to_net_u32 (child_wrk->vpp_wrk_index); - bmp->_vl_msg_id = ntohs (VL_API_BIND_SOCK); - bmp->client_index = vcm->my_client_index; - bmp->context = session->session_index; - bmp->wrk_index = vcl_get_worker_index (); - bmp->is_ip4 = session->transport.is_ip4; - clib_memcpy_fast (bmp->ip, &session->transport.lcl_ip, sizeof (bmp->ip)); - bmp->port = session->transport.lcl_port; - bmp->proto = session->session_type; - clib_memcpy_fast (bmp->options, session->options, sizeof (bmp->options)); - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & bmp); + vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & mp); } -void -vppcom_send_unbind_sock (u64 vpp_handle) +static void +vcl_bapi_send_app_add_cert_key_pair (vppcom_cert_key_pair_t *ckpair) { - vl_api_unbind_sock_t *ump; - - ump = vl_msg_api_alloc (sizeof (*ump)); - memset (ump, 0, sizeof (*ump)); - - ump->_vl_msg_id = ntohs (VL_API_UNBIND_SOCK); - ump->client_index = vcm->my_client_index; - ump->wrk_index = vcl_get_worker_index (); - ump->handle = vpp_handle; - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & ump); + vcl_worker_t *wrk = vcl_worker_get_current (); + u32 cert_len = test_srv_crt_rsa_len; + u32 key_len = test_srv_key_rsa_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 (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, test_srv_crt_rsa, cert_len); + clib_memcpy_fast (bmp->certkey + cert_len, test_srv_key_rsa, key_len); + + vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) &bmp); } -void -vppcom_send_accept_session_reply (u64 handle, u32 context, int retval) +static void +vcl_bapi_send_app_del_cert_key_pair (u32 ckpair_index) { - vl_api_accept_session_reply_t *rmp; - - rmp = vl_msg_api_alloc (sizeof (*rmp)); - memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_ACCEPT_SESSION_REPLY); - rmp->retval = htonl (retval); - rmp->context = context; - rmp->handle = handle; - vl_msg_api_send_shmem (vcm->vl_input_queue, (u8 *) & rmp); + vcl_worker_t *wrk = vcl_worker_get_current (); + 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 (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)); @@ -545,55 +462,293 @@ 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) { - api_main_t *am = &api_main; + 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 (); + + vlibapi_set_main (&wrk->bapi_api_ctx); + vcl_bapi_hookup (); - if (vcl_cfg->vpp_api_socket_name) + 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 */ )) - { - clib_warning ("VCL<%d>: app (%s) socket connect failed!", - getpid (), app_name); - return VPPCOM_ECONNREFUSED; - } + rv = VPPCOM_EINVAL; + goto error; + } - if (vl_socket_client_init_shm (0)) - { - clib_warning ("VCL<%d>: app (%s) init shm failed!", - getpid (), 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; } + + 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) { - if (!vcl_cfg->vpp_api_filename) - vcl_cfg->vpp_api_filename = format (0, "/vpe-api%c", 0); + 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; - VDBG (0, "VCL<%d>: app (%s) connecting to VPP api (%s)...", getpid (), - app_name, vcl_cfg->vpp_api_filename); + 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; - if (vl_client_connect_to_vlib ((char *) vcl_cfg->vpp_api_filename, - app_name, vcm->cfg.vpp_api_q_length) < 0) + while (clib_time_now (&wrk->clib_time) < timeout) + { + 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 (%d)", + vcl_bapi_app_state_str (app_state), app_state); + vcl_evt (VCL_EVT_SESSION_TIMEOUT, vcm, bapi_app_state); + + return VPPCOM_ETIMEDOUT; +} + +static int +vcl_bapi_session_enable (void) +{ + vcl_worker_t *wrk = vcl_worker_get_current (); + int rv; + + 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)) { - clib_warning ("VCL<%d>: app (%s) connect failed!", getpid (), - 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; } - vcm->vl_input_queue = am->shmem_hdr->vl_input_queue; - vcm->my_client_index = (u32) am->my_client_index; - vcm->app_state = STATE_APP_CONN_VPP; + return 0; +} + +int +vcl_bapi_attach (void) +{ + int rv; - VDBG (0, "VCL<%d>: app (%s) is connected to VPP!", getpid (), app_name); + /* API hookup and connect to VPP */ + if ((rv = vcl_bapi_init ())) + return rv; - vcl_evt (VCL_EVT_INIT, vcm); - return VPPCOM_OK; + 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 +vcl_bapi_app_worker_del (vcl_worker_t * wrk) +{ + /* 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); + + /* Disconnect the binary api */ + if (vec_len (vcm->workers) == 1) + vcl_bapi_disconnect_from_vpp (); + else + 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; } /*