X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_api.c;h=48eb932a2c91319910b6766741292ec2ff9562c0;hb=HEAD;hp=c4be556f63757ba85b55ba971c12f8a078dcb285;hpb=31c9955a4e83578422b3328ef0d7b2b248536644;p=vpp.git diff --git a/src/vnet/session/session_api.c b/src/vnet/session/session_api.c old mode 100755 new mode 100644 index c4be556f637..48eb932a2c9 --- a/src/vnet/session/session_api.c +++ b/src/vnet/session/session_api.c @@ -21,459 +21,129 @@ #include #include #include +#include -#include - -#define vl_typedefs /* define message structures */ -#include -#undef vl_typedefs - -#define vl_endianfun /* define message structures */ -#include -#undef vl_endianfun - -/* instantiate all the print functions we know about */ -#define vl_print(handle, ...) vlib_cli_output (handle, __VA_ARGS__) -#define vl_printfun -#include -#undef vl_printfun +#include +#include +#include +#define REPLY_MSG_ID_BASE session_main.msg_id_base #include -#define foreach_session_api_msg \ -_(MAP_ANOTHER_SEGMENT_REPLY, map_another_segment_reply) \ -_(APPLICATION_ATTACH, application_attach) \ -_(APPLICATION_DETACH, application_detach) \ -_(BIND_URI, bind_uri) \ -_(UNBIND_URI, unbind_uri) \ -_(CONNECT_URI, connect_uri) \ -_(DISCONNECT_SESSION, disconnect_session) \ -_(DISCONNECT_SESSION_REPLY, disconnect_session_reply) \ -_(ACCEPT_SESSION_REPLY, accept_session_reply) \ -_(RESET_SESSION_REPLY, reset_session_reply) \ -_(BIND_SOCK, bind_sock) \ -_(UNBIND_SOCK, unbind_sock) \ -_(CONNECT_SOCK, connect_sock) \ -_(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_WORKER_ADD_DEL, app_worker_add_del) \ - -static int -session_send_fds (vl_api_registration_t * reg, int fds[], int n_fds) -{ - clib_error_t *error; - if (vl_api_registration_file_index (reg) == VL_API_INVALID_FI) - { - clib_warning ("can't send memfd fd"); - return -1; - } - error = vl_api_send_fd_msg (reg, fds, n_fds); - if (error) - { - clib_error_report (error); - return -1; - } - return 0; -} - -static int -send_add_segment_callback (u32 api_client_index, u64 segment_handle) -{ - int fds[SESSION_N_FD_TYPE], n_fds = 0; - vl_api_map_another_segment_t *mp; - svm_fifo_segment_private_t *fs; - vl_api_registration_t *reg; - ssvm_private_t *sp; - u8 fd_flags = 0; - - reg = vl_mem_api_client_index_to_registration (api_client_index); - if (!reg) - { - clib_warning ("no api registration for client: %u", api_client_index); - return -1; - } - - fs = segment_manager_get_segment_w_handle (segment_handle); - sp = &fs->ssvm; - if (ssvm_type (sp) == SSVM_SEGMENT_MEMFD) - { - if (vl_api_registration_file_index (reg) == VL_API_INVALID_FI) - { - clib_warning ("can't send memfd fd"); - return -1; - } - - fd_flags |= SESSION_FD_F_MEMFD_SEGMENT; - fds[n_fds] = sp->fd; - n_fds += 1; - } - - mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp)); - clib_memset (mp, 0, sizeof (*mp)); - mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_MAP_ANOTHER_SEGMENT); - mp->segment_size = sp->ssvm_size; - mp->fd_flags = fd_flags; - mp->segment_handle = clib_host_to_net_u64 (segment_handle); - strncpy ((char *) mp->segment_name, (char *) sp->name, - sizeof (mp->segment_name) - 1); - - vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp); - - if (n_fds) - return session_send_fds (reg, fds, n_fds); - - return 0; -} - -static int -send_del_segment_callback (u32 api_client_index, u64 segment_handle) +static transport_proto_t +api_session_transport_proto_decode (const vl_api_transport_proto_t * api_tp) { - vl_api_unmap_segment_t *mp; - vl_api_registration_t *reg; - - reg = vl_mem_api_client_index_to_registration (api_client_index); - if (!reg) - { - clib_warning ("no registration: %u", api_client_index); - return -1; + switch (*api_tp) + { + case TRANSPORT_PROTO_API_TCP: + return TRANSPORT_PROTO_TCP; + case TRANSPORT_PROTO_API_UDP: + return TRANSPORT_PROTO_UDP; + case TRANSPORT_PROTO_API_TLS: + return TRANSPORT_PROTO_TLS; + case TRANSPORT_PROTO_API_QUIC: + return TRANSPORT_PROTO_QUIC; + default: + return TRANSPORT_PROTO_NONE; } - - mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp)); - clib_memset (mp, 0, sizeof (*mp)); - mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_UNMAP_SEGMENT); - mp->segment_handle = clib_host_to_net_u64 (segment_handle); - vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp); - - return 0; } -static int -send_app_cut_through_registration_add (u32 api_client_index, - u32 wrk_map_index, u64 mq_addr, - u64 peer_mq_addr) +static vl_api_transport_proto_t +api_session_transport_proto_encode (const transport_proto_t tp) { - vl_api_app_cut_through_registration_add_t *mp; - vl_api_registration_t *reg; - svm_msg_q_t *mq, *peer_mq; - int fds[2]; - - reg = vl_mem_api_client_index_to_registration (api_client_index); - if (!reg) - { - clib_warning ("no registration: %u", api_client_index); - return -1; - } - - mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp)); - clib_memset (mp, 0, sizeof (*mp)); - mp->_vl_msg_id = - clib_host_to_net_u16 (VL_API_APP_CUT_THROUGH_REGISTRATION_ADD); - - mp->evt_q_address = mq_addr; - mp->peer_evt_q_address = peer_mq_addr; - mp->wrk_index = wrk_map_index; - - mq = uword_to_pointer (mq_addr, svm_msg_q_t *); - peer_mq = uword_to_pointer (peer_mq_addr, svm_msg_q_t *); - - if (svm_msg_q_get_producer_eventfd (mq) != -1) - { - mp->fd_flags |= SESSION_FD_F_MQ_EVENTFD; - mp->n_fds = 2; - /* app will overwrite exactly the fds we pass here. So - * when we swap mq with peer_mq (accept vs connect) the - * fds will still be valid */ - fds[0] = svm_msg_q_get_consumer_eventfd (mq); - fds[1] = svm_msg_q_get_producer_eventfd (peer_mq); + switch (tp) + { + case TRANSPORT_PROTO_TCP: + return TRANSPORT_PROTO_API_TCP; + case TRANSPORT_PROTO_UDP: + return TRANSPORT_PROTO_API_UDP; + case TRANSPORT_PROTO_TLS: + return TRANSPORT_PROTO_API_TLS; + case TRANSPORT_PROTO_QUIC: + return TRANSPORT_PROTO_API_QUIC; + default: + return TRANSPORT_PROTO_API_NONE; } - - vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp); - - if (mp->n_fds != 0) - session_send_fds (reg, fds, mp->n_fds); - - return 0; } static int -send_session_accept_callback (session_t * s) -{ - app_worker_t *server_wrk = app_worker_get (s->app_wrk_index); - vl_api_accept_session_t *mp; - vl_api_registration_t *reg; - transport_connection_t *tc; - session_t *listener; - svm_msg_q_t *vpp_queue; - application_t *server; - app_listener_t *al; - - server = application_get (server_wrk->app_index); - reg = - vl_mem_api_client_index_to_registration (server_wrk->api_client_index); - if (!reg) - { - clib_warning ("no registration: %u", server_wrk->api_client_index); - return -1; - } - - mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp)); - clib_memset (mp, 0, sizeof (*mp)); - - mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_ACCEPT_SESSION); - mp->context = server_wrk->wrk_index; - mp->server_rx_fifo = pointer_to_uword (s->rx_fifo); - mp->server_tx_fifo = pointer_to_uword (s->tx_fifo); - - if (session_has_transport (s)) - { - listener = listen_session_get (s->listener_index); - al = app_listener_get (server, listener->al_index); - mp->listener_handle = app_listener_handle (al); - if (application_is_proxy (server)) - { - listener = - app_worker_first_listener (server_wrk, session_get_fib_proto (s), - session_get_transport_proto (s)); - if (listener) - mp->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); - tc = transport_get_connection (session_get_transport_proto (s), - s->connection_index, s->thread_index); - mp->port = tc->rmt_port; - mp->is_ip4 = tc->is_ip4; - clib_memcpy_fast (&mp->ip, &tc->rmt_ip, sizeof (tc->rmt_ip)); - } - else - { - ct_connection_t *ct; - ct = (ct_connection_t *) session_get_transport (s); - listener = listen_session_get (s->listener_index); - al = app_listener_get (server, listener->al_index); - mp->listener_handle = app_listener_handle (al); - mp->is_ip4 = session_type_is_ip4 (listener->session_type); - mp->handle = session_handle (s); - mp->port = ct->c_rmt_port; - mp->vpp_event_queue_address = ct->client_evt_q; - mp->server_event_queue_address = ct->server_evt_q; - } - vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp); - - return 0; -} - -static void -send_session_disconnect_callback (session_t * s) -{ - app_worker_t *app_wrk = app_worker_get (s->app_wrk_index); - vl_api_disconnect_session_t *mp; - vl_api_registration_t *reg; - - reg = vl_mem_api_client_index_to_registration (app_wrk->api_client_index); - if (!reg) - { - clib_warning ("no registration: %u", app_wrk->api_client_index); - return; - } - - mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp)); - clib_memset (mp, 0, sizeof (*mp)); - mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_DISCONNECT_SESSION); - mp->handle = session_handle (s); - mp->context = app_wrk->api_client_index; - vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp); -} - -static void -send_session_reset_callback (session_t * s) -{ - app_worker_t *app_wrk = app_worker_get (s->app_wrk_index); - vl_api_registration_t *reg; - vl_api_reset_session_t *mp; - - reg = vl_mem_api_client_index_to_registration (app_wrk->api_client_index); - if (!reg) - { - clib_warning ("no registration: %u", app_wrk->api_client_index); - return; - } - - mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp)); - clib_memset (mp, 0, sizeof (*mp)); - mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_RESET_SESSION); - mp->handle = session_handle (s); - vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp); -} - -int -send_session_connected_callback (u32 app_wrk_index, u32 api_context, - session_t * s, u8 is_fail) +session_send_fds (vl_api_registration_t * reg, int fds[], int n_fds) { - vl_api_connect_session_reply_t *mp; - transport_connection_t *tc; - vl_api_registration_t *reg; - svm_msg_q_t *vpp_queue; - app_worker_t *app_wrk; - - app_wrk = app_worker_get (app_wrk_index); - reg = vl_mem_api_client_index_to_registration (app_wrk->api_client_index); - if (!reg) - { - clib_warning ("no registration: %u", app_wrk->api_client_index); - return -1; - } - - mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp)); - mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_CONNECT_SESSION_REPLY); - mp->context = api_context; - - if (is_fail) - goto done; - - if (session_has_transport (s)) - { - tc = session_get_transport (s); - if (!tc) - { - is_fail = 1; - goto done; - } - - vpp_queue = session_main_get_vpp_event_queue (s->thread_index); - mp->handle = session_handle (s); - mp->vpp_event_queue_address = pointer_to_uword (vpp_queue); - clib_memcpy_fast (mp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip)); - mp->is_ip4 = tc->is_ip4; - mp->lcl_port = tc->lcl_port; - mp->server_rx_fifo = pointer_to_uword (s->rx_fifo); - mp->server_tx_fifo = pointer_to_uword (s->tx_fifo); - } - else + clib_error_t *error; + if (vl_api_registration_file_index (reg) == VL_API_INVALID_FI) + return SESSION_E_BAPI_NO_FD; + error = vl_api_send_fd_msg (reg, fds, n_fds); + if (error) { - ct_connection_t *ct; - ct = (ct_connection_t *) session_get_transport (s); - mp->handle = session_handle (s); - mp->lcl_port = ct->c_lcl_port; - mp->vpp_event_queue_address = ct->server_evt_q; - mp->client_event_queue_address = ct->client_evt_q; - mp->server_rx_fifo = pointer_to_uword (s->tx_fifo); - mp->server_tx_fifo = pointer_to_uword (s->rx_fifo); + clib_error_report (error); + return SESSION_E_BAPI_SEND_FD; } - -done: - mp->retval = is_fail ? - clib_host_to_net_u32 (VNET_API_ERROR_SESSION_CONNECT) : 0; - vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp); return 0; } -static session_cb_vft_t session_cb_vft = { - .session_accept_callback = send_session_accept_callback, - .session_disconnect_callback = send_session_disconnect_callback, - .session_connected_callback = send_session_connected_callback, - .session_reset_callback = send_session_reset_callback, - .add_segment_callback = send_add_segment_callback, - .del_segment_callback = send_del_segment_callback, -}; - -static int -mq_try_lock_and_alloc_msg (svm_msg_q_t * app_mq, svm_msg_q_msg_t * msg) -{ - int rv; - u8 try = 0; - while (try < 100) - { - rv = svm_msg_q_lock_and_alloc_msg_w_ring (app_mq, - SESSION_MQ_CTRL_EVT_RING, - SVM_Q_NOWAIT, msg); - if (!rv) - return 0; - try++; - usleep (1); - } - clib_warning ("failed to alloc msg"); - return -1; -} - static int 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; - transport_connection_t *tc; + session_accepted_msg_t m = { 0 }; + fifo_segment_t *eq_seg; session_t *listener; - session_accepted_msg_t *mp; - session_event_t *evt; application_t *app; - app_listener_t *al; app = application_get (app_wrk->app_index); - app_mq = app_wrk->event_queue; - if (mq_try_lock_and_alloc_msg (app_mq, msg)) - return -1; - 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); + 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 (s->listener_index); - al = app_listener_get (app, listener->al_index); - mp->listener_handle = app_listener_handle (al); + listener = listen_session_get_from_handle (s->listener_handle); + 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); - tc = transport_get_connection (session_get_transport_proto (s), - s->connection_index, s->thread_index); - mp->port = tc->rmt_port; - mp->is_ip4 = tc->is_ip4; - clib_memcpy_fast (&mp->ip, &tc->rmt_ip, sizeof (tc->rmt_ip)); + 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, &m.rmt, 0 /* is_lcl */); + session_get_endpoint (s, &m.lcl, 1 /* is_lcl */); } else { - u8 main_thread = vlib_num_workers ()? 1 : 0; ct_connection_t *ct; ct = (ct_connection_t *) session_get_transport (s); - send_app_cut_through_registration_add (app_wrk->api_client_index, - app_wrk->wrk_map_index, - ct->server_evt_q, - ct->client_evt_q); - - listener = listen_session_get (s->listener_index); - al = app_listener_get (app, listener->al_index); - mp->listener_handle = app_listener_handle (al); - mp->is_ip4 = session_type_is_ip4 (listener->session_type); - mp->handle = session_handle (s); - mp->port = ct->c_rmt_port; - vpp_queue = session_main_get_vpp_event_queue (main_thread); - mp->vpp_event_queue_address = pointer_to_uword (vpp_queue); - mp->client_event_queue_address = ct->client_evt_q; - mp->server_event_queue_address = ct->server_evt_q; - } - svm_msg_q_add_and_unlock (app_mq, msg); + listener = listen_session_get_from_handle (s->listener_handle); + 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.lcl.port = ct->c_lcl_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; + } + + if (application_original_dst_is_enabled (app)) + { + session_get_original_dst (&m.lcl, &m.rmt, + session_get_transport_proto (s), + &m.original_dst_ip4, &m.original_dst_port); + } + + app_wrk_send_ctrl_evt (app_wrk, SESSION_CTRL_EVT_ACCEPTED, &m, sizeof (m)); return 0; } @@ -482,21 +152,12 @@ static inline void mq_send_session_close_evt (app_worker_t * app_wrk, session_handle_t sh, session_evt_type_t evt_type) { - svm_msg_q_msg_t _msg, *msg = &_msg; - session_disconnected_msg_t *mp; - svm_msg_q_t *app_mq; - session_event_t *evt; + session_disconnected_msg_t m = { 0 }; - app_mq = app_wrk->event_queue; - 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 = evt_type; - mp = (session_disconnected_msg_t *) evt->data; - mp->handle = sh; - mp->context = app_wrk->api_client_index; - svm_msg_q_add_and_unlock (app_mq, msg); + m.handle = sh; + m.context = app_wrk->api_client_index; + + app_wrk_send_ctrl_evt (app_wrk, evt_type, &m, sizeof (m)); } static inline void @@ -511,9 +172,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); } @@ -546,87 +207,67 @@ mq_send_session_reset_cb (session_t * s) SESSION_CTRL_EVT_RESET); } -static int +int mq_send_session_connected_cb (u32 app_wrk_index, u32 api_context, - session_t * s, u8 is_fail) + 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; - transport_connection_t *tc; + session_connected_msg_t m = { 0 }; + 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 -1; + m.context = api_context; + m.retval = err; - 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; + if (err) + goto snd_msg; - if (is_fail) - goto done; + app = application_get (app_wrk->app_index); + eq_seg = application_get_rx_mqs_segment (app); if (session_has_transport (s)) { - tc = session_get_transport (s); - if (!tc) - { - is_fail = 1; - goto done; - } + m.handle = session_handle (s); + m.vpp_event_queue_address = + fifo_segment_msg_q_offset (eq_seg, s->thread_index); + + session_get_endpoint (s, &m.lcl, 1 /* is_lcl */); - 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); - clib_memcpy_fast (mp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip)); - mp->is_ip4 = tc->is_ip4; - mp->lcl_port = tc->lcl_port; - 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); + m.mq_index = s->thread_index; } else { - u8 main_thread = vlib_num_workers ()? 1 : 0; ct_connection_t *cct; - session_t *ss; cct = (ct_connection_t *) session_get_transport (s); - send_app_cut_through_registration_add (app_wrk->api_client_index, - app_wrk->wrk_map_index, - cct->client_evt_q, - cct->server_evt_q); - - mp->handle = session_handle (s); - mp->lcl_port = cct->c_lcl_port; - vpp_mq = session_main_get_vpp_event_queue (main_thread); - mp->vpp_event_queue_address = pointer_to_uword (vpp_mq); - mp->client_event_queue_address = cct->client_evt_q; - mp->server_event_queue_address = cct->server_evt_q; - ss = ct_session_get_peer (s); - mp->server_rx_fifo = pointer_to_uword (ss->tx_fifo); - mp->server_tx_fifo = pointer_to_uword (ss->rx_fifo); - mp->segment_handle = session_segment_handle (ss); + 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); + m.mq_index = s->thread_index; + m.ct_rx_fifo = fifo_segment_fifo_offset (cct->client_rx_fifo); + m.ct_tx_fifo = fifo_segment_fifo_offset (cct->client_tx_fifo); + m.ct_segment_handle = cct->segment_handle; } -done: - mp->retval = is_fail ? - clib_host_to_net_u32 (VNET_API_ERROR_SESSION_CONNECT) : 0; + /* Setup client session index in advance, in case data arrives + * before the app processes message and updates it */ + s->rx_fifo->shr->client_session_index = api_context; + s->tx_fifo->shr->client_session_index = api_context; + +snd_msg: + + app_wrk_send_ctrl_evt (app_wrk, SESSION_CTRL_EVT_CONNECTED, &m, sizeof (m)); - svm_msg_q_add_and_unlock (app_mq, msg); return 0; } @@ -634,143 +275,325 @@ static int 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; - transport_connection_t *tc; - session_bound_msg_t *mp; + session_bound_msg_t m = { 0 }; + transport_connection_t *ltc; + 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 -1; - 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); - tc = listen_session_get_transport (ls); - mp->lcl_port = tc->lcl_port; - mp->lcl_is_ip4 = tc->is_ip4; - clib_memcpy_fast (mp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip)); - vpp_evt_q = session_main_get_vpp_event_queue (0); - mp->vpp_evt_q = pointer_to_uword (vpp_evt_q); + ltc = session_get_transport (ls); + m.lcl_port = ltc->lcl_port; + m.lcl_is_ip4 = ltc->is_ip4; + clib_memcpy_fast (m.lcl_ip, <c->lcl_ip, sizeof (m.lcl_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); + m.mq_index = ls->thread_index; - if (session_transport_service_type (ls) == TRANSPORT_SERVICE_CL) + if (transport_connection_is_cless (ltc)) { - mp->rx_fifo = pointer_to_uword (ls->rx_fifo); - mp->tx_fifo = pointer_to_uword (ls->tx_fifo); + session_t *wrk_ls; + m.mq_index = transport_cl_thread (); + m.vpp_evt_q = fifo_segment_msg_q_offset (eq_seg, m.mq_index); + wrk_ls = app_listener_get_wrk_cl_session (al, app_wrk->wrk_map_index); + m.rx_fifo = fifo_segment_fifo_offset (wrk_ls->rx_fifo); + m.tx_fifo = fifo_segment_fifo_offset (wrk_ls->tx_fifo); + m.segment_handle = session_segment_handle (wrk_ls); } -done: - mp->retval = rv; - svm_msg_q_add_and_unlock (app_mq, msg); +snd_msg: + + app_wrk_send_ctrl_evt (app_wrk, SESSION_CTRL_EVT_BOUND, &m, sizeof (m)); + return 0; } -static session_cb_vft_t session_mq_cb_vft = { - .session_accept_callback = mq_send_session_accepted_cb, - .session_disconnect_callback = mq_send_session_disconnected_cb, - .session_connected_callback = mq_send_session_connected_cb, - .session_reset_callback = mq_send_session_reset_cb, - .add_segment_callback = send_add_segment_callback, - .del_segment_callback = send_del_segment_callback, -}; - static void -vl_api_session_enable_disable_t_handler (vl_api_session_enable_disable_t * mp) +mq_send_unlisten_cb (u32 app_wrk_index, session_handle_t sh, u32 context, + int rv) { - vl_api_session_enable_disable_reply_t *rmp; - vlib_main_t *vm = vlib_get_main (); - int rv = 0; + session_unlisten_reply_msg_t m = { 0 }; + app_worker_t *app_wrk; - vnet_session_enable_disable (vm, mp->is_enable); - REPLY_MACRO (VL_API_SESSION_ENABLE_DISABLE_REPLY); + app_wrk = app_worker_get (app_wrk_index); + + m.context = context; + m.handle = sh; + m.retval = rv; + app_wrk_send_ctrl_evt (app_wrk, SESSION_CTRL_EVT_UNLISTEN_REPLY, &m, + sizeof (m)); } static void -vl_api_application_attach_t_handler (vl_api_application_attach_t * mp) +mq_send_session_migrate_cb (session_t * s, session_handle_t new_sh) { - int rv = 0, fds[SESSION_N_FD_TYPE], n_fds = 0; - vl_api_application_attach_reply_t *rmp; - ssvm_private_t *segp, *evt_q_segment; - vnet_app_attach_args_t _a, *a = &_a; + session_migrated_msg_t m = { 0 }; + fifo_segment_t *eq_seg; + app_worker_t *app_wrk; + application_t *app; + u32 thread_index; + + thread_index = session_thread_from_handle (new_sh); + app_wrk = app_worker_get (s->app_wrk_index); + 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; + + app_wrk_send_ctrl_evt (app_wrk, SESSION_CTRL_EVT_MIGRATED, &m, sizeof (m)); +} + +static int +mq_send_add_segment_cb (u32 app_wrk_index, u64 segment_handle) +{ + session_app_add_segment_msg_t m = { 0 }; vl_api_registration_t *reg; + app_worker_t *app_wrk; + fifo_segment_t *fs; + ssvm_private_t *sp; u8 fd_flags = 0; - reg = vl_api_client_index_to_registration (mp->client_index); - if (!reg) - return; + app_wrk = app_worker_get (app_wrk_index); - if (session_main_is_enabled () == 0) + reg = vl_mem_api_client_index_to_registration (app_wrk->api_client_index); + if (!reg) { - rv = VNET_API_ERROR_FEATURE_DISABLED; - goto done; + clib_warning ("no api registration for client: %u", + app_wrk->api_client_index); + return -1; } - STATIC_ASSERT (sizeof (u64) * APP_OPTIONS_N_OPTIONS <= - sizeof (mp->options), - "Out of options, fix api message definition"); + fs = segment_manager_get_segment_w_handle (segment_handle); + sp = &fs->ssvm; + if (ssvm_type (sp) == SSVM_SEGMENT_MEMFD) + { + if (vl_api_registration_file_index (reg) == VL_API_INVALID_FI) + { + clib_warning ("can't send memfd fd"); + return -1; + } - clib_memset (a, 0, sizeof (*a)); - a->api_client_index = mp->client_index; - a->options = mp->options; + fd_flags |= SESSION_FD_F_MEMFD_SEGMENT; + } - if (a->options[APP_OPTIONS_FLAGS] & APP_OPTIONS_FLAGS_USE_MQ_FOR_CTRL_MSGS) - a->session_cb_vft = &session_mq_cb_vft; - else - a->session_cb_vft = &session_cb_vft; + m.segment_size = sp->ssvm_size; + m.fd_flags = fd_flags; + m.segment_handle = segment_handle; + strncpy ((char *) m.segment_name, (char *) sp->name, + sizeof (m.segment_name) - 1); + + app_wrk_send_ctrl_evt_fd (app_wrk, SESSION_CTRL_EVT_APP_ADD_SEGMENT, &m, + sizeof (m), sp->fd); - if (mp->namespace_id_len > 64) + return 0; +} + +static int +mq_send_del_segment_cb (u32 app_wrk_index, u64 segment_handle) +{ + session_app_del_segment_msg_t m = { 0 }; + vl_api_registration_t *reg; + app_worker_t *app_wrk; + + app_wrk = app_worker_get (app_wrk_index); + reg = vl_mem_api_client_index_to_registration (app_wrk->api_client_index); + if (!reg) { - rv = VNET_API_ERROR_INVALID_VALUE; - goto done; + clib_warning ("no registration: %u", app_wrk->api_client_index); + return -1; } - if (mp->namespace_id_len) + m.segment_handle = segment_handle; + + app_wrk_send_ctrl_evt (app_wrk, SESSION_CTRL_EVT_APP_DEL_SEGMENT, &m, + sizeof (m)); + + return 0; +} + +static void +mq_send_session_cleanup_cb (session_t * s, session_cleanup_ntf_t ntf) +{ + session_cleanup_msg_t m = { 0 }; + app_worker_t *app_wrk; + + /* Propagate transport cleanup notifications only if app didn't close */ + if (ntf == SESSION_CLEANUP_TRANSPORT + && s->session_state != SESSION_STATE_TRANSPORT_DELETED) + return; + + app_wrk = app_worker_get_if_valid (s->app_wrk_index); + if (!app_wrk) + return; + + m.handle = session_handle (s); + m.type = ntf; + + app_wrk_send_ctrl_evt (app_wrk, SESSION_CTRL_EVT_CLEANUP, &m, sizeof (m)); +} + +static int +mq_send_io_rx_event (session_t *s) +{ + session_event_t *mq_evt; + svm_msg_q_msg_t mq_msg; + app_worker_t *app_wrk; + svm_msg_q_t *mq; + + if (svm_fifo_has_event (s->rx_fifo)) + return 0; + + app_wrk = app_worker_get (s->app_wrk_index); + mq = app_wrk->event_queue; + + mq_msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); + mq_evt = svm_msg_q_msg_data (mq, &mq_msg); + + mq_evt->event_type = SESSION_IO_EVT_RX; + mq_evt->session_index = s->rx_fifo->shr->client_session_index; + + (void) svm_fifo_set_event (s->rx_fifo); + + svm_msg_q_add_raw (mq, &mq_msg); + + return 0; +} + +static int +mq_send_io_tx_event (session_t *s) +{ + app_worker_t *app_wrk = app_worker_get (s->app_wrk_index); + svm_msg_q_t *mq = app_wrk->event_queue; + session_event_t *mq_evt; + svm_msg_q_msg_t mq_msg; + + mq_msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); + mq_evt = svm_msg_q_msg_data (mq, &mq_msg); + + mq_evt->event_type = SESSION_IO_EVT_TX; + mq_evt->session_index = s->tx_fifo->shr->client_session_index; + + svm_msg_q_add_raw (mq, &mq_msg); + + return 0; +} + +static session_cb_vft_t session_mq_cb_vft = { + .session_accept_callback = mq_send_session_accepted_cb, + .session_disconnect_callback = mq_send_session_disconnected_cb, + .session_connected_callback = mq_send_session_connected_cb, + .session_reset_callback = mq_send_session_reset_cb, + .session_migrate_callback = mq_send_session_migrate_cb, + .session_cleanup_callback = mq_send_session_cleanup_cb, + .session_listened_callback = mq_send_session_bound_cb, + .session_unlistened_callback = mq_send_unlisten_cb, + .add_segment_callback = mq_send_add_segment_cb, + .del_segment_callback = mq_send_del_segment_cb, + .builtin_app_rx_callback = mq_send_io_rx_event, + .builtin_app_tx_callback = mq_send_io_tx_event, +}; + +static void +vl_api_session_enable_disable_t_handler (vl_api_session_enable_disable_t * mp) +{ + vl_api_session_enable_disable_reply_t *rmp; + vlib_main_t *vm = vlib_get_main (); + int rv = 0; + + vnet_session_enable_disable (vm, mp->is_enable); + REPLY_MACRO (VL_API_SESSION_ENABLE_DISABLE_REPLY); +} + +static void +vl_api_session_sapi_enable_disable_t_handler ( + vl_api_session_sapi_enable_disable_t *mp) +{ + vl_api_session_sapi_enable_disable_reply_t *rmp; + int rv = 0; + + rv = appns_sapi_enable_disable (mp->is_enable); + REPLY_MACRO (VL_API_SESSION_SAPI_ENABLE_DISABLE_REPLY); +} + +static void +vl_api_app_attach_t_handler (vl_api_app_attach_t * mp) +{ + 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 *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) { - vec_validate (a->namespace_id, mp->namespace_id_len - 1); - clib_memcpy_fast (a->namespace_id, mp->namespace_id, - mp->namespace_id_len); + rv = VNET_API_ERROR_APP_UNSUPPORTED_CFG; + goto done; } + STATIC_ASSERT (sizeof (u64) * APP_OPTIONS_N_OPTIONS <= + sizeof (mp->options), + "Out of options, fix api message definition"); + + clib_memset (a, 0, sizeof (*a)); + 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))) { - clib_warning ("attach returned: %d", rv); + clib_warning ("attach returned: %U", format_session_error, rv); + rv = VNET_API_ERROR_UNSPECIFIED; vec_free (a->namespace_id); goto done; } 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) { @@ -781,139 +604,143 @@ vl_api_application_attach_t_handler (vl_api_application_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; } -done: + 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; + } + } - /* *INDENT-OFF* */ - REPLY_MACRO2 (VL_API_APPLICATION_ATTACH_REPLY, ({ - if (!rv) - { - segp = a->segment; - rmp->app_index = clib_host_to_net_u32 (a->app_index); - rmp->segment_name_length = 0; - rmp->segment_size = segp->ssvm_size; - if (vec_len (segp->name)) - { - memcpy (rmp->segment_name, segp->name, vec_len (segp->name)); - rmp->segment_name_length = vec_len (segp->name); - } - rmp->app_event_queue_address = pointer_to_uword (a->app_evt_q); - rmp->n_fds = n_fds; - rmp->fd_flags = fd_flags; - rmp->segment_handle = clib_host_to_net_u64 (a->segment_handle); - } - })); - /* *INDENT-ON* */ +done: + REPLY_MACRO3 ( + VL_API_APP_ATTACH_REPLY, + ((!rv) ? vec_len (((fifo_segment_t *) a->segment)->ssvm.name) : 0), ({ + if (!rv) + { + 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 = 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->ssvm.name)) + { + vl_api_vec_to_api_string (segp->ssvm.name, &rmp->segment_name); + } + rmp->segment_size = segp->ssvm.ssvm_size; + rmp->segment_handle = clib_host_to_net_u64 (a->segment_handle); + } + })); if (n_fds) session_send_fds (reg, fds, n_fds); + vec_free (fds); } static void -vl_api_application_detach_t_handler (vl_api_application_detach_t * mp) +vl_api_app_worker_add_del_t_handler (vl_api_app_worker_add_del_t * mp) { - vl_api_application_detach_reply_t *rmp; - int rv = VNET_API_ERROR_INVALID_VALUE_2; - vnet_app_detach_args_t _a, *a = &_a; + int rv = 0, fds[SESSION_N_FD_TYPE], n_fds = 0; + vl_api_app_worker_add_del_reply_t *rmp; + vl_api_registration_t *reg; application_t *app; + u8 fd_flags = 0; - if (session_main_is_enabled () == 0) + if (!session_main_is_enabled () || appns_sapi_enabled ()) { rv = VNET_API_ERROR_FEATURE_DISABLED; goto done; } - app = application_lookup (mp->client_index); - if (app) + reg = vl_api_client_index_to_registration (mp->client_index); + if (!reg) + return; + + app = application_get_if_valid (clib_net_to_host_u32 (mp->app_index)); + if (!app) { - a->app_index = app->app_index; - a->api_client_index = mp->client_index; - rv = vnet_application_detach (a); + rv = VNET_API_ERROR_INVALID_VALUE; + goto done; } -done: - REPLY_MACRO (VL_API_APPLICATION_DETACH_REPLY); -} - -static void -vl_api_bind_uri_t_handler (vl_api_bind_uri_t * mp) -{ - transport_connection_t *tc = 0; - vnet_listen_args_t _a, *a = &_a; - vl_api_bind_uri_reply_t *rmp; - session_t *s; - application_t *app = 0; - svm_msg_q_t *vpp_evt_q; - app_worker_t *app_wrk; - int rv; - - if (session_main_is_enabled () == 0) + vnet_app_worker_add_del_args_t args = { + .app_index = app->app_index, + .wrk_map_index = clib_net_to_host_u32 (mp->wrk_index), + .api_client_index = mp->client_index, + .is_add = mp->is_add + }; + rv = vnet_app_worker_add_del (&args); + if (rv) { - rv = VNET_API_ERROR_FEATURE_DISABLED; + clib_warning ("app worker add/del returned: %U", format_session_error, + rv); + rv = VNET_API_ERROR_UNSPECIFIED; goto done; } - app = application_lookup (mp->client_index); - if (app) + if (!mp->is_add) + goto done; + + /* Send fifo segment fd if needed */ + if (ssvm_type (args.segment) == SSVM_SEGMENT_MEMFD) { - clib_memset (a, 0, sizeof (*a)); - a->uri = (char *) mp->uri; - a->app_index = app->app_index; - rv = vnet_bind_uri (a); + fd_flags |= SESSION_FD_F_MEMFD_SEGMENT; + fds[n_fds] = args.segment->fd; + n_fds += 1; } - else + if (application_segment_manager_properties (app)->use_mq_eventfd) { - rv = VNET_API_ERROR_APPLICATION_NOT_ATTACHED; + fd_flags |= SESSION_FD_F_MQ_EVENTFD; + fds[n_fds] = svm_msg_q_get_eventfd (args.evt_q); + n_fds += 1; } done: + REPLY_MACRO3 ( + VL_API_APP_WORKER_ADD_DEL_REPLY, + ((!rv && mp->is_add) ? vec_len (args.segment->name) : 0), ({ + rmp->is_add = mp->is_add; + rmp->wrk_index = mp->wrk_index; + if (!rv && mp->is_add) + { + rmp->wrk_index = clib_host_to_net_u32 (args.wrk_map_index); + rmp->segment_handle = clib_host_to_net_u64 (args.segment_handle); + 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); + } + } + })); - /* *INDENT-OFF* */ - REPLY_MACRO2 (VL_API_BIND_URI_REPLY, ({ - if (!rv) - { - rmp->handle = a->handle; - if (app && application_has_global_scope (app)) - { - app_listener_t* al = app_listener_get_w_handle(a->handle); - s = app_listener_get_session(al); - tc = listen_session_get_transport (s); - rmp->lcl_is_ip4 = tc->is_ip4; - rmp->lcl_port = tc->lcl_port; - clib_memcpy_fast (rmp->lcl_ip, &tc->lcl_ip, sizeof(tc->lcl_ip)); - if (session_transport_service_type (s) == TRANSPORT_SERVICE_CL) - { - rmp->rx_fifo = pointer_to_uword (s->rx_fifo); - rmp->tx_fifo = pointer_to_uword (s->tx_fifo); - vpp_evt_q = session_main_get_vpp_event_queue (0); - rmp->vpp_evt_q = pointer_to_uword (vpp_evt_q); - } - } - } - })); - /* *INDENT-ON* */ - - /* If app uses mq for control messages, send an mq message as well */ - if (app && application_use_mq_for_ctrl (app)) - { - app_wrk = application_get_worker (app, 0); - mq_send_session_bound_cb (app_wrk->wrk_index, mp->context, a->handle, - rv); - } + if (n_fds) + session_send_fds (reg, fds, n_fds); } static void -vl_api_unbind_uri_t_handler (vl_api_unbind_uri_t * mp) +vl_api_application_detach_t_handler (vl_api_application_detach_t * mp) { - vl_api_unbind_uri_reply_t *rmp; + vl_api_application_detach_reply_t *rmp; + int rv = VNET_API_ERROR_INVALID_VALUE_2; + vnet_app_detach_args_t _a, *a = &_a; application_t *app; - vnet_unlisten_args_t _a, *a = &_a; - int rv; - if (session_main_is_enabled () == 0) + if (!session_main_is_enabled () || appns_sapi_enabled ()) { rv = VNET_API_ERROR_FEATURE_DISABLED; goto done; @@ -922,281 +749,71 @@ vl_api_unbind_uri_t_handler (vl_api_unbind_uri_t * mp) app = application_lookup (mp->client_index); if (app) { - a->uri = (char *) mp->uri; a->app_index = app->app_index; - rv = vnet_unbind_uri (a); - } - else - { - rv = VNET_API_ERROR_APPLICATION_NOT_ATTACHED; + a->api_client_index = mp->client_index; + rv = vnet_application_detach (a); + if (rv) + { + clib_warning ("vnet_application_detach: %U", format_session_error, + rv); + rv = VNET_API_ERROR_UNSPECIFIED; + } } done: - REPLY_MACRO (VL_API_UNBIND_URI_REPLY); + REPLY_MACRO (VL_API_APPLICATION_DETACH_REPLY); } static void -vl_api_connect_uri_t_handler (vl_api_connect_uri_t * mp) +vl_api_app_namespace_add_del_t_handler (vl_api_app_namespace_add_del_t * mp) { - vl_api_connect_session_reply_t *rmp; - vnet_connect_args_t _a, *a = &_a; - application_t *app; + vl_api_app_namespace_add_del_reply_t *rmp; + u32 appns_index = 0; + u8 *ns_id = 0; int rv = 0; - if (session_main_is_enabled () == 0) { rv = VNET_API_ERROR_FEATURE_DISABLED; goto done; } - app = application_lookup (mp->client_index); - if (app) - { - clib_memset (a, 0, sizeof (*a)); - a->uri = (char *) mp->uri; - a->api_context = mp->context; - a->app_index = app->app_index; - if ((rv = vnet_connect_uri (a))) - clib_warning ("connect_uri returned: %d", rv); - } - else + ns_id = vl_api_from_api_to_new_vec (mp, &mp->namespace_id); + + vnet_app_namespace_add_del_args_t args = { + .ns_id = ns_id, + .sock_name = 0, + .secret = clib_net_to_host_u64 (mp->secret), + .sw_if_index = clib_net_to_host_u32 (mp->sw_if_index), + .ip4_fib_id = clib_net_to_host_u32 (mp->ip4_fib_id), + .ip6_fib_id = clib_net_to_host_u32 (mp->ip6_fib_id), + .is_add = 1 + }; + rv = vnet_app_namespace_add_del (&args); + if (!rv) { - rv = VNET_API_ERROR_APPLICATION_NOT_ATTACHED; + appns_index = app_namespace_index_from_id (ns_id); + if (appns_index == APP_NAMESPACE_INVALID_INDEX) + { + clib_warning ("app ns lookup failed"); + rv = VNET_API_ERROR_UNSPECIFIED; + } } - - /* - * Don't reply to stream (tcp) connects. The reply will come once - * the connection is established. In case of the redirects, the reply - * will come from the server app. - */ - if (rv == 0) - return; - -done: - /* *INDENT-OFF* */ - REPLY_MACRO (VL_API_CONNECT_SESSION_REPLY); - /* *INDENT-ON* */ -} - -static void -vl_api_disconnect_session_t_handler (vl_api_disconnect_session_t * mp) -{ - vl_api_disconnect_session_reply_t *rmp; - vnet_disconnect_args_t _a, *a = &_a; - application_t *app; - int rv = 0; - - if (session_main_is_enabled () == 0) - { - rv = VNET_API_ERROR_FEATURE_DISABLED; - goto done; - } - - app = application_lookup (mp->client_index); - if (app) - { - a->handle = mp->handle; - a->app_index = app->app_index; - rv = vnet_disconnect_session (a); - } - else - { - rv = VNET_API_ERROR_APPLICATION_NOT_ATTACHED; - } - -done: - REPLY_MACRO2 (VL_API_DISCONNECT_SESSION_REPLY, rmp->handle = mp->handle); -} - -static void -vl_api_disconnect_session_reply_t_handler (vl_api_disconnect_session_reply_t * - mp) -{ - vnet_disconnect_args_t _a, *a = &_a; - application_t *app; - - /* Client objected to disconnecting the session, log and continue */ - if (mp->retval) - { - clib_warning ("client retval %d", mp->retval); - return; - } - - /* Disconnect has been confirmed. Confirm close to transport */ - app = application_lookup (mp->context); - if (app) - { - a->handle = mp->handle; - a->app_index = app->app_index; - vnet_disconnect_session (a); - } -} - -static void -vl_api_reset_session_reply_t_handler (vl_api_reset_session_reply_t * mp) -{ - vnet_disconnect_args_t _a = { 0 }, *a = &_a; - app_worker_t *app_wrk; - application_t *app; - session_t *s; - u32 index, thread_index; - - app = application_lookup (mp->context); - if (!app) - return; - - session_parse_handle (mp->handle, &index, &thread_index); - s = session_get_if_valid (index, thread_index); - if (!s) - { - clib_warning ("Invalid session!"); - return; - } - - app_wrk = app_worker_get (s->app_wrk_index); - if (app_wrk->app_index != app->app_index) - { - clib_warning ("app %u does not own handle 0x%lx", app->app_index, - mp->handle); - return; - } - - /* Client objected to resetting the session, log and continue */ - if (mp->retval) - { - clib_warning ("client retval %d", mp->retval); - return; - } - - /* This comes as a response to a reset, transport only waiting for - * confirmation to remove connection state, no need to disconnect */ - a->handle = mp->handle; - a->app_index = app->app_index; - vnet_disconnect_session (a); -} - -static void -vl_api_accept_session_reply_t_handler (vl_api_accept_session_reply_t * mp) -{ - vnet_disconnect_args_t _a = { 0 }, *a = &_a; - session_t *s; - - /* Server isn't interested, kill the session */ - if (mp->retval) - { - a->app_index = mp->context; - a->handle = mp->handle; - vnet_disconnect_session (a); - return; - } - - s = session_get_from_handle_if_valid (mp->handle); - if (!s) - { - clib_warning ("session doesn't exist"); - return; - } - if (s->app_wrk_index != mp->context) - { - clib_warning ("app doesn't own session"); - return; - } - s->session_state = SESSION_STATE_READY; - - if (!session_has_transport (s)) - ct_session_connect_notify (s); -} - -static void -vl_api_map_another_segment_reply_t_handler (vl_api_map_another_segment_reply_t - * mp) -{ - clib_warning ("not implemented"); -} - -static void -vl_api_bind_sock_t_handler (vl_api_bind_sock_t * mp) -{ - vnet_listen_args_t _a, *a = &_a; - transport_connection_t *tc = 0; - vl_api_bind_sock_reply_t *rmp; - svm_msg_q_t *vpp_evt_q; - application_t *app = 0; - app_worker_t *app_wrk; - ip46_address_t *ip46; - app_listener_t *al; - session_t *s; - int rv = 0; - - if (session_main_is_enabled () == 0) - { - rv = VNET_API_ERROR_FEATURE_DISABLED; - goto done; - } - - app = application_lookup (mp->client_index); - if (!app) - { - rv = VNET_API_ERROR_APPLICATION_NOT_ATTACHED; - goto done; - } - - ip46 = (ip46_address_t *) mp->ip; - clib_memset (a, 0, sizeof (*a)); - a->sep.is_ip4 = mp->is_ip4; - a->sep.ip = *ip46; - a->sep.port = mp->port; - a->sep.fib_index = mp->vrf; - a->sep.sw_if_index = ENDPOINT_INVALID_INDEX; - a->sep.transport_proto = mp->proto; - a->app_index = app->app_index; - a->wrk_map_index = mp->wrk_index; - - if ((rv = vnet_listen (a))) - clib_warning ("listen returned: %d", rv); + vec_free (ns_id); done: - /* *INDENT-OFF* */ - REPLY_MACRO2 (VL_API_BIND_SOCK_REPLY,({ + REPLY_MACRO2 (VL_API_APP_NAMESPACE_ADD_DEL_REPLY, ({ if (!rv) - { - rmp->handle = a->handle; - rmp->lcl_port = mp->port; - rmp->lcl_is_ip4 = mp->is_ip4; - if (app && application_has_global_scope (app)) - { - al = app_listener_get_w_handle (a->handle); - s = app_listener_get_session (al); - tc = listen_session_get_transport (s); - clib_memcpy_fast (rmp->lcl_ip, &tc->lcl_ip, sizeof (tc->lcl_ip)); - if (session_transport_service_type (s) == TRANSPORT_SERVICE_CL) - { - rmp->rx_fifo = pointer_to_uword (s->rx_fifo); - rmp->tx_fifo = pointer_to_uword (s->tx_fifo); - vpp_evt_q = session_main_get_vpp_event_queue (0); - rmp->vpp_evt_q = pointer_to_uword (vpp_evt_q); - } - } - } + rmp->appns_index = clib_host_to_net_u32 (appns_index); })); - /* *INDENT-ON* */ - - /* If app uses mq for control messages, send an mq message as well */ - if (app && application_use_mq_for_ctrl (app)) - { - app_wrk = application_get_worker (app, mp->wrk_index); - mq_send_session_bound_cb (app_wrk->wrk_index, mp->context, a->handle, - rv); - } } static void -vl_api_unbind_sock_t_handler (vl_api_unbind_sock_t * mp) +vl_api_app_namespace_add_del_v2_t_handler ( + vl_api_app_namespace_add_del_v2_t *mp) { - vl_api_unbind_sock_reply_t *rmp; - vnet_unlisten_args_t _a, *a = &_a; - app_worker_t *app_wrk; - application_t *app = 0; + vl_api_app_namespace_add_del_v2_reply_t *rmp; + u8 *ns_id = 0; + u32 appns_index = 0; int rv = 0; if (session_main_is_enabled () == 0) @@ -1205,239 +822,136 @@ vl_api_unbind_sock_t_handler (vl_api_unbind_sock_t * mp) goto done; } - app = application_lookup (mp->client_index); - if (app) - { - a->app_index = app->app_index; - a->handle = mp->handle; - a->wrk_map_index = mp->wrk_index; - if ((rv = vnet_unlisten (a))) - clib_warning ("unlisten returned: %d", rv); - } - -done: - REPLY_MACRO (VL_API_UNBIND_SOCK_REPLY); - - /* - * Send reply over msg queue - */ - svm_msg_q_msg_t _msg, *msg = &_msg; - session_unlisten_reply_msg_t *ump; - svm_msg_q_t *app_mq; - session_event_t *evt; - - if (!app) - return; - - app_wrk = application_get_worker (app, a->wrk_map_index); - if (!app_wrk) - return; - - app_mq = app_wrk->event_queue; - 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_UNLISTEN_REPLY; - ump = (session_unlisten_reply_msg_t *) evt->data; - ump->context = mp->context; - ump->handle = mp->handle; - ump->retval = rv; - svm_msg_q_add_and_unlock (app_mq, msg); -} - -static void -vl_api_connect_sock_t_handler (vl_api_connect_sock_t * mp) -{ - vl_api_connect_session_reply_t *rmp; - vnet_connect_args_t _a, *a = &_a; - application_t *app = 0; - int rv = 0; - - if (session_main_is_enabled () == 0) - { - rv = VNET_API_ERROR_FEATURE_DISABLED; - goto done; - } + mp->namespace_id[sizeof (mp->namespace_id) - 1] = 0; + ns_id = format (0, "%s", &mp->namespace_id); - app = application_lookup (mp->client_index); - if (app) + vnet_app_namespace_add_del_args_t args = { + .ns_id = ns_id, + .sock_name = 0, + .secret = clib_net_to_host_u64 (mp->secret), + .sw_if_index = clib_net_to_host_u32 (mp->sw_if_index), + .ip4_fib_id = clib_net_to_host_u32 (mp->ip4_fib_id), + .ip6_fib_id = clib_net_to_host_u32 (mp->ip6_fib_id), + .is_add = 1 + }; + rv = vnet_app_namespace_add_del (&args); + if (!rv) { - svm_queue_t *client_q; - ip46_address_t *ip46 = (ip46_address_t *) mp->ip; - - clib_memset (a, 0, sizeof (*a)); - client_q = vl_api_client_index_to_input_queue (mp->client_index); - mp->client_queue_address = pointer_to_uword (client_q); - a->sep.is_ip4 = mp->is_ip4; - a->sep.ip = *ip46; - a->sep.port = mp->port; - a->sep.transport_proto = mp->proto; - a->sep.peer.fib_index = mp->vrf; - a->sep.peer.sw_if_index = ENDPOINT_INVALID_INDEX; - if (mp->hostname_len) + appns_index = app_namespace_index_from_id (ns_id); + if (appns_index == APP_NAMESPACE_INVALID_INDEX) { - vec_validate (a->sep_ext.hostname, mp->hostname_len - 1); - clib_memcpy_fast (a->sep_ext.hostname, mp->hostname, - mp->hostname_len); + clib_warning ("app ns lookup failed id:%s", ns_id); + rv = VNET_API_ERROR_UNSPECIFIED; } - a->api_context = mp->context; - a->app_index = app->app_index; - a->wrk_map_index = mp->wrk_index; - if ((rv = vnet_connect (a))) - clib_warning ("connect returned: %u", rv); - vec_free (a->sep_ext.hostname); - } - else - { - rv = VNET_API_ERROR_APPLICATION_NOT_ATTACHED; } - - if (rv == 0) - return; - - /* Got some error, relay it */ + vec_free (ns_id); done: - REPLY_MACRO (VL_API_CONNECT_SESSION_REPLY); - - if (app && application_use_mq_for_ctrl (app)) - { - app_worker_t *app_wrk = application_get_worker (app, mp->wrk_index); - mq_send_session_connected_cb (app_wrk->wrk_index, mp->context, 0, 1); - } + REPLY_MACRO2 (VL_API_APP_NAMESPACE_ADD_DEL_V2_REPLY, ({ + if (!rv) + rmp->appns_index = clib_host_to_net_u32 (appns_index); + })); } static void -vl_api_app_worker_add_del_t_handler (vl_api_app_worker_add_del_t * mp) +vl_api_app_namespace_add_del_v4_t_handler ( + vl_api_app_namespace_add_del_v4_t *mp) { - int rv = 0, fds[SESSION_N_FD_TYPE], n_fds = 0; - vl_api_app_worker_add_del_reply_t *rmp; - vl_api_registration_t *reg; - application_t *app; - u8 fd_flags = 0; - - if (!session_main_is_enabled ()) + vl_api_app_namespace_add_del_v4_reply_t *rmp; + u8 *ns_id = 0, *sock_name = 0; + u32 appns_index = 0; + int rv = 0; + if (session_main_is_enabled () == 0) { rv = VNET_API_ERROR_FEATURE_DISABLED; goto done; } - - reg = vl_api_client_index_to_registration (mp->client_index); - if (!reg) - return; - - app = application_get_if_valid (clib_net_to_host_u32 (mp->app_index)); - if (!app) - { - rv = VNET_API_ERROR_INVALID_VALUE; - goto done; - } - - vnet_app_worker_add_del_args_t args = { - .app_index = app->app_index, - .wrk_map_index = clib_net_to_host_u32 (mp->wrk_index), - .api_client_index = mp->client_index, - .is_add = mp->is_add + mp->namespace_id[sizeof (mp->namespace_id) - 1] = 0; + ns_id = format (0, "%s", &mp->namespace_id); + sock_name = vl_api_from_api_to_new_vec (mp, &mp->sock_name); + vnet_app_namespace_add_del_args_t args = { + .ns_id = ns_id, + .sock_name = sock_name, + .secret = clib_net_to_host_u64 (mp->secret), + .sw_if_index = clib_net_to_host_u32 (mp->sw_if_index), + .ip4_fib_id = clib_net_to_host_u32 (mp->ip4_fib_id), + .ip6_fib_id = clib_net_to_host_u32 (mp->ip6_fib_id), + .is_add = mp->is_add, }; - rv = vnet_app_worker_add_del (&args); - if (rv) - { - clib_warning ("app worker add/del returned: %d", rv); - goto done; - } - - if (!mp->is_add) - goto done; - - /* Send fifo segment fd if needed */ - if (ssvm_type (args.segment) == SSVM_SEGMENT_MEMFD) - { - fd_flags |= SESSION_FD_F_MEMFD_SEGMENT; - fds[n_fds] = args.segment->fd; - n_fds += 1; - } - if (application_segment_manager_properties (app)->use_mq_eventfd) + rv = vnet_app_namespace_add_del (&args); + if (!rv && mp->is_add) { - fd_flags |= SESSION_FD_F_MQ_EVENTFD; - fds[n_fds] = svm_msg_q_get_producer_eventfd (args.evt_q); - n_fds += 1; + appns_index = app_namespace_index_from_id (ns_id); + if (appns_index == APP_NAMESPACE_INVALID_INDEX) + { + clib_warning ("app ns lookup failed id:%s", ns_id); + rv = VNET_API_ERROR_UNSPECIFIED; + } } - - /* *INDENT-OFF* */ + vec_free (ns_id); + vec_free (sock_name); done: - REPLY_MACRO2 (VL_API_APP_WORKER_ADD_DEL_REPLY, ({ - rmp->is_add = mp->is_add; - rmp->wrk_index = clib_host_to_net_u32 (args.wrk_map_index); - rmp->segment_handle = clib_host_to_net_u64 (args.segment_handle); - if (!rv && mp->is_add) - { - if (vec_len (args.segment->name)) - { - memcpy (rmp->segment_name, args.segment->name, - vec_len (args.segment->name)); - rmp->segment_name_length = vec_len (args.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* */ - - if (n_fds) - session_send_fds (reg, fds, n_fds); + REPLY_MACRO2 (VL_API_APP_NAMESPACE_ADD_DEL_V4_REPLY, ({ + if (!rv) + rmp->appns_index = clib_host_to_net_u32 (appns_index); + })); } static void -vl_api_app_namespace_add_del_t_handler (vl_api_app_namespace_add_del_t * mp) +vl_api_app_namespace_add_del_v3_t_handler ( + vl_api_app_namespace_add_del_v3_t *mp) { - vl_api_app_namespace_add_del_reply_t *rmp; + vl_api_app_namespace_add_del_v3_reply_t *rmp; + u8 *ns_id = 0, *sock_name = 0, *api_sock_name = 0; u32 appns_index = 0; - u8 *ns_id = 0; int rv = 0; - if (!session_main_is_enabled ()) + if (session_main_is_enabled () == 0) { rv = VNET_API_ERROR_FEATURE_DISABLED; goto done; } - - if (mp->namespace_id_len > ARRAY_LEN (mp->namespace_id)) + mp->namespace_id[sizeof (mp->namespace_id) - 1] = 0; + ns_id = format (0, "%s", &mp->namespace_id); + api_sock_name = vl_api_from_api_to_new_vec (mp, &mp->sock_name); + mp->netns[sizeof (mp->netns) - 1] = 0; + if (strlen ((char *) mp->netns) != 0) { - rv = VNET_API_ERROR_INVALID_VALUE; - goto done; + sock_name = + format (0, "abstract:%v,netns_name=%s", api_sock_name, &mp->netns); + } + else + { + sock_name = api_sock_name; + api_sock_name = 0; // for vec_free } - vec_validate (ns_id, mp->namespace_id_len - 1); - clib_memcpy_fast (ns_id, mp->namespace_id, mp->namespace_id_len); vnet_app_namespace_add_del_args_t args = { .ns_id = ns_id, + .sock_name = sock_name, .secret = clib_net_to_host_u64 (mp->secret), .sw_if_index = clib_net_to_host_u32 (mp->sw_if_index), .ip4_fib_id = clib_net_to_host_u32 (mp->ip4_fib_id), .ip6_fib_id = clib_net_to_host_u32 (mp->ip6_fib_id), - .is_add = 1 + .is_add = mp->is_add, }; rv = vnet_app_namespace_add_del (&args); - if (!rv) + if (!rv && mp->is_add) { appns_index = app_namespace_index_from_id (ns_id); if (appns_index == APP_NAMESPACE_INVALID_INDEX) { - clib_warning ("app ns lookup failed"); + clib_warning ("app ns lookup failed id:%s", ns_id); rv = VNET_API_ERROR_UNSPECIFIED; } } vec_free (ns_id); - - /* *INDENT-OFF* */ + vec_free (sock_name); + vec_free (api_sock_name); done: - REPLY_MACRO2 (VL_API_APP_NAMESPACE_ADD_DEL_REPLY, ({ - if (!rv) - rmp->appns_index = clib_host_to_net_u32 (appns_index); - })); - /* *INDENT-ON* */ + REPLY_MACRO2 (VL_API_APP_NAMESPACE_ADD_DEL_V3_REPLY, ({ + if (!rv) + rmp->appns_index = clib_host_to_net_u32 (appns_index); + })); } static void @@ -1446,16 +960,13 @@ vl_api_session_rule_add_del_t_handler (vl_api_session_rule_add_del_t * mp) vl_api_session_rule_add_del_reply_t *rmp; session_rule_add_del_args_t args; session_rule_table_add_del_args_t *table_args = &args.table_args; - u8 fib_proto; int rv = 0; clib_memset (&args, 0, sizeof (args)); - fib_proto = mp->is_ip4 ? FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6; - table_args->lcl.fp_len = mp->lcl_plen; - table_args->lcl.fp_proto = fib_proto; - table_args->rmt.fp_len = mp->rmt_plen; - table_args->rmt.fp_proto = fib_proto; + ip_prefix_decode (&mp->lcl, &table_args->lcl); + ip_prefix_decode (&mp->rmt, &table_args->rmt); + table_args->lcl_port = mp->lcl_port; table_args->rmt_port = mp->rmt_port; table_args->action_index = clib_net_to_host_u32 (mp->action_index); @@ -1464,15 +975,16 @@ vl_api_session_rule_add_del_t_handler (vl_api_session_rule_add_del_t * mp) table_args->tag = format (0, "%s", mp->tag); args.appns_index = clib_net_to_host_u32 (mp->appns_index); args.scope = mp->scope; - args.transport_proto = mp->transport_proto; + args.transport_proto = + api_session_transport_proto_decode (&mp->transport_proto) == + TRANSPORT_PROTO_UDP ? 1 : 0; - clib_memset (&table_args->lcl.fp_addr, 0, sizeof (table_args->lcl.fp_addr)); - clib_memset (&table_args->rmt.fp_addr, 0, sizeof (table_args->rmt.fp_addr)); - ip_set (&table_args->lcl.fp_addr, mp->lcl_ip, mp->is_ip4); - ip_set (&table_args->rmt.fp_addr, mp->rmt_ip, mp->is_ip4); rv = vnet_session_rule_add_del (&args); if (rv) - clib_warning ("rule add del returned: %d", rv); + { + clib_warning ("rule add del returned: %U", format_session_error, rv); + rv = VNET_API_ERROR_UNSPECIFIED; + } vec_free (table_args->tag); REPLY_MACRO (VL_API_SESSION_RULE_ADD_DEL_REPLY); } @@ -1487,23 +999,28 @@ send_session_rule_details4 (mma_rule_16_t * rule, u8 is_local, (session_mask_or_match_4_t *) & rule->match; session_mask_or_match_4_t *mask = (session_mask_or_match_4_t *) & rule->mask; + fib_prefix_t lcl, rmt; rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_SESSION_RULES_DETAILS); + rmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_SESSION_RULES_DETAILS); rmp->context = context; - rmp->is_ip4 = 1; - clib_memcpy_fast (rmp->lcl_ip, &match->lcl_ip, sizeof (match->lcl_ip)); - clib_memcpy_fast (rmp->rmt_ip, &match->rmt_ip, sizeof (match->rmt_ip)); - rmp->lcl_plen = ip4_mask_to_preflen (&mask->lcl_ip); - rmp->rmt_plen = ip4_mask_to_preflen (&mask->rmt_ip); + clib_memset (&lcl, 0, sizeof (lcl)); + clib_memset (&rmt, 0, sizeof (rmt)); + ip_set (&lcl.fp_addr, &match->lcl_ip, 1); + ip_set (&rmt.fp_addr, &match->rmt_ip, 1); + lcl.fp_len = ip4_mask_to_preflen (&mask->lcl_ip); + rmt.fp_len = ip4_mask_to_preflen (&mask->rmt_ip); + + ip_prefix_encode (&lcl, &rmp->lcl); + ip_prefix_encode (&rmt, &rmp->rmt); rmp->lcl_port = match->lcl_port; rmp->rmt_port = match->rmt_port; rmp->action_index = clib_host_to_net_u32 (rule->action_index); rmp->scope = - is_local ? SESSION_RULE_SCOPE_LOCAL : SESSION_RULE_SCOPE_GLOBAL; - rmp->transport_proto = transport_proto; + is_local ? SESSION_RULE_SCOPE_API_LOCAL : SESSION_RULE_SCOPE_API_GLOBAL; + rmp->transport_proto = api_session_transport_proto_encode (transport_proto); rmp->appns_index = clib_host_to_net_u32 (appns_index); if (tag) { @@ -1524,23 +1041,28 @@ send_session_rule_details6 (mma_rule_40_t * rule, u8 is_local, (session_mask_or_match_6_t *) & rule->match; session_mask_or_match_6_t *mask = (session_mask_or_match_6_t *) & rule->mask; + fib_prefix_t lcl, rmt; rmp = vl_msg_api_alloc (sizeof (*rmp)); clib_memset (rmp, 0, sizeof (*rmp)); - rmp->_vl_msg_id = ntohs (VL_API_SESSION_RULES_DETAILS); + rmp->_vl_msg_id = ntohs (REPLY_MSG_ID_BASE + VL_API_SESSION_RULES_DETAILS); rmp->context = context; - rmp->is_ip4 = 0; - clib_memcpy_fast (rmp->lcl_ip, &match->lcl_ip, sizeof (match->lcl_ip)); - clib_memcpy_fast (rmp->rmt_ip, &match->rmt_ip, sizeof (match->rmt_ip)); - rmp->lcl_plen = ip6_mask_to_preflen (&mask->lcl_ip); - rmp->rmt_plen = ip6_mask_to_preflen (&mask->rmt_ip); + clib_memset (&lcl, 0, sizeof (lcl)); + clib_memset (&rmt, 0, sizeof (rmt)); + ip_set (&lcl.fp_addr, &match->lcl_ip, 0); + ip_set (&rmt.fp_addr, &match->rmt_ip, 0); + lcl.fp_len = ip6_mask_to_preflen (&mask->lcl_ip); + rmt.fp_len = ip6_mask_to_preflen (&mask->rmt_ip); + + ip_prefix_encode (&lcl, &rmp->lcl); + ip_prefix_encode (&rmt, &rmp->rmt); rmp->lcl_port = match->lcl_port; rmp->rmt_port = match->rmt_port; rmp->action_index = clib_host_to_net_u32 (rule->action_index); rmp->scope = - is_local ? SESSION_RULE_SCOPE_LOCAL : SESSION_RULE_SCOPE_GLOBAL; - rmp->transport_proto = transport_proto; + is_local ? SESSION_RULE_SCOPE_API_LOCAL : SESSION_RULE_SCOPE_API_GLOBAL; + rmp->transport_proto = api_session_transport_proto_encode (transport_proto); rmp->appns_index = clib_host_to_net_u32 (appns_index); if (tag) { @@ -1565,33 +1087,29 @@ send_session_rules_table_details (session_rules_table_t * srt, u8 fib_proto, if (is_local || fib_proto == FIB_PROTOCOL_IP4) { 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) { 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; @@ -1601,9 +1119,8 @@ vl_api_session_rules_dump_t_handler (vl_api_one_map_server_dump_t * mp) if (!reg) return; - /* *INDENT-OFF* */ session_table_foreach (st, ({ - for (tp = 0; tp < TRANSPORT_N_PROTO; tp++) + for (tp = 0; tp < TRANSPORT_N_PROTOS; tp++) { send_session_rules_table_details (&st->session_rules[tp], st->active_fib_proto, tp, @@ -1611,87 +1128,78 @@ vl_api_session_rules_dump_t_handler (vl_api_one_map_server_dump_t * mp) mp->context); } })); - /* *INDENT-ON* */ } static void -vl_api_application_tls_cert_add_t_handler (vl_api_application_tls_cert_add_t * - mp) +vl_api_app_add_cert_key_pair_t_handler (vl_api_app_add_cert_key_pair_t * mp) { - vl_api_app_namespace_add_del_reply_t *rmp; - vnet_app_add_tls_cert_args_t _a, *a = &_a; - clib_error_t *error; - application_t *app; - u32 cert_len; + vl_api_app_add_cert_key_pair_reply_t *rmp; + vnet_app_add_cert_key_pair_args_t _a, *a = &_a; + u32 certkey_len, key_len, cert_len; int rv = 0; - if (!session_main_is_enabled ()) + if (session_main_is_enabled () == 0) { rv = VNET_API_ERROR_FEATURE_DISABLED; goto done; } - if (!(app = application_lookup (mp->client_index))) + + cert_len = clib_net_to_host_u16 (mp->cert_len); + if (cert_len > 10000) { - rv = VNET_API_ERROR_APPLICATION_NOT_ATTACHED; + rv = VNET_API_ERROR_INVALID_VALUE; goto done; } - clib_memset (a, 0, sizeof (*a)); - a->app_index = app->app_index; - cert_len = clib_net_to_host_u16 (mp->cert_len); - if (cert_len > 10000) + + certkey_len = clib_net_to_host_u16 (mp->certkey_len); + if (certkey_len < cert_len) { rv = VNET_API_ERROR_INVALID_VALUE; goto done; } - vec_validate (a->cert, cert_len); - clib_memcpy_fast (a->cert, mp->cert, cert_len); - if ((error = vnet_app_add_tls_cert (a))) + + key_len = certkey_len - cert_len; + if (key_len > 10000) { - rv = clib_error_get_code (error); - clib_error_report (error); + rv = VNET_API_ERROR_INVALID_VALUE; + goto done; } - vec_free (a->cert); + + clib_memset (a, 0, sizeof (*a)); + 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); + done: - REPLY_MACRO (VL_API_APPLICATION_TLS_CERT_ADD_REPLY); + REPLY_MACRO2 (VL_API_APP_ADD_CERT_KEY_PAIR_REPLY, ({ + if (!rv) + rmp->index = clib_host_to_net_u32 (a->index); + })); } static void -vl_api_application_tls_key_add_t_handler (vl_api_application_tls_key_add_t * - mp) +vl_api_app_del_cert_key_pair_t_handler (vl_api_app_del_cert_key_pair_t * mp) { - vl_api_app_namespace_add_del_reply_t *rmp; - vnet_app_add_tls_key_args_t _a, *a = &_a; - clib_error_t *error; - application_t *app; - u32 key_len; + vl_api_app_del_cert_key_pair_reply_t *rmp; + u32 ckpair_index; int rv = 0; - if (!session_main_is_enabled ()) + 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; - } - clib_memset (a, 0, sizeof (*a)); - a->app_index = app->app_index; - key_len = clib_net_to_host_u16 (mp->key_len); - if (key_len > 10000) + ckpair_index = clib_net_to_host_u32 (mp->index); + rv = vnet_app_del_cert_key_pair (ckpair_index); + if (rv) { - rv = VNET_API_ERROR_INVALID_VALUE; - goto done; + clib_warning ("vnet_app_del_cert_key_pair: %U", format_session_error, + rv); + rv = VNET_API_ERROR_UNSPECIFIED; } - vec_validate (a->key, key_len); - clib_memcpy_fast (a->key, mp->key, key_len); - if ((error = vnet_app_add_tls_key (a))) - { - rv = clib_error_get_code (error); - clib_error_report (error); - } - vec_free (a->key); + done: - REPLY_MACRO (VL_API_APPLICATION_TLS_KEY_ADD_REPLY); + REPLY_MACRO (VL_API_APP_DEL_CERT_KEY_PAIR_REPLY); } static clib_error_t * @@ -1710,54 +1218,617 @@ application_reaper_cb (u32 client_index) VL_MSG_API_REAPER_FUNCTION (application_reaper_cb); -#define vl_msg_name_crc_list -#include -#undef vl_msg_name_crc_list +/* + * Socket api functions + */ + +static int +mq_send_add_segment_sapi_cb (u32 app_wrk_index, u64 segment_handle) +{ + session_app_add_segment_msg_t m = { 0 }; + app_worker_t *app_wrk; + fifo_segment_t *fs; + ssvm_private_t *sp; + u8 fd_flags = 0; + + app_wrk = app_worker_get (app_wrk_index); + + fs = segment_manager_get_segment_w_handle (segment_handle); + sp = &fs->ssvm; + ASSERT (ssvm_type (sp) == SSVM_SEGMENT_MEMFD); + + fd_flags |= SESSION_FD_F_MEMFD_SEGMENT; + + m.segment_size = sp->ssvm_size; + m.fd_flags = fd_flags; + m.segment_handle = segment_handle; + strncpy ((char *) m.segment_name, (char *) sp->name, + sizeof (m.segment_name) - 1); + + app_wrk_send_ctrl_evt_fd (app_wrk, SESSION_CTRL_EVT_APP_ADD_SEGMENT, &m, + sizeof (m), sp->fd); + + return 0; +} + +static int +mq_send_del_segment_sapi_cb (u32 app_wrk_index, u64 segment_handle) +{ + session_app_del_segment_msg_t m = { 0 }; + app_worker_t *app_wrk; + + app_wrk = app_worker_get (app_wrk_index); + + m.segment_handle = segment_handle; + + app_wrk_send_ctrl_evt (app_wrk, SESSION_CTRL_EVT_APP_DEL_SEGMENT, &m, + sizeof (m)); + + return 0; +} + +static session_cb_vft_t session_mq_sapi_cb_vft = { + .session_accept_callback = mq_send_session_accepted_cb, + .session_disconnect_callback = mq_send_session_disconnected_cb, + .session_connected_callback = mq_send_session_connected_cb, + .session_reset_callback = mq_send_session_reset_cb, + .session_migrate_callback = mq_send_session_migrate_cb, + .session_cleanup_callback = mq_send_session_cleanup_cb, + .session_listened_callback = mq_send_session_bound_cb, + .session_unlistened_callback = mq_send_unlisten_cb, + .add_segment_callback = mq_send_add_segment_sapi_cb, + .del_segment_callback = mq_send_del_segment_sapi_cb, + .builtin_app_rx_callback = mq_send_io_rx_event, + .builtin_app_tx_callback = mq_send_io_tx_event, +}; static void -setup_message_id_table (api_main_t * am) +session_api_attach_handler (app_namespace_t * app_ns, clib_socket_t * cs, + app_sapi_attach_msg_t * mp) { -#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id); - foreach_vl_msg_name_crc_session; -#undef _ + 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; + 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; + application_t *app; + svm_msg_q_t *rx_mq; + + /* Make sure name is null terminated */ + mp->name[63] = 0; + + clib_memset (a, 0, sizeof (*a)); + a->api_client_index = appns_sapi_socket_handle (app_ns, cs); + a->name = format (0, "%s", (char *) mp->name); + a->options = mp->options; + a->session_cb_vft = &session_mq_sapi_cb_vft; + a->use_sock_api = 1; + a->options[APP_OPTIONS_NAMESPACE] = app_namespace_index (app_ns); + + if ((rv = vnet_application_attach (a))) + { + clib_warning ("attach returned: %d", rv); + goto done; + } + + n_workers = vlib_num_workers (); + vec_validate (fds, 3 /* segs + tx evtfd */ + n_workers); + + /* Send event queues 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) + { + fd_flags |= SESSION_FD_F_MEMFD_SEGMENT; + fds[n_fds] = a->segment->fd; + n_fds += 1; + } + 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_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; + rmp = &msg.attach_reply; + rmp->retval = rv; + if (!rv) + { + ctrl_thread = n_workers ? 1 : 0; + rmp->app_index = a->app_index; + 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; + /* No segment name and size since we only support memfds + * in this configuration */ + rmp->segment_handle = a->segment_handle; + rmp->api_client_handle = a->api_client_index; + + /* Update app index for socket */ + handle = (app_ns_api_handle_t *) & cs->private_data; + 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); } -/* - * session_api_hookup - * Add uri's API message handlers to the table. - * vlib has alread mapped shared memory and - * added the client registration handlers. - * See .../open-repo/vlib/memclnt_vlib.c:memclnt_process() +void +sapi_socket_close_w_handle (u32 api_handle) +{ + app_namespace_t *app_ns = app_namespace_get (api_handle >> 16); + u16 sock_index = api_handle & 0xffff; + app_ns_api_handle_t *handle; + clib_socket_t *cs; + clib_file_t *cf; + + cs = appns_sapi_get_socket (app_ns, sock_index); + if (!cs) + return; + + handle = (app_ns_api_handle_t *) & cs->private_data; + cf = clib_file_get (&file_main, handle->aah_file_index); + clib_file_del (&file_main, cf); + + clib_socket_close (cs); + appns_sapi_free_socket (app_ns, cs); +} + +static void +sapi_add_del_worker_handler (app_namespace_t * app_ns, + clib_socket_t * cs, + app_sapi_worker_add_del_msg_t * mp) +{ + int rv = 0, fds[SESSION_N_FD_TYPE], n_fds = 0; + app_sapi_worker_add_del_reply_msg_t *rmp; + app_ns_api_handle_t *handle; + app_sapi_msg_t msg = { 0 }; + app_worker_t *app_wrk; + u32 sapi_handle = -1; + application_t *app; + u8 fd_flags = 0; + + app = application_get_if_valid (mp->app_index); + if (!app) + { + rv = SESSION_E_INVALID; + goto done; + } + + sapi_handle = appns_sapi_socket_handle (app_ns, cs); + + vnet_app_worker_add_del_args_t args = { + .app_index = app->app_index, + .wrk_map_index = mp->wrk_index, + .api_client_index = sapi_handle, + .is_add = mp->is_add + }; + rv = vnet_app_worker_add_del (&args); + if (rv) + { + clib_warning ("app worker add/del returned: %U", format_session_error, + rv); + goto done; + } + + if (!mp->is_add) + goto done; + + /* Send fifo segment fd if needed */ + if (ssvm_type (args.segment) == SSVM_SEGMENT_MEMFD) + { + fd_flags |= SESSION_FD_F_MEMFD_SEGMENT; + fds[n_fds] = args.segment->fd; + n_fds += 1; + } + if (application_segment_manager_properties (app)->use_mq_eventfd) + { + fd_flags |= SESSION_FD_F_MQ_EVENTFD; + fds[n_fds] = svm_msg_q_get_eventfd (args.evt_q); + n_fds += 1; + } + +done: + + /* With app sock api socket expected to be closed, no reply */ + if (!mp->is_add && appns_sapi_enabled ()) + return; + + msg.type = APP_SAPI_MSG_TYPE_ADD_DEL_WORKER_REPLY; + rmp = &msg.worker_add_del_reply; + rmp->retval = rv; + rmp->is_add = mp->is_add; + rmp->wrk_index = mp->wrk_index; + rmp->api_client_handle = sapi_handle; + if (!rv && mp->is_add) + { + rmp->wrk_index = args.wrk_map_index; + rmp->segment_handle = args.segment_handle; + /* No segment name and size. This supports only memfds */ + 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; + + /* Update app index for socket */ + handle = (app_ns_api_handle_t *) & cs->private_data; + app_wrk = application_get_worker (app, args.wrk_map_index); + handle->aah_app_wrk_index = app_wrk->wrk_index; + } + + clib_socket_sendmsg (cs, &msg, sizeof (msg), fds, n_fds); +} + +/* This is a workaround for the case when session layer starts reading + * the socket before the client actualy sends the data */ static clib_error_t * -session_api_hookup (vlib_main_t * vm) +sapi_socket_receive_wait (clib_socket_t *cs, u8 *msg, u32 msg_len) +{ + clib_error_t *err; + int n_tries = 5; + + while (1) + { + err = clib_socket_recvmsg (cs, msg, msg_len, 0, 0); + if (!err) + break; + + if (!n_tries) + return err; + + n_tries--; + usleep (1); + } + + return err; +} + +static void +sapi_add_del_cert_key_handler (app_namespace_t *app_ns, clib_socket_t *cs, + app_sapi_cert_key_add_del_msg_t *mp) +{ + vnet_app_add_cert_key_pair_args_t _a, *a = &_a; + app_sapi_cert_key_add_del_reply_msg_t *rmp; + app_sapi_msg_t msg = { 0 }; + int rv = 0; + + if (mp->is_add) + { + const u32 max_certkey_len = 2e4, max_cert_len = 1e4, max_key_len = 1e4; + clib_error_t *err; + u8 *certkey = 0; + u32 key_len; + + if (mp->certkey_len > max_certkey_len) + { + rv = SESSION_E_INVALID; + goto send_reply; + } + + vec_validate (certkey, mp->certkey_len - 1); + + err = sapi_socket_receive_wait (cs, certkey, mp->certkey_len); + if (err) + { + clib_error_report (err); + rv = SESSION_E_INVALID; + goto send_reply; + } + + if (mp->cert_len > max_cert_len) + { + rv = SESSION_E_INVALID; + goto send_reply; + } + + if (mp->certkey_len < mp->cert_len) + { + rv = SESSION_E_INVALID; + goto send_reply; + } + + key_len = mp->certkey_len - mp->cert_len; + if (key_len > max_key_len) + { + rv = SESSION_E_INVALID; + goto send_reply; + } + + clib_memset (a, 0, sizeof (*a)); + a->cert = certkey; + a->key = certkey + mp->cert_len; + a->cert_len = mp->cert_len; + a->key_len = key_len; + rv = vnet_app_add_cert_key_pair (a); + + vec_free (certkey); + } + else + { + rv = vnet_app_del_cert_key_pair (mp->index); + } + +send_reply: + + msg.type = APP_SAPI_MSG_TYPE_ADD_DEL_CERT_KEY_REPLY; + rmp = &msg.cert_key_add_del_reply; + rmp->retval = rv; + rmp->context = mp->context; + if (!rv && mp->is_add) + rmp->index = a->index; + + clib_socket_sendmsg (cs, &msg, sizeof (msg), 0, 0); +} + +static void +sapi_socket_detach (app_namespace_t * app_ns, clib_socket_t * cs) +{ + app_ns_api_handle_t *handle; + app_worker_t *app_wrk; + u32 api_client_handle; + + api_client_handle = appns_sapi_socket_handle (app_ns, cs); + + /* Cleanup everything because app worker closed socket or crashed */ + handle = (app_ns_api_handle_t *) & cs->private_data; + app_wrk = app_worker_get_if_valid (handle->aah_app_wrk_index); + if (!app_wrk) + return; + + vnet_app_worker_add_del_args_t args = { + .app_index = app_wrk->app_index, + .wrk_map_index = app_wrk->wrk_map_index, + .api_client_index = api_client_handle, + .is_add = 0 + }; + /* Send rpc to main thread for worker barrier */ + vlib_rpc_call_main_thread (vnet_app_worker_add_del, (u8 *) & args, + sizeof (args)); +} + +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; + clib_socket_t *cs; + + app_ns = app_namespace_get (handle->aah_app_ns_index); + cs = appns_sapi_get_socket (app_ns, handle->aah_sock_index); + if (!cs) + goto error; + + err = clib_socket_recvmsg (cs, &msg, sizeof (msg), 0, 0); + if (err) + { + clib_error_free (err); + sapi_socket_detach (app_ns, cs); + goto error; + } + + handle = (app_ns_api_handle_t *) & cs->private_data; + + vlib_worker_thread_barrier_sync (vm); + + switch (msg.type) + { + case APP_SAPI_MSG_TYPE_ATTACH: + session_api_attach_handler (app_ns, cs, &msg.attach); + break; + case APP_SAPI_MSG_TYPE_ADD_DEL_WORKER: + sapi_add_del_worker_handler (app_ns, cs, &msg.worker_add_del); + break; + case APP_SAPI_MSG_TYPE_ADD_DEL_CERT_KEY: + sapi_add_del_cert_key_handler (app_ns, cs, &msg.cert_key_add_del); + break; + default: + clib_warning ("app wrk %u unknown message type: %u", + handle->aah_app_wrk_index, msg.type); + break; + } + + vlib_worker_thread_barrier_release (vm); + +error: + return 0; +} + +static clib_error_t * +sapi_sock_write_ready (clib_file_t * cf) { - api_main_t *am = &api_main; - -#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); - foreach_session_api_msg; -#undef _ + app_ns_api_handle_t *handle = (app_ns_api_handle_t *) & cf->private_data; + clib_warning ("called for app ns %u", handle->aah_app_ns_index); + return 0; +} + +static clib_error_t * +sapi_sock_error (clib_file_t * cf) +{ + app_ns_api_handle_t *handle = (app_ns_api_handle_t *) & cf->private_data; + app_namespace_t *app_ns; + clib_socket_t *cs; + + app_ns = app_namespace_get (handle->aah_app_ns_index); + cs = appns_sapi_get_socket (app_ns, handle->aah_sock_index); + if (!cs) + return 0; + + sapi_socket_detach (app_ns, cs); + return 0; +} + +static clib_error_t * +sapi_sock_accept_ready (clib_file_t * scf) +{ + app_ns_api_handle_t handle = *(app_ns_api_handle_t *) & scf->private_data; + app_namespace_t *app_ns; + clib_file_t cf = { 0 }; + clib_error_t *err = 0; + clib_socket_t *ccs, *scs; + + /* Listener files point to namespace */ + app_ns = app_namespace_get (handle.aah_app_ns_index); /* - * Messages which bounce off the data-plane to - * an API client. Simply tells the message handling infra not - * to free the message. - * - * Bounced message handlers MUST NOT block the data plane + * Initialize client socket */ - am->message_bounce[VL_API_CONNECT_URI] = 1; - am->message_bounce[VL_API_CONNECT_SOCK] = 1; + ccs = appns_sapi_alloc_socket (app_ns); + + /* Grab server socket after client is initialized */ + scs = appns_sapi_get_socket (app_ns, handle.aah_sock_index); + if (!scs) + goto error; + + err = clib_socket_accept (scs, ccs); + if (err) + { + clib_error_report (err); + goto error; + } + + cf.read_function = sapi_sock_read_ready; + cf.write_function = sapi_sock_write_ready; + cf.error_function = sapi_sock_error; + 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_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_u64; + return err; + +error: + appns_sapi_free_socket (app_ns, ccs); + return err; +} + +void +appns_sapi_del_ns_socket (app_namespace_t *app_ns) +{ + app_ns_api_handle_t *handle; + clib_socket_t *cs; + + pool_foreach (cs, app_ns->app_sockets) + { + handle = (app_ns_api_handle_t *) &cs->private_data; + clib_file_del_by_index (&file_main, handle->aah_file_index); + + clib_socket_close (cs); + clib_socket_free (cs); + } + pool_free (app_ns->app_sockets); +} + +int +appns_sapi_add_ns_socket (app_namespace_t * app_ns) +{ + char *subdir = "/app_ns_sockets/"; + app_ns_api_handle_t *handle; + clib_file_t cf = { 0 }; + struct stat file_stat; + clib_error_t *err; + clib_socket_t *cs; + char dir[4096]; + + snprintf (dir, sizeof (dir), "%s%s", vlib_unix_get_runtime_dir (), subdir); + + if (!app_ns->sock_name) + app_ns->sock_name = format (0, "%s%v%c", dir, app_ns->ns_id, 0); + + /* + * Create and initialize socket to listen on + */ + cs = appns_sapi_alloc_socket (app_ns); + cs->config = (char *) vec_dup (app_ns->sock_name); + cs->flags = CLIB_SOCKET_F_IS_SERVER | + CLIB_SOCKET_F_ALLOW_GROUP_WRITE | + CLIB_SOCKET_F_SEQPACKET | CLIB_SOCKET_F_PASSCRED; + + if (clib_socket_prefix_get_type (cs->config) == CLIB_SOCKET_TYPE_UNIX) + { + err = vlib_unix_recursive_mkdir ((char *) dir); + if (err) + { + clib_error_report (err); + return SESSION_E_SYSCALL; + } + } + + if ((err = clib_socket_init (cs))) + { + clib_error_report (err); + return -1; + } + + if (clib_socket_prefix_get_type (cs->config) == CLIB_SOCKET_TYPE_UNIX && + stat ((char *) app_ns->sock_name, &file_stat) == -1) + return -1; + + /* + * Start polling it + */ + cf.read_function = sapi_sock_accept_ready; + cf.file_descriptor = cs->fd; + /* File points to namespace */ + handle = (app_ns_api_handle_t *) & cf.private_data; + handle->aah_app_ns_index = app_namespace_index (app_ns); + handle->aah_sock_index = appns_sapi_socket_index (app_ns, cs); + cf.description = format (0, "app sock listener: %s", app_ns->sock_name); + + /* Socket points to clib file index */ + handle = (app_ns_api_handle_t *) & cs->private_data; + handle->aah_file_index = clib_file_add (&file_main, &cf); + handle->aah_app_wrk_index = APP_INVALID_INDEX; + + return 0; +} + +#include +static clib_error_t * +session_api_hookup (vlib_main_t *vm) +{ /* * Set up the (msg_name, crc, message-id) table */ - setup_message_id_table (am); + REPLY_MSG_ID_BASE = setup_message_id_table (); return 0; }