X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Fvcl_bapi.c;h=3ccac4740fcbc3987c7c0b93dc42c3244fd9c638;hb=ba65ca496;hp=93ba0ab6c4d182cdf6c1013bd4a52e3dad1040ae;hpb=47c40e2d944c9a29677d0542103207ba8372b66a;p=vpp.git diff --git a/src/vcl/vcl_bapi.c b/src/vcl/vcl_bapi.c index 93ba0ab6c4d..3ccac4740fc 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: @@ -62,9 +62,10 @@ static void } static int -ssvm_segment_attach (char *name, ssvm_segment_type_t type, int fd) +vcl_segment_attach (u64 segment_handle, char *name, ssvm_segment_type_t type, + int fd) { - svm_fifo_segment_create_args_t _a, *a = &_a; + fifo_segment_create_args_t _a, *a = &_a; int rv; memset (a, 0, sizeof (*a)); @@ -74,46 +75,77 @@ ssvm_segment_attach (char *name, ssvm_segment_type_t type, int fd) if (type == SSVM_SEGMENT_MEMFD) a->memfd_fd = fd; - if ((rv = svm_fifo_segment_attach (a))) + 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); +} + static void vl_api_application_attach_reply_t_handler (vl_api_application_attach_reply_t * mp) { vcl_worker_t *wrk = vcl_worker_get (0); + u64 segment_handle; u32 n_fds = 0; int *fds = 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; } wrk->app_event_queue = uword_to_pointer (mp->app_event_queue_address, svm_msg_q_t *); + segment_handle = clib_net_to_host_u64 (mp->segment_handle); + if (segment_handle == VCL_INVALID_SEGMENT_HANDLE) + { + VERR ("invalid segment handle"); + goto failed; + } + if (mp->n_fds) { vec_validate (fds, mp->n_fds); vl_socket_client_recv_fd_msg (fds, mp->n_fds, 5); 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; if (mp->fd_flags & SESSION_FD_F_MEMFD_SEGMENT) - if (ssvm_segment_attach ((char *) mp->segment_name, - SSVM_SEGMENT_MEMFD, fds[n_fds++])) - return; + if (vcl_segment_attach (segment_handle, (char *) mp->segment_name, + SSVM_SEGMENT_MEMFD, fds[n_fds++])) + goto failed; if (mp->fd_flags & SESSION_FD_F_MQ_EVENTFD) { @@ -126,13 +158,17 @@ 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; + if (vcl_segment_attach (segment_handle, (char *) mp->segment_name, + SSVM_SEGMENT_SHM, -1)) + goto failed; } vcm->app_index = clib_net_to_host_u32 (mp->app_index); vcm->app_state = STATE_APP_ATTACHED; + return; + +failed: + vcm->app_state = STATE_APP_FAILED; } static void @@ -140,6 +176,7 @@ vl_api_app_worker_add_del_reply_t_handler (vl_api_app_worker_add_del_reply_t * mp) { int n_fds = 0, *fds = 0; + u64 segment_handle; vcl_worker_t *wrk; u32 wrk_index; @@ -149,29 +186,40 @@ 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 = mp->context; - wrk = vcl_worker_get (wrk_index); - wrk->vpp_wrk_index = clib_net_to_host_u32 (mp->wrk_index); if (!mp->is_add) return; + wrk_index = mp->context; + wrk = vcl_worker_get_if_valid (wrk_index); + if (!wrk) + return; + + 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 *); + segment_handle = clib_net_to_host_u64 (mp->segment_handle); + if (segment_handle == VCL_INVALID_SEGMENT_HANDLE) + { + clib_warning ("invalid segment handle"); + goto failed; + } + if (mp->n_fds) { vec_validate (fds, mp->n_fds); vl_socket_client_recv_fd_msg (fds, mp->n_fds, 5); 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++])) + if (vcl_segment_attach (segment_handle, (char *) mp->segment_name, + SSVM_SEGMENT_MEMFD, fds[n_fds++])) goto failed; if (mp->fd_flags & SESSION_FD_F_MQ_EVENTFD) @@ -185,8 +233,8 @@ 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)) + if (vcl_segment_attach (segment_handle, (char *) mp->segment_name, + SSVM_SEGMENT_SHM, -1)) goto failed; } vcm->app_state = STATE_APP_READY; @@ -212,18 +260,24 @@ 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; - vcm->mounting_segment = 1; - if (mp->fd_flags) { vl_socket_client_recv_fd_msg (&fd, 1, 5); seg_type = SSVM_SEGMENT_MEMFD; } - if (PREDICT_FALSE (ssvm_segment_attach ((char *) mp->segment_name, - seg_type, fd))) + 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); @@ -232,106 +286,88 @@ vl_api_map_another_segment_t_handler (vl_api_map_another_segment_t * mp) 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); + 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_app_cut_through_registration_add_t_handler - (vl_api_app_cut_through_registration_add_t * mp) +vl_api_bind_sock_reply_t_handler (vl_api_bind_sock_reply_t * mp) { - vcl_cut_through_registration_t *ctr; - u32 mqc_index = ~0; - vcl_worker_t *wrk; - int *fds = 0; + /* Expecting a similar message on mq. So ignore this */ + VDBG (0, "bapi bind retval: %u!", mp->retval); +} - 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); - } +static void +vl_api_unbind_sock_reply_t_handler (vl_api_unbind_sock_reply_t * mp) +{ + if (mp->retval) + VDBG (0, "ERROR: sid %u: unbind failed: %U", mp->context, + format_api_error, ntohl (mp->retval)); - 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)); + VDBG (1, "sid %u: unbind succeeded!", mp->context); - if (mp->n_fds && (mp->fd_flags & SESSION_FD_F_MQ_EVENTFD)) - { - 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); - } - 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) +vl_api_disconnect_session_reply_t_handler (vl_api_disconnect_session_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); + if (mp->retval) + VDBG (0, "ERROR: sid %u: disconnect failed: %U", mp->context, + format_api_error, ntohl (mp->retval)); } static void -vl_api_unbind_sock_reply_t_handler (vl_api_unbind_sock_reply_t * mp) +vl_api_connect_sock_reply_t_handler (vl_api_connect_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); + VDBG (0, "ERROR: connect failed: %U", format_api_error, + ntohl (mp->retval)); } static void -vl_api_disconnect_session_reply_t_handler (vl_api_disconnect_session_reply_t * - mp) + vl_api_application_tls_cert_add_reply_t_handler + (vl_api_application_tls_cert_add_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)); + { + clib_warning ("VCL<%d>: add cert failed: %U", getpid (), + format_api_error, ntohl (mp->retval)); + return; + } } static void -vl_api_connect_session_reply_t_handler (vl_api_connect_sock_reply_t * mp) + vl_api_application_tls_key_add_reply_t_handler + (vl_api_application_tls_key_add_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)); + { + clib_warning ("VCL<%d>: add key failed: %U", getpid (), + format_api_error, ntohl (mp->retval)); + return; + } + } #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) \ +_(CONNECT_SOCK_REPLY, connect_sock_reply) \ _(DISCONNECT_SESSION_REPLY, disconnect_session_reply) \ _(APPLICATION_ATTACH_REPLY, application_attach_reply) \ _(APPLICATION_DETACH_REPLY, application_detach_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_CUT_THROUGH_REGISTRATION_ADD, app_cut_through_registration_add) \ _(APP_WORKER_ADD_DEL_REPLY, app_worker_add_del_reply) \ void @@ -386,7 +422,6 @@ vppcom_app_send_attach (void) (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,6 +433,7 @@ 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_OPENSSL; if (nsid_len) { bmp->namespace_id_len = nsid_len; @@ -426,7 +462,6 @@ vcl_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)); @@ -434,10 +469,29 @@ vcl_send_app_worker_add_del (u8 is_add) mp->_vl_msg_id = ntohs (VL_API_APP_WORKER_ADD_DEL); mp->client_index = wrk->my_client_index; mp->app_index = clib_host_to_net_u32 (vcm->app_index); - mp->context = wrk_index; + mp->context = wrk->wrk_index; mp->is_add = is_add; if (!is_add) - mp->wrk_index = clib_host_to_net_u32 (wrk_index); + mp->wrk_index = clib_host_to_net_u32 (wrk->vpp_wrk_index); + + vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & mp); +} + +void +vcl_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; + + 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->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); vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & mp); } @@ -455,10 +509,10 @@ vppcom_send_connect_sock (vcl_session_t * session) cmp->context = session->session_index; cmp->wrk_index = wrk->vpp_wrk_index; cmp->is_ip4 = session->transport.is_ip4; + cmp->transport_opts = session->transport_opts; 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 (wrk->vl_input_queue, (u8 *) & cmp); } @@ -497,14 +551,12 @@ vppcom_send_bind_sock (vcl_session_t * session) 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 (wrk->vl_input_queue, (u8 *) & bmp); } void -vppcom_send_unbind_sock (u64 vpp_handle) +vppcom_send_unbind_sock (vcl_worker_t * wrk, u64 vpp_handle) { - vcl_worker_t *wrk = vcl_worker_get_current (); vl_api_unbind_sock_t *ump; ump = vl_msg_api_alloc (sizeof (*ump)); @@ -514,22 +566,44 @@ vppcom_send_unbind_sock (u64 vpp_handle) ump->client_index = wrk->my_client_index; ump->wrk_index = wrk->vpp_wrk_index; ump->handle = vpp_handle; + ump->context = wrk->wrk_index; vl_msg_api_send_shmem (wrk->vl_input_queue, (u8 *) & ump); } void -vppcom_send_accept_session_reply (u64 handle, u32 context, int retval) +vppcom_send_application_tls_cert_add (vcl_session_t * session, char *cert, + u32 cert_len) { vcl_worker_t *wrk = vcl_worker_get_current (); - 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 (wrk->vl_input_queue, (u8 *) & rmp); + 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); + +} + +void +vppcom_send_application_tls_key_add (vcl_session_t * session, char *key, + u32 key_len) +{ + 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); + } u32 @@ -567,7 +641,7 @@ vppcom_connect_to_vpp (char *app_name) return VPPCOM_ECONNREFUSED; } - if (vl_socket_client_init_shm (0)) + if (vl_socket_client_init_shm (0, 1 /* want_pthread */ )) { VERR ("app (%s) init shm failed!", app_name); return VPPCOM_ECONNREFUSED;