X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvcl%2Fvcl_bapi.c;h=af2eb035a6717945fda71d15357a6a1ed1bc28db;hp=b91e928f3e96144851ccb7574671a40ba684b5dc;hb=b4e5e50fe;hpb=64cf459bc9353935a72c3e37892b7b7444029795 diff --git a/src/vcl/vcl_bapi.c b/src/vcl/vcl_bapi.c index b91e928f3e9..af2eb035a67 100644 --- a/src/vcl/vcl_bapi.c +++ b/src/vcl/vcl_bapi.c @@ -61,46 +61,6 @@ static void 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) { @@ -113,8 +73,9 @@ 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) { @@ -148,9 +109,16 @@ 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; + } + if (mp->fd_flags & SESSION_FD_F_MQ_EVENTFD) { @@ -163,8 +131,12 @@ vl_api_app_attach_reply_t_handler (vl_api_app_attach_reply_t * mp) } 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; } @@ -183,10 +155,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; + char *segment_name = 0; if (mp->retval) { @@ -229,9 +202,15 @@ 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; + } if (mp->fd_flags & SESSION_FD_F_MQ_EVENTFD) { @@ -244,8 +223,12 @@ 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; @@ -259,46 +242,6 @@ failed: vec_free (fds); } -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; - u64 segment_handle; - int fd = -1; - - if (mp->fd_flags) - { - vl_socket_client_recv_fd_msg (&fd, 1, 5); - seg_type = SSVM_SEGMENT_MEMFD; - } - - segment_handle = clib_net_to_host_u64 (mp->segment_handle); - if (segment_handle == VCL_INVALID_SEGMENT_HANDLE) - { - clib_warning ("invalid segment handle"); - return; - } - - if (vcl_segment_attach (segment_handle, (char *) mp->segment_name, - seg_type, fd)) - { - clib_warning ("VCL<%d>: svm_fifo_segment_attach ('%s') failed", - getpid (), mp->segment_name); - 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); -} - static void vl_api_application_tls_cert_add_reply_t_handler (vl_api_application_tls_cert_add_reply_t * mp) @@ -322,8 +265,6 @@ _(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) \ void @@ -395,8 +336,7 @@ 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);