X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication.c;h=c66548507e51b965a0cc7b21a21d490e5f9a0d5a;hb=HEAD;hp=69f33290a73bf65f98c90a038a3b4611d5c06397;hpb=fa76a76bf3388f09d55d0c83e7aea507c44f9619;p=vpp.git diff --git a/src/vnet/session/application.c b/src/vnet/session/application.c index 69f33290a73..c66548507e5 100644 --- a/src/vnet/session/application.c +++ b/src/vnet/session/application.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Cisco and/or its affiliates. + * Copyright (c) 2017-2019 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -16,58 +16,312 @@ #include #include #include +#include #include static app_main_t app_main; +#define app_interface_check_thread_and_barrier(_fn, _arg) \ + if (PREDICT_FALSE (!vlib_thread_is_main_w_barrier ())) \ + { \ + vlib_rpc_call_main_thread (_fn, (u8 *) _arg, sizeof(*_arg)); \ + return 0; \ + } + static app_listener_t * app_listener_alloc (application_t * app) { + app_main_t *am = &app_main; app_listener_t *app_listener; - pool_get (app->listeners, app_listener); + + pool_get (am->listeners, app_listener); clib_memset (app_listener, 0, sizeof (*app_listener)); - app_listener->al_index = app_listener - app->listeners; + app_listener->al_index = app_listener - am->listeners; + app_listener->app_index = app->app_index; + app_listener->session_index = SESSION_INVALID_INDEX; + app_listener->local_index = SESSION_INVALID_INDEX; + app_listener->ls_handle = SESSION_INVALID_HANDLE; return app_listener; } -static app_listener_t * -app_listener_get (application_t * app, u32 app_listener_index) +app_listener_t * +app_listener_get (u32 app_listener_index) { - return pool_elt_at_index (app->listeners, app_listener_index); + app_main_t *am = &app_main; + + return pool_elt_at_index (am->listeners, app_listener_index); } static void app_listener_free (application_t * app, app_listener_t * app_listener) { + app_main_t *am = &app_main; + clib_bitmap_free (app_listener->workers); - pool_put (app->listeners, app_listener); + vec_free (app_listener->cl_listeners); if (CLIB_DEBUG) clib_memset (app_listener, 0xfa, sizeof (*app_listener)); + pool_put (am->listeners, app_listener); } -static app_listener_t * -app_local_listener_alloc (application_t * app) +session_handle_t +app_listener_handle (app_listener_t * al) +{ + return al->ls_handle; +} + +session_handle_t +app_listen_session_handle (session_t * ls) +{ + app_listener_t *al; + /* TODO(fcoras): quic session handles */ + if (ls->al_index == SESSION_INVALID_INDEX) + return listen_session_get_handle (ls); + al = app_listener_get (ls->al_index); + return al->ls_handle; +} + +app_listener_t * +app_listener_get_w_handle (session_handle_t handle) +{ + session_t *ls; + ls = session_get_from_handle_if_valid (handle); + if (!ls) + return 0; + return app_listener_get (ls->al_index); +} + +app_listener_t * +app_listener_lookup (application_t * app, session_endpoint_cfg_t * sep_ext) +{ + u32 table_index, fib_proto; + session_endpoint_t *sep; + session_handle_t handle; + session_t *ls; + void *iface_ip; + ip46_address_t original_ip; + + sep = (session_endpoint_t *) sep_ext; + if (application_has_local_scope (app) && session_endpoint_is_local (sep)) + { + table_index = application_local_session_table (app); + handle = session_lookup_endpoint_listener (table_index, sep, 1); + if (handle != SESSION_INVALID_HANDLE) + { + ls = listen_session_get_from_handle (handle); + return app_listener_get (ls->al_index); + } + } + + fib_proto = session_endpoint_fib_proto (sep); + table_index = session_lookup_get_index_for_fib (fib_proto, sep->fib_index); + handle = session_lookup_endpoint_listener (table_index, sep, 1); + if (handle != SESSION_INVALID_HANDLE) + { + ls = listen_session_get_from_handle (handle); + return app_listener_get (ls->al_index); + } + + /* + * When binds to "inaddr_any", we add zero address in the local lookup table + * and interface address in the global lookup table. If local scope disable, + * the latter is the only clue to find the listener. + */ + if (!application_has_local_scope (app) && + ip_is_zero (&sep_ext->ip, sep_ext->is_ip4) && + sep_ext->sw_if_index != ENDPOINT_INVALID_INDEX) + { + if ((iface_ip = ip_interface_get_first_ip (sep_ext->sw_if_index, + sep_ext->is_ip4))) + { + ip_copy (&original_ip, &sep_ext->ip, sep_ext->is_ip4); + ip_set (&sep_ext->ip, iface_ip, sep_ext->is_ip4); + handle = session_lookup_endpoint_listener (table_index, sep, 1); + ip_copy (&sep_ext->ip, &original_ip, sep_ext->is_ip4); + if (handle != SESSION_INVALID_HANDLE) + { + ls = listen_session_get_from_handle (handle); + return app_listener_get (ls->al_index); + } + } + } + + return 0; +} + +int +app_listener_alloc_and_init (application_t * app, + session_endpoint_cfg_t * sep, + app_listener_t ** listener) { app_listener_t *app_listener; - pool_get (app->local_listeners, app_listener); - clib_memset (app_listener, 0, sizeof (*app_listener)); - app_listener->al_index = app_listener - app->local_listeners; - return app_listener; + transport_connection_t *tc; + u32 al_index, table_index; + session_handle_t lh; + session_type_t st; + session_t *ls = 0; + int rv; + + app_listener = app_listener_alloc (app); + al_index = app_listener->al_index; + st = session_type_from_proto_and_ip (sep->transport_proto, sep->is_ip4); + + /* + * Add session endpoint to local session table. Only binds to "inaddr_any" + * (i.e., zero address) are added to local scope table. + */ + if (application_has_local_scope (app) + && session_endpoint_is_local ((session_endpoint_t *) sep)) + { + session_type_t local_st; + + local_st = session_type_from_proto_and_ip (TRANSPORT_PROTO_NONE, + sep->is_ip4); + ls = listen_session_alloc (0, local_st); + ls->app_wrk_index = sep->app_wrk_index; + lh = session_handle (ls); + + if ((rv = session_listen (ls, sep))) + { + ls = session_get_from_handle (lh); + session_free (ls); + app_listener_free (app, app_listener); + return rv; + } + + ls = session_get_from_handle (lh); + app_listener = app_listener_get (al_index); + app_listener->local_index = ls->session_index; + app_listener->ls_handle = lh; + ls->al_index = al_index; + + table_index = application_local_session_table (app); + session_lookup_add_session_endpoint (table_index, + (session_endpoint_t *) sep, lh); + } + + if (application_has_global_scope (app)) + { + /* + * Start listening on local endpoint for requested transport and scope. + * Creates a stream session with state LISTENING to be used in session + * lookups, prior to establishing connection. Requests transport to + * build it's own specific listening connection. + */ + ls = listen_session_alloc (0, st); + ls->app_wrk_index = sep->app_wrk_index; + + /* Listen pool can be reallocated if the transport is + * recursive (tls) */ + lh = listen_session_get_handle (ls); + + if ((rv = session_listen (ls, sep))) + { + ls = listen_session_get_from_handle (lh); + session_free (ls); + app_listener_free (app, app_listener); + return rv; + } + ls = listen_session_get_from_handle (lh); + app_listener = app_listener_get (al_index); + app_listener->session_index = ls->session_index; + app_listener->ls_handle = lh; + ls->al_index = al_index; + + /* Add to the global lookup table after transport was initialized. + * Lookup table needs to be populated only now because sessions + * with cut-through transport are are added to app local tables that + * are not related to network fibs, i.e., cannot be added as + * connections */ + tc = session_get_transport (ls); + if (!(tc->flags & TRANSPORT_CONNECTION_F_NO_LOOKUP)) + { + fib_protocol_t fib_proto; + fib_proto = session_endpoint_fib_proto ((session_endpoint_t *) sep); + /* Assume namespace vetted previously so make sure table exists */ + table_index = session_lookup_get_or_alloc_index_for_fib ( + fib_proto, sep->fib_index); + session_lookup_add_session_endpoint (table_index, + (session_endpoint_t *) sep, + lh); + } + } + + if (!ls) + { + app_listener_free (app, app_listener); + return -1; + } + + *listener = app_listener; + return 0; } -static app_listener_t * -app_local_listener_get (application_t * app, u32 app_listener_index) +void +app_listener_cleanup (app_listener_t * al) { - return pool_elt_at_index (app->local_listeners, app_listener_index); + application_t *app = application_get (al->app_index); + session_t *ls; + + if (al->session_index != SESSION_INVALID_INDEX) + { + ls = session_get (al->session_index, 0); + session_stop_listen (ls); + listen_session_free (ls); + } + if (al->local_index != SESSION_INVALID_INDEX) + { + session_endpoint_t sep = SESSION_ENDPOINT_NULL; + u32 table_index; + + table_index = application_local_session_table (app); + ls = listen_session_get (al->local_index); + ct_session_endpoint (ls, &sep); + session_lookup_del_session_endpoint (table_index, &sep); + session_stop_listen (ls); + listen_session_free (ls); + } + app_listener_free (app, al); } -static void -app_local_listener_free (application_t * app, app_listener_t * app_listener) +static app_worker_t * +app_listener_select_worker (app_listener_t *al) { - clib_bitmap_free (app_listener->workers); - pool_put (app->local_listeners, app_listener); - if (CLIB_DEBUG) - clib_memset (app_listener, 0xfa, sizeof (*app_listener)); + application_t *app; + u32 wrk_index; + + app = application_get (al->app_index); + wrk_index = clib_bitmap_next_set (al->workers, al->accept_rotor + 1); + if (wrk_index == ~0) + wrk_index = clib_bitmap_first_set (al->workers); + + ASSERT (wrk_index != ~0); + al->accept_rotor = wrk_index; + return application_get_worker (app, wrk_index); +} + +session_t * +app_listener_get_session (app_listener_t * al) +{ + if (al->session_index == SESSION_INVALID_INDEX) + return 0; + + return listen_session_get (al->session_index); +} + +session_t * +app_listener_get_local_session (app_listener_t * al) +{ + if (al->local_index == SESSION_INVALID_INDEX) + return 0; + return listen_session_get (al->local_index); +} + +session_t * +app_listener_get_wrk_cl_session (app_listener_t *al, u32 wrk_map_index) +{ + u32 si = vec_elt (al->cl_listeners, wrk_map_index); + return session_get (si, 0 /* listener thread */); } static app_worker_map_t * @@ -94,6 +348,8 @@ app_worker_map_free (application_t * app, app_worker_map_t * map) static app_worker_map_t * app_worker_map_get (application_t * app, u32 map_index) { + if (pool_is_free_index (app->worker_maps, map_index)) + return 0; return pool_elt_at_index (app->worker_maps, map_index); } @@ -128,16 +384,6 @@ application_local_session_table (application_t * app) return app_ns->local_table_index; } -static void -application_local_listener_session_endpoint (local_session_t * ll, - session_endpoint_t * sep) -{ - sep->transport_proto = - session_type_transport_proto (ll->listener_session_type); - sep->port = ll->port; - sep->is_ip4 = ll->listener_session_type & 1; -} - /** * Returns app name for app-index */ @@ -197,7 +443,265 @@ application_lookup_name (const u8 * name) return 0; } -application_t * +void +appsl_pending_rx_mqs_add_tail (appsl_wrk_t *aw, app_rx_mq_elt_t *elt) +{ + app_rx_mq_elt_t *head; + + if (!aw->pending_rx_mqs) + { + elt->next = elt->prev = elt; + aw->pending_rx_mqs = elt; + return; + } + + head = aw->pending_rx_mqs; + + ASSERT (head != elt); + + elt->prev = head->prev; + elt->next = head; + + head->prev->next = elt; + head->prev = elt; +} + +void +appsl_pending_rx_mqs_del (appsl_wrk_t *aw, app_rx_mq_elt_t *elt) +{ + if (elt->next == elt) + { + elt->next = elt->prev = 0; + aw->pending_rx_mqs = 0; + return; + } + + if (elt == aw->pending_rx_mqs) + aw->pending_rx_mqs = elt->next; + + elt->next->prev = elt->prev; + elt->prev->next = elt->next; + elt->next = elt->prev = 0; +} + +vlib_node_registration_t appsl_rx_mqs_input_node; + +VLIB_NODE_FN (appsl_rx_mqs_input_node) +(vlib_main_t *vm, vlib_node_runtime_t *node, vlib_frame_t *frame) +{ + u32 thread_index = vm->thread_index, n_msgs = 0; + app_rx_mq_elt_t *elt, *next; + app_main_t *am = &app_main; + session_worker_t *wrk; + int __clib_unused rv; + appsl_wrk_t *aw; + u64 buf; + + aw = &am->wrk[thread_index]; + elt = aw->pending_rx_mqs; + if (!elt) + return 0; + + wrk = session_main_get_worker (thread_index); + + do + { + if (!(elt->flags & APP_RX_MQ_F_POSTPONED)) + rv = read (svm_msg_q_get_eventfd (elt->mq), &buf, sizeof (buf)); + n_msgs += session_wrk_handle_mq (wrk, elt->mq); + + next = elt->next; + appsl_pending_rx_mqs_del (aw, elt); + if (!svm_msg_q_is_empty (elt->mq)) + { + elt->flags |= APP_RX_MQ_F_POSTPONED; + appsl_pending_rx_mqs_add_tail (aw, elt); + } + else + { + elt->flags = 0; + } + elt = next; + } + while (aw->pending_rx_mqs && elt != aw->pending_rx_mqs); + + if (aw->pending_rx_mqs) + vlib_node_set_interrupt_pending (vm, appsl_rx_mqs_input_node.index); + + if (n_msgs && wrk->state == SESSION_WRK_INTERRUPT) + vlib_node_set_interrupt_pending (vm, session_queue_node.index); + + return n_msgs; +} + +VLIB_REGISTER_NODE (appsl_rx_mqs_input_node) = { + .name = "appsl-rx-mqs-input", + .type = VLIB_NODE_TYPE_INPUT, + .state = VLIB_NODE_STATE_DISABLED, +}; + +static clib_error_t * +app_rx_mq_fd_read_ready (clib_file_t *cf) +{ + app_rx_mq_handle_t *handle = (app_rx_mq_handle_t *) &cf->private_data; + vlib_main_t *vm = vlib_get_main (); + app_main_t *am = &app_main; + app_rx_mq_elt_t *mqe; + application_t *app; + appsl_wrk_t *aw; + + ASSERT (vlib_get_thread_index () == handle->thread_index); + app = application_get_if_valid (handle->app_index); + if (!app) + return 0; + + mqe = &app->rx_mqs[handle->thread_index]; + if ((mqe->flags & APP_RX_MQ_F_PENDING) || svm_msg_q_is_empty (mqe->mq)) + return 0; + + aw = &am->wrk[handle->thread_index]; + appsl_pending_rx_mqs_add_tail (aw, mqe); + mqe->flags |= APP_RX_MQ_F_PENDING; + + vlib_node_set_interrupt_pending (vm, appsl_rx_mqs_input_node.index); + + return 0; +} + +static clib_error_t * +app_rx_mq_fd_write_ready (clib_file_t *cf) +{ + clib_warning ("should not be called"); + return 0; +} + +static void +app_rx_mqs_epoll_add (application_t *app, app_rx_mq_elt_t *mqe) +{ + clib_file_t template = { 0 }; + app_rx_mq_handle_t handle; + u32 thread_index; + int fd; + + thread_index = mqe - app->rx_mqs; + fd = svm_msg_q_get_eventfd (mqe->mq); + + handle.app_index = app->app_index; + handle.thread_index = thread_index; + + template.read_function = app_rx_mq_fd_read_ready; + template.write_function = app_rx_mq_fd_write_ready; + template.file_descriptor = fd; + template.private_data = handle.as_u64; + template.polling_thread_index = thread_index; + template.description = + format (0, "app-%u-rx-mq-%u", app->app_index, thread_index); + mqe->file_index = clib_file_add (&file_main, &template); +} + +static void +app_rx_mqs_epoll_del (application_t *app, app_rx_mq_elt_t *mqe) +{ + u32 thread_index = mqe - app->rx_mqs; + app_main_t *am = &app_main; + appsl_wrk_t *aw; + + aw = &am->wrk[thread_index]; + + session_wrk_handle_mq (session_main_get_worker (thread_index), mqe->mq); + + if (mqe->flags & APP_RX_MQ_F_PENDING) + appsl_pending_rx_mqs_del (aw, mqe); + + clib_file_del_by_index (&file_main, mqe->file_index); +} + +svm_msg_q_t * +application_rx_mq_get (application_t *app, u32 mq_index) +{ + if (!app->rx_mqs) + return 0; + + return app->rx_mqs[mq_index].mq; +} + +static int +app_rx_mqs_alloc (application_t *app) +{ + u32 evt_q_length, evt_size = sizeof (session_event_t); + fifo_segment_t *eqs = &app->rx_mqs_segment; + u32 n_mqs = vlib_num_workers () + 1; + segment_manager_props_t *props; + int i; + + props = application_segment_manager_properties (app); + evt_q_length = clib_max (props->evt_q_size, 128); + + svm_msg_q_cfg_t _cfg, *cfg = &_cfg; + svm_msg_q_ring_cfg_t rc[SESSION_MQ_N_RINGS] = { + { evt_q_length, evt_size, 0 }, { evt_q_length >> 1, 256, 0 } + }; + cfg->consumer_pid = 0; + cfg->n_rings = 2; + cfg->q_nitems = evt_q_length; + cfg->ring_cfgs = rc; + + eqs->ssvm.ssvm_size = svm_msg_q_size_to_alloc (cfg) * n_mqs + (1 << 20); + eqs->ssvm.name = format (0, "%v-rx-mqs-seg%c", app->name, 0); + + if (ssvm_server_init (&eqs->ssvm, SSVM_SEGMENT_MEMFD)) + { + clib_warning ("failed to initialize queue segment"); + return SESSION_E_SEG_CREATE; + } + + fifo_segment_init (eqs); + + /* Fifo segment filled only with mqs */ + eqs->h->n_mqs = n_mqs; + vec_validate (app->rx_mqs, n_mqs - 1); + + for (i = 0; i < n_mqs; i++) + { + app->rx_mqs[i].mq = fifo_segment_msg_q_alloc (eqs, i, cfg); + if (svm_msg_q_alloc_eventfd (app->rx_mqs[i].mq)) + { + clib_warning ("eventfd returned"); + fifo_segment_cleanup (eqs); + ssvm_delete (&eqs->ssvm); + return SESSION_E_EVENTFD_ALLOC; + } + app_rx_mqs_epoll_add (app, &app->rx_mqs[i]); + app->rx_mqs[i].app_index = app->app_index; + } + + return 0; +} + +u8 +application_use_private_rx_mqs (void) +{ + return session_main.use_private_rx_mqs; +} + +fifo_segment_t * +application_get_rx_mqs_segment (application_t *app) +{ + if (application_use_private_rx_mqs ()) + return &app->rx_mqs_segment; + return session_main_get_wrk_mqs_segment (); +} + +void +application_enable_rx_mqs_nodes (u8 is_en) +{ + u8 state = is_en ? VLIB_NODE_STATE_INTERRUPT : VLIB_NODE_STATE_DISABLED; + + foreach_vlib_main () + vlib_node_set_state (this_vlib_main, appsl_rx_mqs_input_node.index, state); +} + +static application_t * application_alloc (void) { application_t *app; @@ -224,6 +728,12 @@ application_get_if_valid (u32 app_index) return pool_elt_at_index (app_main.app_pool, app_index); } +static int +_null_app_tx_callback (session_t *s) +{ + return 0; +} + static void application_verify_cb_fns (session_cb_vft_t * cb_fns) { @@ -235,6 +745,8 @@ application_verify_cb_fns (session_cb_vft_t * cb_fns) clib_warning ("No session disconnect callback function provided"); if (cb_fns->session_reset_callback == 0) clib_warning ("No session reset callback function provided"); + if (!cb_fns->builtin_app_tx_callback) + cb_fns->builtin_app_tx_callback = _null_app_tx_callback; } /** @@ -248,14 +760,14 @@ application_verify_cfg (ssvm_segment_type_t st) u8 is_valid; if (st == SSVM_SEGMENT_MEMFD) { - is_valid = (session_manager_get_evt_q_segment () != 0); + is_valid = (session_main_get_wrk_mqs_segment () != 0); if (!is_valid) clib_warning ("memfd seg: vpp's event qs IN binary api svm region"); return is_valid; } else if (st == SSVM_SEGMENT_SHM) { - is_valid = (session_manager_get_evt_q_segment () == 0); + is_valid = (session_main_get_wrk_mqs_segment () == 0); if (!is_valid) clib_warning ("shm seg: vpp's event qs NOT IN binary api svm region"); return is_valid; @@ -264,49 +776,45 @@ application_verify_cfg (ssvm_segment_type_t st) return 1; } -int -application_alloc_and_init (app_init_args_t * a) +static session_error_t +application_alloc_and_init (app_init_args_t *a) { ssvm_segment_type_t seg_type = SSVM_SEGMENT_MEMFD; - segment_manager_properties_t *props; - vl_api_registration_t *reg; + segment_manager_props_t *props; application_t *app; - u64 *options; + u64 *opts; app = application_alloc (); - options = a->options; + opts = a->options; /* * Make sure we support the requested configuration */ - if (!(options[APP_OPTIONS_FLAGS] & APP_OPTIONS_FLAGS_IS_BUILTIN)) - { - reg = vl_api_client_index_to_registration (a->api_client_index); - if (!reg) - return VNET_API_ERROR_APP_UNSUPPORTED_CFG; - if (vl_api_registration_file_index (reg) == VL_API_INVALID_FI) - seg_type = SSVM_SEGMENT_SHM; - } - else + if ((opts[APP_OPTIONS_FLAGS] & APP_OPTIONS_FLAGS_IS_BUILTIN) && + !(opts[APP_OPTIONS_FLAGS] & APP_OPTIONS_FLAGS_MEMFD_FOR_BUILTIN)) + seg_type = SSVM_SEGMENT_PRIVATE; + + if ((opts[APP_OPTIONS_FLAGS] & APP_OPTIONS_FLAGS_EVT_MQ_USE_EVENTFD) && + seg_type != SSVM_SEGMENT_MEMFD) { - if (options[APP_OPTIONS_FLAGS] & APP_OPTIONS_FLAGS_EVT_MQ_USE_EVENTFD) - { - clib_warning ("mq eventfds can only be used if socket transport is " - "used for api"); - return VNET_API_ERROR_APP_UNSUPPORTED_CFG; - } - seg_type = SSVM_SEGMENT_PRIVATE; + clib_warning ("mq eventfds can only be used if socket transport is " + "used for binary api"); + return SESSION_E_NOSUPPORT; } if (!application_verify_cfg (seg_type)) - return VNET_API_ERROR_APP_UNSUPPORTED_CFG; + return SESSION_E_NOSUPPORT; + + if (opts[APP_OPTIONS_PREALLOC_FIFO_PAIRS] && + opts[APP_OPTIONS_PREALLOC_FIFO_HDRS]) + return SESSION_E_NOSUPPORT; /* Check that the obvious things are properly set up */ application_verify_cb_fns (a->session_cb_vft); - app->flags = options[APP_OPTIONS_FLAGS]; + app->flags = opts[APP_OPTIONS_FLAGS]; app->cb_fns = *a->session_cb_vft; - app->ns_index = options[APP_OPTIONS_NAMESPACE]; - app->proxied_transports = options[APP_OPTIONS_PROXY_TRANSPORT]; + app->ns_index = opts[APP_OPTIONS_NAMESPACE]; + app->proxied_transports = opts[APP_OPTIONS_PROXY_TRANSPORT]; app->name = vec_dup (a->name); /* If no scope enabled, default to global */ @@ -315,24 +823,35 @@ application_alloc_and_init (app_init_args_t * a) app->flags |= APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; props = application_segment_manager_properties (app); - segment_manager_properties_init (props); - props->segment_size = options[APP_OPTIONS_ADD_SEGMENT_SIZE]; - props->prealloc_fifos = options[APP_OPTIONS_PREALLOC_FIFO_PAIRS]; - if (options[APP_OPTIONS_ADD_SEGMENT_SIZE]) + segment_manager_props_init (props); + props->segment_size = opts[APP_OPTIONS_SEGMENT_SIZE]; + props->prealloc_fifos = opts[APP_OPTIONS_PREALLOC_FIFO_PAIRS]; + props->prealloc_fifo_hdrs = opts[APP_OPTIONS_PREALLOC_FIFO_HDRS]; + if (opts[APP_OPTIONS_ADD_SEGMENT_SIZE]) { - props->add_segment_size = options[APP_OPTIONS_ADD_SEGMENT_SIZE]; + props->add_segment_size = opts[APP_OPTIONS_ADD_SEGMENT_SIZE]; props->add_segment = 1; } - if (options[APP_OPTIONS_RX_FIFO_SIZE]) - props->rx_fifo_size = options[APP_OPTIONS_RX_FIFO_SIZE]; - if (options[APP_OPTIONS_TX_FIFO_SIZE]) - props->tx_fifo_size = options[APP_OPTIONS_TX_FIFO_SIZE]; - if (options[APP_OPTIONS_EVT_QUEUE_SIZE]) - props->evt_q_size = options[APP_OPTIONS_EVT_QUEUE_SIZE]; - if (options[APP_OPTIONS_FLAGS] & APP_OPTIONS_FLAGS_EVT_MQ_USE_EVENTFD) + if (opts[APP_OPTIONS_FLAGS] & APP_OPTIONS_FLAGS_USE_HUGE_PAGE) + props->huge_page = 1; + if (opts[APP_OPTIONS_RX_FIFO_SIZE]) + props->rx_fifo_size = opts[APP_OPTIONS_RX_FIFO_SIZE]; + if (opts[APP_OPTIONS_TX_FIFO_SIZE]) + props->tx_fifo_size = opts[APP_OPTIONS_TX_FIFO_SIZE]; + if (opts[APP_OPTIONS_EVT_QUEUE_SIZE]) + props->evt_q_size = opts[APP_OPTIONS_EVT_QUEUE_SIZE]; + if (opts[APP_OPTIONS_FLAGS] & APP_OPTIONS_FLAGS_EVT_MQ_USE_EVENTFD) props->use_mq_eventfd = 1; - if (options[APP_OPTIONS_TLS_ENGINE]) - app->tls_engine = options[APP_OPTIONS_TLS_ENGINE]; + if (opts[APP_OPTIONS_TLS_ENGINE]) + app->tls_engine = opts[APP_OPTIONS_TLS_ENGINE]; + if (opts[APP_OPTIONS_MAX_FIFO_SIZE]) + props->max_fifo_size = opts[APP_OPTIONS_MAX_FIFO_SIZE]; + if (opts[APP_OPTIONS_HIGH_WATERMARK]) + props->high_watermark = opts[APP_OPTIONS_HIGH_WATERMARK]; + if (opts[APP_OPTIONS_LOW_WATERMARK]) + props->low_watermark = opts[APP_OPTIONS_LOW_WATERMARK]; + if (opts[APP_OPTIONS_PCT_FIRST_ALLOC]) + props->pct_first_alloc = opts[APP_OPTIONS_PCT_FIRST_ALLOC]; props->segment_type = seg_type; /* Add app to lookup by api_client_index table */ @@ -344,26 +863,22 @@ application_alloc_and_init (app_init_args_t * a) a->app_index = app->app_index; APP_DBG ("New app name: %v api index: %u index %u", app->name, - app->api_client_index, app->app_index); + a->api_client_index, app->app_index); return 0; } -void +static void application_free (application_t * app) { app_worker_map_t *wrk_map; app_worker_t *app_wrk; - u32 table_index; - local_session_t *ll; - session_endpoint_t sep; /* * The app event queue allocated in first segment is cleared with * the segment manager. No need to explicitly free it. */ - APP_DBG ("Delete app name %v api index: %d index: %d", app->name, - app->api_client_index, app->app_index); + APP_DBG ("Delete app name %v index: %d", app->name, app->app_index); if (application_is_proxy (app)) application_remove_proxy (app); @@ -372,28 +887,25 @@ application_free (application_t * app) * Free workers */ - /* *INDENT-OFF* */ pool_flush (wrk_map, app->worker_maps, ({ app_wrk = app_worker_get (wrk_map->wrk_index); app_worker_free (app_wrk); })); - /* *INDENT-ON* */ pool_free (app->worker_maps); /* - * Free local listeners. Global table unbinds stop local listeners - * as well, but if we have only local binds, these won't be cleaned up. - * Don't bother with local accepted sessions, we clean them when - * cleaning up the worker. + * Free rx mqs if allocated */ - table_index = application_local_session_table (app); - /* *INDENT-OFF* */ - pool_foreach (ll, app->local_listen_sessions, ({ - application_local_listener_session_endpoint (ll, &sep); - session_lookup_del_session_endpoint (table_index, &sep); - })); - /* *INDENT-ON* */ - pool_free (app->local_listen_sessions); + if (app->rx_mqs) + { + int i; + for (i = 0; i < vec_len (app->rx_mqs); i++) + app_rx_mqs_epoll_del (app, &app->rx_mqs[i]); + + fifo_segment_cleanup (&app->rx_mqs_segment); + ssvm_delete (&app->rx_mqs_segment.ssvm); + vec_free (app->rx_mqs); + } /* * Cleanup remaining state @@ -401,12 +913,10 @@ application_free (application_t * app) if (application_is_builtin (app)) application_name_table_del (app); vec_free (app->name); - vec_free (app->tls_cert); - vec_free (app->tls_key); pool_put (app_main.app_pool, app); } -void +static void application_detach_process (application_t * app, u32 api_client_index) { vnet_app_worker_add_del_args_t _args = { 0 }, *args = &_args; @@ -421,15 +931,13 @@ application_detach_process (application_t * app, u32 api_client_index) } APP_DBG ("Detaching for app %v index %u api client index %u", app->name, - app->app_index, app->api_client_index); + app->app_index, api_client_index); - /* *INDENT-OFF* */ - pool_foreach (wrk_map, app->worker_maps, ({ + pool_foreach (wrk_map, app->worker_maps) { app_wrk = app_worker_get (wrk_map->wrk_index); if (app_wrk->api_client_index == api_client_index) vec_add1 (wrks, app_wrk->wrk_index); - })); - /* *INDENT-ON* */ + } if (!vec_len (wrks)) { @@ -450,8 +958,33 @@ application_detach_process (application_t * app, u32 api_client_index) vec_free (wrks); } -app_worker_t * -application_get_worker (application_t * app, u32 wrk_map_index) +void +application_namespace_cleanup (app_namespace_t *app_ns) +{ + u32 *app_indices = 0, *app_index; + application_t *app; + u32 ns_index; + + ns_index = app_namespace_index (app_ns); + pool_foreach (app, app_main.app_pool) + if (app->ns_index == ns_index) + vec_add1 (app_indices, app->ns_index); + + vec_foreach (app_index, app_indices) + { + app = application_get (*app_index); + + if (application_is_proxy (app)) + application_remove_proxy (app); + app->flags &= ~APP_OPTIONS_FLAGS_IS_PROXY; + + application_free (app); + } + vec_free (app_indices); +} + +app_worker_t * +application_get_worker (application_t * app, u32 wrk_map_index) { app_worker_map_t *map; map = app_worker_map_get (app, wrk_map_index); @@ -473,126 +1006,61 @@ application_n_workers (application_t * app) } app_worker_t * -application_listener_select_worker (stream_session_t * ls, u8 is_local) -{ - app_listener_t *app_listener; - application_t *app; - u32 wrk_index; - - app = application_get (ls->app_index); - if (!is_local) - app_listener = app_listener_get (app, ls->listener_db_index); - else - app_listener = app_local_listener_get (app, ls->listener_db_index); - - wrk_index = clib_bitmap_next_set (app_listener->workers, - app_listener->accept_rotor + 1); - if (wrk_index == ~0) - wrk_index = clib_bitmap_first_set (app_listener->workers); - - ASSERT (wrk_index != ~0); - app_listener->accept_rotor = wrk_index; - return application_get_worker (app, wrk_index); -} - -app_worker_t * -app_worker_alloc (application_t * app) -{ - app_worker_t *app_wrk; - pool_get (app_main.workers, app_wrk); - clib_memset (app_wrk, 0, sizeof (*app_wrk)); - app_wrk->wrk_index = app_wrk - app_main.workers; - app_wrk->app_index = app->app_index; - app_wrk->wrk_map_index = ~0; - app_wrk->connects_seg_manager = APP_INVALID_SEGMENT_MANAGER_INDEX; - app_wrk->first_segment_manager = APP_INVALID_SEGMENT_MANAGER_INDEX; - app_wrk->local_segment_manager = APP_INVALID_SEGMENT_MANAGER_INDEX; - APP_DBG ("New app %v worker %u", app_get_name (app), app_wrk->wrk_index); - return app_wrk; -} - -app_worker_t * -app_worker_get (u32 wrk_index) +application_listener_select_worker (session_t * ls) { - return pool_elt_at_index (app_main.workers, wrk_index); -} + app_listener_t *al; -app_worker_t * -app_worker_get_if_valid (u32 wrk_index) -{ - if (pool_is_free_index (app_main.workers, wrk_index)) - return 0; - return pool_elt_at_index (app_main.workers, wrk_index); + al = app_listener_get (ls->al_index); + return app_listener_select_worker (al); } -void -app_worker_free (app_worker_t * app_wrk) +always_inline u32 +app_listener_cl_flow_hash (session_dgram_hdr_t *hdr) { - application_t *app = application_get (app_wrk->app_index); - vnet_unbind_args_t _a, *a = &_a; - u64 handle, *handles = 0; - segment_manager_t *sm; - u32 sm_index; - int i; + u32 hash = 0; - /* - * Listener cleanup - */ - - /* *INDENT-OFF* */ - hash_foreach (handle, sm_index, app_wrk->listeners_table, - ({ - vec_add1 (handles, handle); - sm = segment_manager_get (sm_index); - sm->app_wrk_index = SEGMENT_MANAGER_INVALID_APP_INDEX; - })); - /* *INDENT-ON* */ - - for (i = 0; i < vec_len (handles); i++) + if (hdr->is_ip4) { - a->app_index = app->app_index; - a->wrk_map_index = app_wrk->wrk_map_index; - a->handle = handles[i]; - /* seg manager is removed when unbind completes */ - vnet_unbind (a); + hash = clib_crc32c_u32 (hash, hdr->rmt_ip.ip4.as_u32); + hash = clib_crc32c_u32 (hash, hdr->lcl_ip.ip4.as_u32); + hash = clib_crc32c_u16 (hash, hdr->rmt_port); + hash = clib_crc32c_u16 (hash, hdr->lcl_port); } - - /* - * Connects segment manager cleanup - */ - - if (app_wrk->connects_seg_manager != APP_INVALID_SEGMENT_MANAGER_INDEX) + else { - sm = segment_manager_get (app_wrk->connects_seg_manager); - sm->app_wrk_index = SEGMENT_MANAGER_INVALID_APP_INDEX; - segment_manager_init_del (sm); + hash = clib_crc32c_u64 (hash, hdr->rmt_ip.ip6.as_u64[0]); + hash = clib_crc32c_u64 (hash, hdr->rmt_ip.ip6.as_u64[1]); + hash = clib_crc32c_u64 (hash, hdr->lcl_ip.ip6.as_u64[0]); + hash = clib_crc32c_u64 (hash, hdr->lcl_ip.ip6.as_u64[1]); + hash = clib_crc32c_u16 (hash, hdr->rmt_port); + hash = clib_crc32c_u16 (hash, hdr->lcl_port); } - /* If first segment manager is used by a listener */ - if (app_wrk->first_segment_manager != APP_INVALID_SEGMENT_MANAGER_INDEX - && app_wrk->first_segment_manager != app_wrk->connects_seg_manager) + return hash; +} + +session_t * +app_listener_select_wrk_cl_session (session_t *ls, session_dgram_hdr_t *hdr) +{ + u32 wrk_map_index = 0; + app_listener_t *al; + + al = app_listener_get (ls->al_index); + /* Crude test to check if only worker 0 is set */ + if (al->workers[0] != 1) { - sm = segment_manager_get (app_wrk->first_segment_manager); - sm->first_is_protected = 0; - sm->app_wrk_index = SEGMENT_MANAGER_INVALID_APP_INDEX; - /* .. and has no fifos, e.g. it might be used for redirected sessions, - * remove it */ - if (!segment_manager_has_fifos (sm)) - segment_manager_del (sm); + u32 hash = app_listener_cl_flow_hash (hdr); + hash %= vec_len (al->workers) * sizeof (uword); + wrk_map_index = clib_bitmap_next_set (al->workers, hash); + if (wrk_map_index == ~0) + wrk_map_index = clib_bitmap_first_set (al->workers); } - /* - * Local sessions - */ - app_worker_local_sessions_free (app_wrk); - - pool_put (app_main.workers, app_wrk); - if (CLIB_DEBUG) - clib_memset (app_wrk, 0xfe, sizeof (*app_wrk)); + return app_listener_get_wrk_cl_session (al, wrk_map_index); } int -app_worker_alloc_and_init (application_t * app, app_worker_t ** wrk) +application_alloc_worker_and_init (application_t * app, app_worker_t ** wrk) { app_worker_map_t *wrk_map; app_worker_t *app_wrk; @@ -607,11 +1075,10 @@ app_worker_alloc_and_init (application_t * app, app_worker_t ** wrk) /* * Setup first segment manager */ - sm = segment_manager_new (); + sm = segment_manager_alloc (); sm->app_wrk_index = app_wrk->wrk_index; - if ((rv = segment_manager_init (sm, app->sm_properties.segment_size, - app->sm_properties.prealloc_fifos))) + if ((rv = segment_manager_init_first (sm))) { app_worker_free (app_wrk); return rv; @@ -621,351 +1088,465 @@ app_worker_alloc_and_init (application_t * app, app_worker_t ** wrk) /* * Setup app worker */ - app_wrk->first_segment_manager = segment_manager_index (sm); + app_wrk->connects_seg_manager = segment_manager_index (sm); app_wrk->listeners_table = hash_create (0, sizeof (u64)); app_wrk->event_queue = segment_manager_event_queue (sm); app_wrk->app_is_builtin = application_is_builtin (app); - /* - * Segment manager for local sessions - */ - sm = segment_manager_new (); - sm->app_wrk_index = app_wrk->wrk_index; - app_wrk->local_segment_manager = segment_manager_index (sm); - app_wrk->local_connects = hash_create (0, sizeof (u64)); - *wrk = app_wrk; return 0; } -application_t * -app_worker_get_app (u32 wrk_index) +session_error_t +vnet_app_worker_add_del (vnet_app_worker_add_del_args_t *a) { + fifo_segment_t *fs; + app_worker_map_t *wrk_map; app_worker_t *app_wrk; - app_wrk = app_worker_get_if_valid (wrk_index); - if (!app_wrk) - return 0; - return application_get_if_valid (app_wrk->app_index); -} + segment_manager_t *sm; + application_t *app; + int rv; -static segment_manager_t * -app_worker_alloc_segment_manager (app_worker_t * app_wrk) -{ - segment_manager_t *sm = 0; + app = application_get (a->app_index); + if (!app) + return SESSION_E_INVALID; - /* If the first segment manager is not in use, don't allocate a new one */ - if (app_wrk->first_segment_manager != APP_INVALID_SEGMENT_MANAGER_INDEX - && app_wrk->first_segment_manager_in_use == 0) + if (a->is_add) { - sm = segment_manager_get (app_wrk->first_segment_manager); - app_wrk->first_segment_manager_in_use = 1; - return sm; + if ((rv = application_alloc_worker_and_init (app, &app_wrk))) + return rv; + + /* Map worker api index to the app */ + app_wrk->api_client_index = a->api_client_index; + application_api_table_add (app->app_index, a->api_client_index); + + sm = segment_manager_get (app_wrk->connects_seg_manager); + fs = segment_manager_get_segment_w_lock (sm, 0); + a->segment = &fs->ssvm; + a->segment_handle = segment_manager_segment_handle (sm, fs); + segment_manager_segment_reader_unlock (sm); + a->evt_q = app_wrk->event_queue; + a->wrk_map_index = app_wrk->wrk_map_index; } + else + { + wrk_map = app_worker_map_get (app, a->wrk_map_index); + if (!wrk_map) + return SESSION_E_INVALID; - sm = segment_manager_new (); - sm->app_wrk_index = app_wrk->wrk_index; + app_wrk = app_worker_get (wrk_map->wrk_index); + if (!app_wrk) + return SESSION_E_INVALID; - return sm; + application_api_table_del (app_wrk->api_client_index); + if (appns_sapi_enabled ()) + sapi_socket_close_w_handle (app_wrk->api_client_index); + app_worker_free (app_wrk); + app_worker_map_free (app, wrk_map); + if (application_n_workers (app) == 0) + application_free (app); + } + return 0; } -int -app_worker_start_listen (app_worker_t * app_wrk, stream_session_t * ls) +static session_error_t +app_validate_namespace (u8 *namespace_id, u64 secret, u32 *app_ns_index) { - segment_manager_t *sm; - - /* Allocate segment manager. All sessions derived out of a listen session - * have fifos allocated by the same segment manager. */ - if (!(sm = app_worker_alloc_segment_manager (app_wrk))) - return -1; - - /* Add to app's listener table. Useful to find all child listeners - * when app goes down, although, just for unbinding this is not needed */ - hash_set (app_wrk->listeners_table, listen_session_get_handle (ls), - segment_manager_index (sm)); - - if (!ls->server_rx_fifo - && session_transport_service_type (ls) == TRANSPORT_SERVICE_CL) + app_namespace_t *app_ns; + if (vec_len (namespace_id) == 0) { - if (session_alloc_fifos (sm, ls)) - return -1; + /* Use default namespace */ + *app_ns_index = 0; + return 0; } + + *app_ns_index = app_namespace_index_from_id (namespace_id); + if (*app_ns_index == APP_NAMESPACE_INVALID_INDEX) + return SESSION_E_INVALID_NS; + app_ns = app_namespace_get (*app_ns_index); + if (!app_ns) + return SESSION_E_INVALID_NS; + if (app_ns->ns_secret != secret) + return SESSION_E_WRONG_NS_SECRET; return 0; } -int -app_worker_stop_listen (app_worker_t * app_wrk, session_handle_t handle) +static u8 * +app_name_from_api_index (u32 api_client_index) { + vl_api_registration_t *regp; + regp = vl_api_client_index_to_registration (api_client_index); + if (regp) + return format (0, "%s", regp->name); + + clib_warning ("api client index %u does not have an api registration!", + api_client_index); + return format (0, "unknown"); +} + +/** + * Attach application to vpp + * + * Allocates a vpp app, i.e., a structure that keeps back pointers + * to external app and a segment manager for shared memory fifo based + * communication with the external app. + */ +session_error_t +vnet_application_attach (vnet_app_attach_args_t *a) +{ + fifo_segment_t *fs; + application_t *app = 0; + app_worker_t *app_wrk; segment_manager_t *sm; - uword *sm_indexp; + u32 app_ns_index = 0; + u8 *app_name = 0; + u64 secret; + session_error_t rv; + + if (a->api_client_index != APP_INVALID_INDEX) + app = application_lookup (a->api_client_index); + else if (a->name) + app = application_lookup_name (a->name); + else + return SESSION_E_INVALID; - sm_indexp = hash_get (app_wrk->listeners_table, handle); - if (PREDICT_FALSE (!sm_indexp)) - { - clib_warning ("listener handle was removed %llu!", handle); - return -1; - } + if (app) + return SESSION_E_APP_ATTACHED; - sm = segment_manager_get (*sm_indexp); - if (app_wrk->first_segment_manager == *sm_indexp) + /* Socket api sets the name and validates namespace prior to attach */ + if (!a->use_sock_api) { - /* Delete sessions but don't remove segment manager */ - app_wrk->first_segment_manager_in_use = 0; - segment_manager_del_sessions (sm); + if (a->api_client_index != APP_INVALID_INDEX) + { + app_name = app_name_from_api_index (a->api_client_index); + a->name = app_name; + } + + secret = a->options[APP_OPTIONS_NAMESPACE_SECRET]; + if ((rv = app_validate_namespace (a->namespace_id, secret, + &app_ns_index))) + return rv; + a->options[APP_OPTIONS_NAMESPACE] = app_ns_index; } - else + + if ((rv = application_alloc_and_init ((app_init_args_t *) a))) + return rv; + + app = application_get (a->app_index); + if ((rv = application_alloc_worker_and_init (app, &app_wrk))) + return rv; + + a->app_evt_q = app_wrk->event_queue; + app_wrk->api_client_index = a->api_client_index; + sm = segment_manager_get (app_wrk->connects_seg_manager); + fs = segment_manager_get_segment_w_lock (sm, 0); + + if (application_is_proxy (app)) { - segment_manager_init_del (sm); + application_setup_proxy (app); + /* The segment manager pool is reallocated because a new listener + * is added. Re-grab segment manager to avoid dangling reference */ + sm = segment_manager_get (app_wrk->connects_seg_manager); } - hash_unset (app_wrk->listeners_table, handle); - return 0; + ASSERT (vec_len (fs->ssvm.name) <= 128); + a->segment = &fs->ssvm; + a->segment_handle = segment_manager_segment_handle (sm, fs); + + segment_manager_segment_reader_unlock (sm); + + if (!application_is_builtin (app) && application_use_private_rx_mqs ()) + rv = app_rx_mqs_alloc (app); + + vec_free (app_name); + return rv; } /** - * Start listening local transport endpoint for requested transport. - * - * Creates a 'dummy' stream session with state LISTENING to be used in session - * lookups, prior to establishing connection. Requests transport to build - * it's own specific listening connection. + * Detach application from vpp */ -int -application_start_listen (application_t * app, - session_endpoint_cfg_t * sep_ext, - session_handle_t * res) +session_error_t +vnet_application_detach (vnet_app_detach_args_t *a) { - app_listener_t *app_listener; - u32 table_index, fib_proto; - session_endpoint_t *sep; - app_worker_t *app_wrk; - stream_session_t *ls; - session_handle_t lh; - session_type_t sst; + application_t *app; - /* - * Check if sep is already listened on - */ - sep = (session_endpoint_t *) sep_ext; - fib_proto = session_endpoint_fib_proto (sep); - table_index = application_session_table (app, fib_proto); - lh = session_lookup_endpoint_listener (table_index, sep, 1); - if (lh != SESSION_INVALID_HANDLE) + app = application_get_if_valid (a->app_index); + if (!app) { - ls = listen_session_get_from_handle (lh); - if (ls->app_index != app->app_index) - return VNET_API_ERROR_ADDRESS_IN_USE; + clib_warning ("app not attached"); + return SESSION_E_NOAPP; + } - app_wrk = app_worker_get (sep_ext->app_wrk_index); - if (ls->app_wrk_index == app_wrk->wrk_index) - return VNET_API_ERROR_ADDRESS_IN_USE; + app_interface_check_thread_and_barrier (vnet_application_detach, a); + application_detach_process (app, a->api_client_index); + return 0; +} - if (app_worker_start_listen (app_wrk, ls)) - return -1; +static u8 +session_endpoint_in_ns (session_endpoint_cfg_t *sep) +{ + u8 is_lep; - app_listener = app_listener_get (app, ls->listener_db_index); - app_listener->workers = clib_bitmap_set (app_listener->workers, - app_wrk->wrk_map_index, 1); + if (sep->flags & SESSION_ENDPT_CFG_F_PROXY_LISTEN) + return 1; - *res = listen_session_get_handle (ls); + is_lep = session_endpoint_is_local ((session_endpoint_t *) sep); + if (!is_lep && sep->sw_if_index != ENDPOINT_INVALID_INDEX + && !ip_interface_has_address (sep->sw_if_index, &sep->ip, sep->is_ip4)) + { + clib_warning ("sw_if_index %u not configured with ip %U", + sep->sw_if_index, format_ip46_address, &sep->ip, + sep->is_ip4); return 0; } - /* - * Allocate new listener for application - */ - sst = session_type_from_proto_and_ip (sep_ext->transport_proto, - sep_ext->is_ip4); - ls = listen_session_new (0, sst); - ls->app_index = app->app_index; - lh = listen_session_get_handle (ls); - if (session_listen (ls, sep_ext)) - goto err; + return (is_lep || ip_is_local (sep->fib_index, &sep->ip, sep->is_ip4)); +} +static void +session_endpoint_update_for_app (session_endpoint_cfg_t * sep, + application_t * app, u8 is_connect) +{ + app_namespace_t *app_ns; + u32 ns_index, fib_index; - ls = listen_session_get_from_handle (lh); - app_listener = app_listener_alloc (app); - ls->listener_db_index = app_listener->al_index; + ns_index = app->ns_index; - /* - * Setup app worker as a listener + /* App is a transport proto, so fetch the calling app's ns */ + if (app->flags & APP_OPTIONS_FLAGS_IS_TRANSPORT_APP) + ns_index = sep->ns_index; + + app_ns = app_namespace_get (ns_index); + if (!app_ns) + return; + + /* Ask transport and network to bind to/connect using local interface + * that "supports" app's namespace. This will fix our local connection + * endpoint. */ - app_wrk = app_worker_get (sep_ext->app_wrk_index); - ls->app_wrk_index = app_wrk->wrk_index; - if (app_worker_start_listen (app_wrk, ls)) - goto err; - app_listener->workers = clib_bitmap_set (app_listener->workers, - app_wrk->wrk_map_index, 1); - *res = lh; - return 0; + /* If in default namespace and user requested a fib index use it */ + if (ns_index == 0 && sep->fib_index != ENDPOINT_INVALID_INDEX) + fib_index = sep->fib_index; + else + fib_index = sep->is_ip4 ? app_ns->ip4_fib_index : app_ns->ip6_fib_index; + sep->peer.fib_index = fib_index; + sep->fib_index = fib_index; + + if (!is_connect) + { + sep->sw_if_index = app_ns->sw_if_index; + } + else + { + if (app_ns->sw_if_index != APP_NAMESPACE_INVALID_INDEX + && sep->peer.sw_if_index != ENDPOINT_INVALID_INDEX + && sep->peer.sw_if_index != app_ns->sw_if_index) + clib_warning ("Local sw_if_index different from app ns sw_if_index"); -err: - listen_session_del (ls); - return -1; + sep->peer.sw_if_index = app_ns->sw_if_index; + } } -/** - * Stop listening on session associated to handle - * - * @param handle listener handle - * @param app_index index of the app owning the handle. - * @param app_wrk_index index of the worker requesting the stop - */ -int -application_stop_listen (u32 app_index, u32 app_wrk_index, - session_handle_t handle) +session_error_t +vnet_listen (vnet_listen_args_t *a) { app_listener_t *app_listener; - stream_session_t *listener; app_worker_t *app_wrk; application_t *app; + int rv; - listener = listen_session_get_from_handle (handle); - app = application_get (app_index); - if (PREDICT_FALSE (!app || app->app_index != listener->app_index)) - { - clib_warning ("app doesn't own handle %llu!", handle); - return -1; - } + ASSERT (vlib_thread_is_main_w_barrier ()); - app_listener = app_listener_get (app, listener->listener_db_index); - if (!clib_bitmap_get (app_listener->workers, app_wrk_index)) - { - clib_warning ("worker %u not listening on handle %lu", app_wrk_index, - handle); + app = application_get_if_valid (a->app_index); + if (!app) + return SESSION_E_NOAPP; + + app_wrk = application_get_worker (app, a->wrk_map_index); + if (!app_wrk) + return SESSION_E_INVALID_APPWRK; + + a->sep_ext.app_wrk_index = app_wrk->wrk_index; + + session_endpoint_update_for_app (&a->sep_ext, app, 0 /* is_connect */ ); + if (!session_endpoint_in_ns (&a->sep_ext)) + return SESSION_E_INVALID_NS; + + /* + * Check if we already have an app listener + */ + app_listener = app_listener_lookup (app, &a->sep_ext); + if (app_listener) + { + if (app_listener->app_index != app->app_index) + return SESSION_E_ALREADY_LISTENING; + if ((rv = app_worker_start_listen (app_wrk, app_listener))) + return rv; + a->handle = app_listener_handle (app_listener); return 0; } - app_wrk = application_get_worker (app, app_wrk_index); - app_worker_stop_listen (app_wrk, handle); - clib_bitmap_set_no_check (app_listener->workers, app_wrk_index, 0); + /* + * Create new app listener + */ + if ((rv = app_listener_alloc_and_init (app, &a->sep_ext, &app_listener))) + return rv; - if (clib_bitmap_is_zero (app_listener->workers)) + if ((rv = app_worker_start_listen (app_wrk, app_listener))) { - session_stop_listen (listener); - app_listener_free (app, app_listener); - listen_session_del (listener); + app_listener_cleanup (app_listener); + return rv; } + a->handle = app_listener_handle (app_listener); return 0; } -int -app_worker_open_session (app_worker_t * app, session_endpoint_t * sep, - u32 api_context) +session_error_t +vnet_connect (vnet_connect_args_t *a) { - int rv; + app_worker_t *client_wrk; + application_t *client; - /* Make sure we have a segment manager for connects */ - app_worker_alloc_connects_segment_manager (app); + ASSERT (session_vlib_thread_is_cl_thread ()); - if ((rv = session_open (app->wrk_index, sep, api_context))) - return rv; + if (session_endpoint_is_zero (&a->sep)) + return SESSION_E_INVALID_RMT_IP; - return 0; + client = application_get (a->app_index); + session_endpoint_update_for_app (&a->sep_ext, client, 1 /* is_connect */ ); + client_wrk = application_get_worker (client, a->wrk_map_index); + + a->sep_ext.opaque = a->api_context; + + /* + * First check the local scope for locally attached destinations. + * If we have local scope, we pass *all* connects through it since we may + * have special policy rules even for non-local destinations, think proxy. + */ + if (application_has_local_scope (client)) + { + session_error_t rv; + + a->sep_ext.original_tp = a->sep_ext.transport_proto; + a->sep_ext.transport_proto = TRANSPORT_PROTO_NONE; + rv = app_worker_connect_session (client_wrk, &a->sep_ext, &a->sh); + a->sep_ext.transport_proto = a->sep_ext.original_tp; + if (!rv || rv != SESSION_E_LOCAL_CONNECT) + return rv; + } + /* + * Not connecting to a local server, propagate to transport + */ + return app_worker_connect_session (client_wrk, &a->sep_ext, &a->sh); } -int -app_worker_alloc_connects_segment_manager (app_worker_t * app_wrk) +session_error_t +vnet_unlisten (vnet_unlisten_args_t *a) { - segment_manager_t *sm; + app_worker_t *app_wrk; + app_listener_t *al; + application_t *app; + + ASSERT (vlib_thread_is_main_w_barrier ()); + + if (!(app = application_get_if_valid (a->app_index))) + return SESSION_E_NOAPP; + + if (!(al = app_listener_get_w_handle (a->handle))) + return SESSION_E_NOLISTEN; - if (app_wrk->connects_seg_manager == APP_INVALID_SEGMENT_MANAGER_INDEX) + if (al->app_index != app->app_index) { - sm = app_worker_alloc_segment_manager (app_wrk); - if (sm == 0) - return -1; - app_wrk->connects_seg_manager = segment_manager_index (sm); + clib_warning ("app doesn't own handle %llu!", a->handle); + return SESSION_E_OWNER; } - return 0; + + app_wrk = application_get_worker (app, a->wrk_map_index); + if (!app_wrk) + { + clib_warning ("no app %u worker %u", app->app_index, a->wrk_map_index); + return SESSION_E_INVALID_APPWRK; + } + + return app_worker_stop_listen (app_wrk, al); } -segment_manager_t * -app_worker_get_connect_segment_manager (app_worker_t * app) +session_error_t +vnet_shutdown_session (vnet_shutdown_args_t *a) { - ASSERT (app->connects_seg_manager != (u32) ~ 0); - return segment_manager_get (app->connects_seg_manager); + app_worker_t *app_wrk; + session_t *s; + + s = session_get_from_handle_if_valid (a->handle); + if (!s) + return SESSION_E_NOSESSION; + + app_wrk = app_worker_get (s->app_wrk_index); + if (app_wrk->app_index != a->app_index) + return SESSION_E_OWNER; + + /* We're peeking into another's thread pool. Make sure */ + ASSERT (s->session_index == session_index_from_handle (a->handle)); + + session_half_close (s); + return 0; } -segment_manager_t * -app_worker_get_listen_segment_manager (app_worker_t * app, - stream_session_t * listener) +session_error_t +vnet_disconnect_session (vnet_disconnect_args_t *a) { - uword *smp; - smp = hash_get (app->listeners_table, listen_session_get_handle (listener)); - ASSERT (smp != 0); - return segment_manager_get (*smp); + app_worker_t *app_wrk; + session_t *s; + + s = session_get_from_handle_if_valid (a->handle); + if (!s) + return SESSION_E_NOSESSION; + + app_wrk = app_worker_get (s->app_wrk_index); + if (app_wrk->app_index != a->app_index) + return SESSION_E_OWNER; + + /* We're peeking into another's thread pool. Make sure */ + ASSERT (s->session_index == session_index_from_handle (a->handle)); + + session_close (s); + return 0; } -clib_error_t * -vnet_app_worker_add_del (vnet_app_worker_add_del_args_t * a) +int +application_change_listener_owner (session_t * s, app_worker_t * app_wrk) { - svm_fifo_segment_private_t *fs; - app_worker_map_t *wrk_map; - app_worker_t *app_wrk; - segment_manager_t *sm; + app_worker_t *old_wrk = app_worker_get (s->app_wrk_index); + app_listener_t *app_listener; application_t *app; int rv; - app = application_get (a->app_index); - if (!app) - return clib_error_return_code (0, VNET_API_ERROR_INVALID_VALUE, 0, - "App %u does not exist", a->app_index); + if (!old_wrk) + return SESSION_E_INVALID_APPWRK; - if (a->is_add) - { - if ((rv = app_worker_alloc_and_init (app, &app_wrk))) - return clib_error_return_code (0, rv, 0, "app wrk init: %d", rv); + hash_unset (old_wrk->listeners_table, listen_session_get_handle (s)); + if (session_transport_service_type (s) == TRANSPORT_SERVICE_CL + && s->rx_fifo) + segment_manager_dealloc_fifos (s->rx_fifo, s->tx_fifo); - /* Map worker api index to the app */ - app_wrk->api_client_index = a->api_client_index; - application_api_table_add (app->app_index, a->api_client_index); + app = application_get (old_wrk->app_index); + if (!app) + return SESSION_E_NOAPP; - sm = segment_manager_get (app_wrk->first_segment_manager); - fs = segment_manager_get_segment_w_lock (sm, 0); - a->segment = &fs->ssvm; - a->segment_handle = segment_manager_segment_handle (sm, fs); - segment_manager_segment_reader_unlock (sm); - a->evt_q = app_wrk->event_queue; - a->wrk_map_index = app_wrk->wrk_map_index; - } - else - { - wrk_map = app_worker_map_get (app, a->wrk_map_index); - if (!wrk_map) - return clib_error_return_code (0, VNET_API_ERROR_INVALID_VALUE, 0, - "App %u does not have worker %u", - app->app_index, a->wrk_map_index); - app_wrk = app_worker_get (wrk_map->wrk_index); - if (!app_wrk) - return clib_error_return_code (0, VNET_API_ERROR_INVALID_VALUE, 0, - "No worker %u", a->wrk_map_index); - application_api_table_del (app_wrk->api_client_index); - app_worker_free (app_wrk); - app_worker_map_free (app, wrk_map); - if (application_n_workers (app) == 0) - application_free (app); - } - return 0; -} + app_listener = app_listener_get (s->al_index); -segment_manager_t * -application_get_local_segment_manager (app_worker_t * app) -{ - return segment_manager_get (app->local_segment_manager); -} + /* Only remove from lb for now */ + app_listener->workers = clib_bitmap_set (app_listener->workers, + old_wrk->wrk_map_index, 0); -segment_manager_t * -application_get_local_segment_manager_w_session (app_worker_t * app, - local_session_t * ls) -{ - stream_session_t *listener; - if (application_local_session_listener_has_transport (ls)) - { - listener = listen_session_get (ls->listener_index); - return app_worker_get_listen_segment_manager (app, listener); - } - return segment_manager_get (app->local_segment_manager); + if ((rv = app_worker_start_listen (app_wrk, app_listener))) + return rv; + + s->app_wrk_index = app_wrk->wrk_index; + + return 0; } int @@ -998,82 +1579,10 @@ application_has_global_scope (application_t * app) return app->flags & APP_OPTIONS_FLAGS_USE_GLOBAL_SCOPE; } -u8 -application_use_mq_for_ctrl (application_t * app) -{ - return app->flags & APP_OPTIONS_FLAGS_USE_MQ_FOR_CTRL_MSGS; -} - -/** - * Send an API message to the external app, to map new segment - */ int -app_worker_add_segment_notify (u32 app_wrk_index, u64 segment_handle) -{ - app_worker_t *app_wrk = app_worker_get (app_wrk_index); - application_t *app = application_get (app_wrk->app_index); - return app->cb_fns.add_segment_callback (app_wrk->api_client_index, - segment_handle); -} - -u32 -application_n_listeners (app_worker_t * app) -{ - return hash_elts (app->listeners_table); -} - -stream_session_t * -app_worker_first_listener (app_worker_t * app, u8 fib_proto, - u8 transport_proto) +application_original_dst_is_enabled (application_t *app) { - stream_session_t *listener; - u64 handle; - u32 sm_index; - u8 sst; - - sst = session_type_from_proto_and_ip (transport_proto, - fib_proto == FIB_PROTOCOL_IP4); - - /* *INDENT-OFF* */ - hash_foreach (handle, sm_index, app->listeners_table, ({ - listener = listen_session_get_from_handle (handle); - if (listener->session_type == sst - && listener->enqueue_epoch != SESSION_PROXY_LISTENER_INDEX) - return listener; - })); - /* *INDENT-ON* */ - - return 0; -} - -u8 -app_worker_application_is_builtin (app_worker_t * app_wrk) -{ - return app_wrk->app_is_builtin; -} - -stream_session_t * -application_proxy_listener (app_worker_t * app, u8 fib_proto, - u8 transport_proto) -{ - stream_session_t *listener; - u64 handle; - u32 sm_index; - u8 sst; - - sst = session_type_from_proto_and_ip (transport_proto, - fib_proto == FIB_PROTOCOL_IP4); - - /* *INDENT-OFF* */ - hash_foreach (handle, sm_index, app->listeners_table, ({ - listener = listen_session_get_from_handle (handle); - if (listener->session_type == sst - && listener->enqueue_epoch == SESSION_PROXY_LISTENER_INDEX) - return listener; - })); - /* *INDENT-ON* */ - - return 0; + return app->flags & APP_OPTIONS_FLAGS_GET_ORIGINAL_DST; } static clib_error_t * @@ -1085,8 +1594,9 @@ application_start_stop_proxy_fib_proto (application_t * app, u8 fib_proto, session_endpoint_cfg_t sep = SESSION_ENDPOINT_CFG_NULL; transport_connection_t *tc; app_worker_t *app_wrk; - stream_session_t *s; - u64 handle; + app_listener_t *al; + session_t *s; + u32 flags; /* TODO decide if we want proxy to be enabled for all workers */ app_wrk = application_get_default_worker (app); @@ -1100,14 +1610,21 @@ application_start_stop_proxy_fib_proto (application_t * app, u8 fib_proto, sep.sw_if_index = app_ns->sw_if_index; sep.transport_proto = transport_proto; sep.app_wrk_index = app_wrk->wrk_index; /* only default */ - application_start_listen (app, &sep, &handle); - s = listen_session_get_from_handle (handle); - s->enqueue_epoch = SESSION_PROXY_LISTENER_INDEX; + + /* force global scope listener */ + flags = app->flags; + app->flags &= ~APP_OPTIONS_FLAGS_USE_LOCAL_SCOPE; + app_listener_alloc_and_init (app, &sep, &al); + app->flags = flags; + + app_worker_start_listen (app_wrk, al); + s = listen_session_get (al->session_index); + s->flags |= SESSION_F_PROXY; } } else { - s = application_proxy_listener (app_wrk, fib_proto, transport_proto); + s = app_worker_proxy_listener (app_wrk, fib_proto, transport_proto); ASSERT (s); } @@ -1164,818 +1681,53 @@ void application_start_stop_proxy (application_t * app, transport_proto_t transport_proto, u8 is_start) { - if (application_has_local_scope (app)) - application_start_stop_proxy_local_scope (app, transport_proto, is_start); - - if (application_has_global_scope (app)) - { - application_start_stop_proxy_fib_proto (app, FIB_PROTOCOL_IP4, - transport_proto, is_start); - application_start_stop_proxy_fib_proto (app, FIB_PROTOCOL_IP6, - transport_proto, is_start); - } -} - -void -application_setup_proxy (application_t * app) -{ - u16 transports = app->proxied_transports; - transport_proto_t tp; - - ASSERT (application_is_proxy (app)); - - /* *INDENT-OFF* */ - transport_proto_foreach (tp, ({ - if (transports & (1 << tp)) - application_start_stop_proxy (app, tp, 1); - })); - /* *INDENT-ON* */ -} - -void -application_remove_proxy (application_t * app) -{ - u16 transports = app->proxied_transports; - transport_proto_t tp; - - ASSERT (application_is_proxy (app)); - - /* *INDENT-OFF* */ - transport_proto_foreach (tp, ({ - if (transports & (1 << tp)) - application_start_stop_proxy (app, tp, 0); - })); - /* *INDENT-ON* */ -} - -segment_manager_properties_t * -application_segment_manager_properties (application_t * app) -{ - return &app->sm_properties; -} - -segment_manager_properties_t * -application_get_segment_manager_properties (u32 app_index) -{ - application_t *app = application_get (app_index); - return &app->sm_properties; -} - -static inline int -app_enqueue_evt (svm_msg_q_t * mq, svm_msg_q_msg_t * msg, u8 lock) -{ - if (PREDICT_FALSE (svm_msg_q_is_full (mq))) - { - clib_warning ("evt q full"); - svm_msg_q_free_msg (mq, msg); - if (lock) - svm_msg_q_unlock (mq); - return -1; - } - - if (lock) - { - svm_msg_q_add_and_unlock (mq, msg); - return 0; - } - - /* Even when not locking the ring, we must wait for queue mutex */ - if (svm_msg_q_add (mq, msg, SVM_Q_WAIT)) - { - clib_warning ("msg q add returned"); - return -1; - } - return 0; -} - -static inline int -app_send_io_evt_rx (app_worker_t * app_wrk, stream_session_t * s, u8 lock) -{ - session_event_t *evt; - svm_msg_q_msg_t msg; - svm_msg_q_t *mq; - - if (PREDICT_FALSE (s->session_state != SESSION_STATE_READY - && s->session_state != SESSION_STATE_LISTENING)) - { - /* Session is closed so app will never clean up. Flush rx fifo */ - if (s->session_state == SESSION_STATE_CLOSED) - svm_fifo_dequeue_drop_all (s->server_rx_fifo); - return 0; - } - - if (app_worker_application_is_builtin (app_wrk)) - { - application_t *app = application_get (app_wrk->app_index); - return app->cb_fns.builtin_app_rx_callback (s); - } - - if (svm_fifo_has_event (s->server_rx_fifo) - || svm_fifo_is_empty (s->server_rx_fifo)) - return 0; - - mq = app_wrk->event_queue; - if (lock) - svm_msg_q_lock (mq); - - if (PREDICT_FALSE (svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING))) - { - clib_warning ("evt q rings full"); - if (lock) - svm_msg_q_unlock (mq); - return -1; - } - - msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); - ASSERT (!svm_msg_q_msg_is_invalid (&msg)); - - evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg); - evt->fifo = s->server_rx_fifo; - evt->event_type = FIFO_EVENT_APP_RX; - - (void) svm_fifo_set_event (s->server_rx_fifo); - - if (app_enqueue_evt (mq, &msg, lock)) - return -1; - return 0; -} - -static inline int -app_send_io_evt_tx (app_worker_t * app_wrk, stream_session_t * s, u8 lock) -{ - svm_msg_q_t *mq; - session_event_t *evt; - svm_msg_q_msg_t msg; - - if (app_worker_application_is_builtin (app_wrk)) - return 0; - - mq = app_wrk->event_queue; - if (lock) - svm_msg_q_lock (mq); - - if (PREDICT_FALSE (svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING))) - { - clib_warning ("evt q rings full"); - if (lock) - svm_msg_q_unlock (mq); - return -1; - } - - msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); - ASSERT (!svm_msg_q_msg_is_invalid (&msg)); - - evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg); - evt->event_type = FIFO_EVENT_APP_TX; - evt->fifo = s->server_tx_fifo; - - return app_enqueue_evt (mq, &msg, lock); -} - -/* *INDENT-OFF* */ -typedef int (app_send_evt_handler_fn) (app_worker_t *app, - stream_session_t *s, - u8 lock); -static app_send_evt_handler_fn * const app_send_evt_handler_fns[3] = { - app_send_io_evt_rx, - 0, - app_send_io_evt_tx, -}; -/* *INDENT-ON* */ - -/** - * Send event to application - * - * Logic from queue perspective is non-blocking. If there's - * not enough space to enqueue a message, we return. - */ -int -app_worker_send_event (app_worker_t * app, stream_session_t * s, u8 evt_type) -{ - ASSERT (app && evt_type <= FIFO_EVENT_APP_TX); - return app_send_evt_handler_fns[evt_type] (app, s, 0 /* lock */ ); -} - -/** - * Send event to application - * - * Logic from queue perspective is blocking. However, if queue is full, - * we return. - */ -int -app_worker_lock_and_send_event (app_worker_t * app, stream_session_t * s, - u8 evt_type) -{ - return app_send_evt_handler_fns[evt_type] (app, s, 1 /* lock */ ); -} - -local_session_t * -application_local_session_alloc (app_worker_t * app_wrk) -{ - local_session_t *s; - pool_get (app_wrk->local_sessions, s); - clib_memset (s, 0, sizeof (*s)); - s->app_wrk_index = app_wrk->wrk_index; - s->session_index = s - app_wrk->local_sessions; - s->session_type = session_type_from_proto_and_ip (TRANSPORT_PROTO_NONE, 0); - return s; -} - -void -application_local_session_free (app_worker_t * app, local_session_t * s) -{ - pool_put (app->local_sessions, s); - if (CLIB_DEBUG) - clib_memset (s, 0xfc, sizeof (*s)); -} - -local_session_t * -application_get_local_session (app_worker_t * app_wrk, u32 session_index) -{ - if (pool_is_free_index (app_wrk->local_sessions, session_index)) - return 0; - return pool_elt_at_index (app_wrk->local_sessions, session_index); -} - -local_session_t * -application_get_local_session_from_handle (session_handle_t handle) -{ - app_worker_t *server_wrk; - u32 session_index, server_wrk_index; - local_session_parse_handle (handle, &server_wrk_index, &session_index); - server_wrk = app_worker_get_if_valid (server_wrk_index); - if (!server_wrk) - return 0; - return application_get_local_session (server_wrk, session_index); -} - -local_session_t * -application_local_listen_session_alloc (application_t * app) -{ - local_session_t *ll; - pool_get (app->local_listen_sessions, ll); - clib_memset (ll, 0, sizeof (*ll)); - return ll; -} - -u32 -application_local_listener_index (application_t * app, local_session_t * ll) -{ - return (ll - app->local_listen_sessions); -} - -void -application_local_listen_session_free (application_t * app, - local_session_t * ll) -{ - pool_put (app->local_listen_sessions, ll); - if (CLIB_DEBUG) - clib_memset (ll, 0xfb, sizeof (*ll)); -} - -int -application_start_local_listen (application_t * app, - session_endpoint_cfg_t * sep_ext, - session_handle_t * handle) -{ - app_listener_t *app_listener; - session_endpoint_t *sep; - app_worker_t *app_wrk; - session_handle_t lh; - local_session_t *ll; - u32 table_index; - - sep = (session_endpoint_t *) sep_ext; - table_index = application_local_session_table (app); - app_wrk = app_worker_get (sep_ext->app_wrk_index); - - /* An exact sep match, as opposed to session_lookup_local_listener */ - lh = session_lookup_endpoint_listener (table_index, sep, 1); - if (lh != SESSION_INVALID_HANDLE) - { - ll = application_get_local_listener_w_handle (lh); - if (ll->app_index != app->app_index) - return VNET_API_ERROR_ADDRESS_IN_USE; - - if (ll->app_wrk_index == app_wrk->wrk_index) - return VNET_API_ERROR_ADDRESS_IN_USE; - - app_listener = app_local_listener_get (app, ll->listener_db_index); - app_listener->workers = clib_bitmap_set (app_listener->workers, - app_wrk->wrk_map_index, 1); - *handle = application_local_session_handle (ll); - return 0; - } - - ll = application_local_listen_session_alloc (app); - ll->session_type = session_type_from_proto_and_ip (TRANSPORT_PROTO_NONE, 0); - ll->app_wrk_index = app_wrk->app_index; - ll->session_index = application_local_listener_index (app, ll); - ll->port = sep_ext->port; - /* Store the original session type for the unbind */ - ll->listener_session_type = - session_type_from_proto_and_ip (sep_ext->transport_proto, - sep_ext->is_ip4); - ll->transport_listener_index = ~0; - ll->app_index = app->app_index; - - app_listener = app_local_listener_alloc (app); - ll->listener_db_index = app_listener->al_index; - app_listener->workers = clib_bitmap_set (app_listener->workers, - app_wrk->wrk_map_index, 1); - - *handle = application_local_session_handle (ll); - session_lookup_add_session_endpoint (table_index, sep, *handle); - - return 0; -} - -/** - * Clean up local session table. If we have a listener session use it to - * find the port and proto. If not, the handle must be a local table handle - * so parse it. - */ -int -application_stop_local_listen (u32 app_index, u32 wrk_map_index, - session_handle_t lh) -{ - session_endpoint_t sep = SESSION_ENDPOINT_NULL; - u32 table_index, ll_index, server_index; - app_listener_t *app_listener; - app_worker_t *server_wrk; - stream_session_t *sl = 0; - local_session_t *ll, *ls; - application_t *server; - - server = application_get (app_index); - table_index = application_local_session_table (server); - - /* We have both local and global table binds. Figure from global what - * the sep we should be cleaning up is. - */ - if (!session_handle_is_local (lh)) - { - sl = listen_session_get_from_handle (lh); - if (!sl || listen_session_get_local_session_endpoint (sl, &sep)) - { - clib_warning ("broken listener"); - return -1; - } - lh = session_lookup_endpoint_listener (table_index, &sep, 0); - if (lh == SESSION_INVALID_HANDLE) - return -1; - } - - local_session_parse_handle (lh, &server_index, &ll_index); - if (PREDICT_FALSE (server_index != app_index)) - { - clib_warning ("app %u does not own local handle 0x%lx", app_index, lh); - return -1; - } - - ll = application_get_local_listen_session (server, ll_index); - if (PREDICT_FALSE (!ll)) - { - clib_warning ("no local listener"); - return -1; - } - - app_listener = app_local_listener_get (server, ll->listener_db_index); - if (!clib_bitmap_get (app_listener->workers, wrk_map_index)) - { - clib_warning ("app wrk %u not listening on handle %lu", wrk_map_index, - lh); - return -1; - } - - server_wrk = application_get_worker (server, wrk_map_index); - /* *INDENT-OFF* */ - pool_foreach (ls, server_wrk->local_sessions, ({ - if (ls->listener_index == ll->session_index) - application_local_session_disconnect (server_wrk->app_index, ls); - })); - /* *INDENT-ON* */ - - clib_bitmap_set_no_check (app_listener->workers, wrk_map_index, 0); - if (clib_bitmap_is_zero (app_listener->workers)) - { - app_local_listener_free (server, app_listener); - application_local_listener_session_endpoint (ll, &sep); - session_lookup_del_session_endpoint (table_index, &sep); - application_local_listen_session_free (server, ll); - } - - return 0; -} - -static void -application_local_session_fix_eventds (svm_msg_q_t * sq, svm_msg_q_t * cq) -{ - int fd; - - /* - * segment manager initializes only the producer eventds, since vpp is - * typically the producer. But for local sessions, we also pass to the - * apps the mqs they listen on for events from peer apps, so they are also - * consumer fds. - */ - fd = svm_msg_q_get_producer_eventfd (sq); - svm_msg_q_set_consumer_eventfd (sq, fd); - fd = svm_msg_q_get_producer_eventfd (cq); - svm_msg_q_set_consumer_eventfd (cq, fd); -} - -int -application_local_session_connect (app_worker_t * client_wrk, - app_worker_t * server_wrk, - local_session_t * ll, u32 opaque) -{ - u32 seg_size, evt_q_sz, evt_q_elts, margin = 16 << 10; - segment_manager_properties_t *props, *cprops; - u32 round_rx_fifo_sz, round_tx_fifo_sz; - int rv, has_transport, seg_index; - svm_fifo_segment_private_t *seg; - application_t *server, *client; - segment_manager_t *sm; - local_session_t *ls; - svm_msg_q_t *sq, *cq; - u64 segment_handle; - - ls = application_local_session_alloc (server_wrk); - server = application_get (server_wrk->app_index); - client = application_get (client_wrk->app_index); - - props = application_segment_manager_properties (server); - cprops = application_segment_manager_properties (client); - evt_q_elts = props->evt_q_size + cprops->evt_q_size; - evt_q_sz = segment_manager_evt_q_expected_size (evt_q_elts); - round_rx_fifo_sz = 1 << max_log2 (props->rx_fifo_size); - round_tx_fifo_sz = 1 << max_log2 (props->tx_fifo_size); - seg_size = round_rx_fifo_sz + round_tx_fifo_sz + evt_q_sz + margin; - - has_transport = session_has_transport ((stream_session_t *) ll); - if (!has_transport) - { - /* Local sessions don't have backing transport */ - ls->port = ll->port; - sm = application_get_local_segment_manager (server_wrk); - } - else - { - stream_session_t *sl = (stream_session_t *) ll; - transport_connection_t *tc; - tc = listen_session_get_transport (sl); - ls->port = tc->lcl_port; - sm = app_worker_get_listen_segment_manager (server_wrk, sl); - } - - seg_index = segment_manager_add_segment (sm, seg_size); - if (seg_index < 0) - { - clib_warning ("failed to add new cut-through segment"); - return seg_index; - } - seg = segment_manager_get_segment_w_lock (sm, seg_index); - sq = segment_manager_alloc_queue (seg, props); - cq = segment_manager_alloc_queue (seg, cprops); - - if (props->use_mq_eventfd) - application_local_session_fix_eventds (sq, cq); - - ls->server_evt_q = pointer_to_uword (sq); - ls->client_evt_q = pointer_to_uword (cq); - rv = segment_manager_try_alloc_fifos (seg, props->rx_fifo_size, - props->tx_fifo_size, - &ls->server_rx_fifo, - &ls->server_tx_fifo); - if (rv) - { - clib_warning ("failed to add fifos in cut-through segment"); - segment_manager_segment_reader_unlock (sm); - goto failed; - } - ls->server_rx_fifo->ct_session_index = ls->session_index; - ls->server_tx_fifo->ct_session_index = ls->session_index; - ls->svm_segment_index = seg_index; - ls->listener_index = ll->session_index; - ls->client_wrk_index = client_wrk->wrk_index; - ls->client_opaque = opaque; - ls->listener_session_type = ll->session_type; - ls->session_state = SESSION_STATE_READY; - - segment_handle = segment_manager_segment_handle (sm, seg); - if ((rv = server->cb_fns.add_segment_callback (server_wrk->api_client_index, - segment_handle))) - { - clib_warning ("failed to notify server of new segment"); - segment_manager_segment_reader_unlock (sm); - goto failed; - } - segment_manager_segment_reader_unlock (sm); - if ((rv = server->cb_fns.session_accept_callback ((stream_session_t *) ls))) - { - clib_warning ("failed to send accept cut-through notify to server"); - goto failed; - } - if (server->flags & APP_OPTIONS_FLAGS_IS_BUILTIN) - application_local_session_connect_notify (ls); - - return 0; - -failed: - if (!has_transport) - segment_manager_del_segment (sm, seg); - return rv; -} - -static uword -application_client_local_connect_key (local_session_t * ls) -{ - return ((uword) ls->app_wrk_index << 32 | (uword) ls->session_index); -} - -static void -application_client_local_connect_key_parse (uword key, u32 * app_wrk_index, - u32 * session_index) -{ - *app_wrk_index = key >> 32; - *session_index = key & 0xFFFFFFFF; -} - -int -application_local_session_connect_notify (local_session_t * ls) -{ - svm_fifo_segment_private_t *seg; - app_worker_t *client_wrk, *server_wrk; - segment_manager_t *sm; - application_t *client; - int rv, is_fail = 0; - u64 segment_handle; - uword client_key; - - client_wrk = app_worker_get (ls->client_wrk_index); - server_wrk = app_worker_get (ls->app_wrk_index); - client = application_get (client_wrk->app_index); - - sm = application_get_local_segment_manager_w_session (server_wrk, ls); - seg = segment_manager_get_segment_w_lock (sm, ls->svm_segment_index); - segment_handle = segment_manager_segment_handle (sm, seg); - if ((rv = client->cb_fns.add_segment_callback (client_wrk->api_client_index, - segment_handle))) - { - clib_warning ("failed to notify client %u of new segment", - ls->client_wrk_index); - segment_manager_segment_reader_unlock (sm); - application_local_session_disconnect (ls->client_wrk_index, ls); - is_fail = 1; - } - else - { - segment_manager_segment_reader_unlock (sm); - } - - client->cb_fns.session_connected_callback (client_wrk->wrk_index, - ls->client_opaque, - (stream_session_t *) ls, - is_fail); - - client_key = application_client_local_connect_key (ls); - hash_set (client_wrk->local_connects, client_key, client_key); - return 0; -} - -int -application_local_session_cleanup (app_worker_t * client_wrk, - app_worker_t * server_wrk, - local_session_t * ls) -{ - svm_fifo_segment_private_t *seg; - stream_session_t *listener; - segment_manager_t *sm; - uword client_key; - u8 has_transport; - - /* Retrieve listener transport type as it is the one that decides where - * the fifos are allocated */ - has_transport = application_local_session_listener_has_transport (ls); - if (!has_transport) - sm = application_get_local_segment_manager_w_session (server_wrk, ls); - else - { - listener = listen_session_get (ls->listener_index); - sm = app_worker_get_listen_segment_manager (server_wrk, listener); - } - - seg = segment_manager_get_segment (sm, ls->svm_segment_index); - if (client_wrk) - { - client_key = application_client_local_connect_key (ls); - hash_unset (client_wrk->local_connects, client_key); - } - - if (!has_transport) - { - application_t *server = application_get (server_wrk->app_index); - u64 segment_handle = segment_manager_segment_handle (sm, seg); - server->cb_fns.del_segment_callback (server_wrk->api_client_index, - segment_handle); - if (client_wrk) - { - application_t *client = application_get (client_wrk->app_index); - client->cb_fns.del_segment_callback (client_wrk->api_client_index, - segment_handle); - } - segment_manager_del_segment (sm, seg); - } - - application_local_session_free (server_wrk, ls); - - return 0; -} - -int -application_local_session_disconnect (u32 app_index, local_session_t * ls) -{ - app_worker_t *client_wrk, *server_wrk; - u8 is_server = 0, is_client = 0; - application_t *app; - - app = application_get_if_valid (app_index); - if (!app) - return 0; - - client_wrk = app_worker_get_if_valid (ls->client_wrk_index); - server_wrk = app_worker_get (ls->app_wrk_index); - - if (server_wrk->app_index == app_index) - is_server = 1; - else if (client_wrk && client_wrk->app_index == app_index) - is_client = 1; - - if (!is_server && !is_client) - { - clib_warning ("app %u is neither client nor server for session 0x%lx", - app_index, application_local_session_handle (ls)); - return VNET_API_ERROR_INVALID_VALUE; - } - - if (ls->session_state == SESSION_STATE_CLOSED) - return application_local_session_cleanup (client_wrk, server_wrk, ls); - - if (app_index == ls->client_wrk_index) - { - mq_send_local_session_disconnected_cb (ls->app_wrk_index, ls); - } - else - { - if (!client_wrk) - { - return application_local_session_cleanup (client_wrk, server_wrk, - ls); - } - else if (ls->session_state < SESSION_STATE_READY) - { - application_t *client = application_get (client_wrk->app_index); - client->cb_fns.session_connected_callback (client_wrk->wrk_index, - ls->client_opaque, - (stream_session_t *) ls, - 1 /* is_fail */ ); - ls->session_state = SESSION_STATE_CLOSED; - return application_local_session_cleanup (client_wrk, server_wrk, - ls); - } - else - { - mq_send_local_session_disconnected_cb (client_wrk->wrk_index, ls); - } - } - - ls->session_state = SESSION_STATE_CLOSED; - - return 0; -} - -int -application_local_session_disconnect_w_index (u32 app_wrk_index, u32 ls_index) -{ - app_worker_t *app_wrk; - local_session_t *ls; - app_wrk = app_worker_get (app_wrk_index); - ls = application_get_local_session (app_wrk, ls_index); - return application_local_session_disconnect (app_wrk_index, ls); -} - -void -app_worker_local_sessions_free (app_worker_t * app_wrk) -{ - u32 index, server_wrk_index, session_index; - u64 handle, *handles = 0; - app_worker_t *server_wrk; - segment_manager_t *sm; - local_session_t *ls; - int i; - - /* - * Local sessions - */ - if (app_wrk->local_sessions) - { - /* *INDENT-OFF* */ - pool_foreach (ls, app_wrk->local_sessions, ({ - application_local_session_disconnect (app_wrk->wrk_index, ls); - })); - /* *INDENT-ON* */ - } - - /* - * Local connects - */ - vec_reset_length (handles); - /* *INDENT-OFF* */ - hash_foreach (handle, index, app_wrk->local_connects, ({ - vec_add1 (handles, handle); - })); - /* *INDENT-ON* */ + if (application_has_local_scope (app)) + application_start_stop_proxy_local_scope (app, transport_proto, is_start); - for (i = 0; i < vec_len (handles); i++) + if (application_has_global_scope (app)) { - application_client_local_connect_key_parse (handles[i], - &server_wrk_index, - &session_index); - server_wrk = app_worker_get_if_valid (server_wrk_index); - if (server_wrk) - { - ls = application_get_local_session (server_wrk, session_index); - application_local_session_disconnect (app_wrk->wrk_index, ls); - } + application_start_stop_proxy_fib_proto (app, FIB_PROTOCOL_IP4, + transport_proto, is_start); + application_start_stop_proxy_fib_proto (app, FIB_PROTOCOL_IP6, + transport_proto, is_start); } - - sm = segment_manager_get (app_wrk->local_segment_manager); - sm->app_wrk_index = SEGMENT_MANAGER_INVALID_APP_INDEX; - segment_manager_del (sm); } -clib_error_t * -vnet_app_add_tls_cert (vnet_app_add_tls_cert_args_t * a) +void +application_setup_proxy (application_t * app) { - application_t *app; - app = application_get (a->app_index); - if (!app) - return clib_error_return_code (0, VNET_API_ERROR_APPLICATION_NOT_ATTACHED, - 0, "app %u doesn't exist", a->app_index); - app->tls_cert = vec_dup (a->cert); - return 0; -} + u16 transports = app->proxied_transports; + transport_proto_t tp; -clib_error_t * -vnet_app_add_tls_key (vnet_app_add_tls_key_args_t * a) -{ - application_t *app; - app = application_get (a->app_index); - if (!app) - return clib_error_return_code (0, VNET_API_ERROR_APPLICATION_NOT_ATTACHED, - 0, "app %u doesn't exist", a->app_index); - app->tls_key = vec_dup (a->key); - return 0; + ASSERT (application_is_proxy (app)); + + transport_proto_foreach (tp, transports) + application_start_stop_proxy (app, tp, 1); } -u8 * -format_app_worker_listener (u8 * s, va_list * args) +void +application_remove_proxy (application_t * app) { - app_worker_t *app_wrk = va_arg (*args, app_worker_t *); - u64 handle = va_arg (*args, u64); - u32 sm_index = va_arg (*args, u32); - int verbose = va_arg (*args, int); - stream_session_t *listener; - const u8 *app_name; - u8 *str; - - if (!app_wrk) - { - if (verbose) - s = format (s, "%-40s%-25s%=10s%-15s%-15s%-10s", "Connection", "App", - "Wrk", "API Client", "ListenerID", "SegManager"); - else - s = format (s, "%-40s%-25s%=10s", "Connection", "App", "Wrk"); + u16 transports = app->proxied_transports; + transport_proto_t tp; - return s; - } + ASSERT (application_is_proxy (app)); - app_name = application_name_from_index (app_wrk->app_index); - listener = listen_session_get_from_handle (handle); - str = format (0, "%U", format_stream_session, listener, verbose); + transport_proto_foreach (tp, transports) + application_start_stop_proxy (app, tp, 0); +} - if (verbose) - { - char buf[32]; - sprintf (buf, "%u(%u)", app_wrk->wrk_map_index, app_wrk->wrk_index); - s = format (s, "%-40s%-25s%=10s%-15u%-15u%-10u", str, app_name, - buf, app_wrk->api_client_index, handle, sm_index); - } - else - s = format (s, "%-40s%-25s%=10u", str, app_name, app_wrk->wrk_map_index); +segment_manager_props_t * +application_segment_manager_properties (application_t * app) +{ + return &app->sm_properties; +} - return s; +segment_manager_props_t * +application_get_segment_manager_properties (u32 app_index) +{ + application_t *app = application_get (app_index); + return &app->sm_properties; } static void @@ -1989,13 +1741,12 @@ application_format_listeners (application_t * app, int verbose) if (!app) { - vlib_cli_output (vm, "%U", format_app_worker_listener, 0 /* header */ , + vlib_cli_output (vm, "%U", format_app_worker_listener, NULL /* header */, 0, 0, verbose); return; } - /* *INDENT-OFF* */ - pool_foreach (wrk_map, app->worker_maps, ({ + pool_foreach (wrk_map, app->worker_maps) { app_wrk = app_worker_get (wrk_map->wrk_index); if (hash_elts (app_wrk->listeners_table) == 0) continue; @@ -2003,71 +1754,7 @@ application_format_listeners (application_t * app, int verbose) vlib_cli_output (vm, "%U", format_app_worker_listener, app_wrk, handle, sm_index, verbose); })); - })); - /* *INDENT-ON* */ -} - -static void -app_worker_format_connects (app_worker_t * app_wrk, int verbose) -{ - svm_fifo_segment_private_t *fifo_segment; - vlib_main_t *vm = vlib_get_main (); - segment_manager_t *sm; - const u8 *app_name; - u8 *s = 0; - - /* Header */ - if (!app_wrk) - { - if (verbose) - vlib_cli_output (vm, "%-40s%-20s%-15s%-10s", "Connection", "App", - "API Client", "SegManager"); - else - vlib_cli_output (vm, "%-40s%-20s", "Connection", "App"); - return; - } - - if (app_wrk->connects_seg_manager == (u32) ~ 0) - return; - - app_name = application_name_from_index (app_wrk->app_index); - - /* Across all fifo segments */ - sm = segment_manager_get (app_wrk->connects_seg_manager); - - /* *INDENT-OFF* */ - segment_manager_foreach_segment_w_lock (fifo_segment, sm, ({ - svm_fifo_t *fifo; - u8 *str; - - fifo = svm_fifo_segment_get_fifo_list (fifo_segment); - while (fifo) - { - u32 session_index, thread_index; - stream_session_t *session; - - session_index = fifo->master_session_index; - thread_index = fifo->master_thread_index; - - session = session_get (session_index, thread_index); - str = format (0, "%U", format_stream_session, session, verbose); - - if (verbose) - s = format (s, "%-40s%-20s%-15u%-10u", str, app_name, - app_wrk->api_client_index, app_wrk->connects_seg_manager); - else - s = format (s, "%-40s%-20s", str, app_name); - - vlib_cli_output (vm, "%v", s); - vec_reset_length (s); - vec_free (str); - - fifo = fifo->next; - } - vec_free (s); - })); - /* *INDENT-ON* */ - + } } static void @@ -2082,156 +1769,73 @@ application_format_connects (application_t * app, int verbose) return; } - /* *INDENT-OFF* */ - pool_foreach (wrk_map, app->worker_maps, ({ + pool_foreach (wrk_map, app->worker_maps) { app_wrk = app_worker_get (wrk_map->wrk_index); app_worker_format_connects (app_wrk, verbose); - })); - /* *INDENT-ON* */ -} - -static void -app_worker_format_local_sessions (app_worker_t * app_wrk, int verbose) -{ - vlib_main_t *vm = vlib_get_main (); - local_session_t *ls; - transport_proto_t tp; - u8 *conn = 0; - - /* Header */ - if (app_wrk == 0) - { - vlib_cli_output (vm, "%-40s%-15s%-20s", "Connection", "ServerApp", - "ClientApp"); - return; - } - - if (!pool_elts (app_wrk->local_sessions) - && !pool_elts (app_wrk->local_connects)) - return; - - /* *INDENT-OFF* */ - pool_foreach (ls, app_wrk->local_sessions, ({ - tp = session_type_transport_proto(ls->listener_session_type); - conn = format (0, "[L][%U] *:%u", format_transport_proto_short, tp, - ls->port); - vlib_cli_output (vm, "%-40v%-15u%-20u", conn, ls->app_wrk_index, - ls->client_wrk_index); - vec_reset_length (conn); - })); - /* *INDENT-ON* */ - - vec_free (conn); + } } -static void -application_format_local_sessions (application_t * app, int verbose) -{ - vlib_main_t *vm = vlib_get_main (); - app_worker_map_t *wrk_map; - app_worker_t *app_wrk; - transport_proto_t tp; - local_session_t *ls; - u8 *conn = 0; - - if (!app) - { - app_worker_format_local_sessions (0, verbose); - return; - } - - /* - * Format local listeners - */ - - /* *INDENT-OFF* */ - pool_foreach (ls, app->local_listen_sessions, ({ - tp = session_type_transport_proto (ls->listener_session_type); - conn = format (0, "[L][%U] *:%u", format_transport_proto_short, tp, - ls->port); - vlib_cli_output (vm, "%-40v%-15u%-20s", conn, ls->app_wrk_index, "*"); - vec_reset_length (conn); - })); - /* *INDENT-ON* */ - - /* - * Format local accepted/connected sessions - */ - /* *INDENT-OFF* */ - pool_foreach (wrk_map, app->worker_maps, ({ - app_wrk = app_worker_get (wrk_map->wrk_index); - app_worker_format_local_sessions (app_wrk, verbose); - })); - /* *INDENT-ON* */ +u8 * +format_cert_key_pair (u8 * s, va_list * args) +{ + app_cert_key_pair_t *ckpair = va_arg (*args, app_cert_key_pair_t *); + int key_len = 0, cert_len = 0; + cert_len = vec_len (ckpair->cert); + key_len = vec_len (ckpair->key); + if (ckpair->cert_key_index == 0) + s = format (s, "DEFAULT (cert:%d, key:%d)", cert_len, key_len); + else + s = format (s, "%d (cert:%d, key:%d)", ckpair->cert_key_index, + cert_len, key_len); + return s; } -static void -app_worker_format_local_connects (app_worker_t * app, int verbose) -{ - vlib_main_t *vm = vlib_get_main (); - u32 app_wrk_index, session_index; - app_worker_t *server_wrk; - local_session_t *ls; - uword client_key; - u64 value; - - /* Header */ - if (app == 0) - { - if (verbose) - vlib_cli_output (vm, "%-40s%-15s%-20s%-10s", "Connection", "App", - "Peer App", "SegManager"); - else - vlib_cli_output (vm, "%-40s%-15s%-20s", "Connection", "App", - "Peer App"); - return; +u8 * +format_crypto_engine (u8 * s, va_list * args) +{ + u32 engine = va_arg (*args, u32); + switch (engine) + { + case CRYPTO_ENGINE_NONE: + return format (s, "none"); + case CRYPTO_ENGINE_MBEDTLS: + return format (s, "mbedtls"); + case CRYPTO_ENGINE_OPENSSL: + return format (s, "openssl"); + case CRYPTO_ENGINE_PICOTLS: + return format (s, "picotls"); + case CRYPTO_ENGINE_VPP: + return format (s, "vpp"); + default: + return format (s, "unknown engine"); } - - if (!app->local_connects) - return; - - /* *INDENT-OFF* */ - hash_foreach (client_key, value, app->local_connects, ({ - application_client_local_connect_key_parse (client_key, &app_wrk_index, - &session_index); - server_wrk = app_worker_get (app_wrk_index); - ls = application_get_local_session (server_wrk, session_index); - vlib_cli_output (vm, "%-40s%-15s%-20s", "TODO", ls->app_wrk_index, - ls->client_wrk_index); - })); - /* *INDENT-ON* */ + return s; } -static void -application_format_local_connects (application_t * app, int verbose) +uword +unformat_crypto_engine (unformat_input_t * input, va_list * args) { - app_worker_map_t *wrk_map; - app_worker_t *app_wrk; - - if (!app) - { - app_worker_format_local_connects (0, verbose); - return; - } - - /* *INDENT-OFF* */ - pool_foreach (wrk_map, app->worker_maps, ({ - app_wrk = app_worker_get (wrk_map->wrk_index); - app_worker_format_local_connects (app_wrk, verbose); - })); - /* *INDENT-ON* */ + u8 *a = va_arg (*args, u8 *); + if (unformat (input, "mbedtls")) + *a = CRYPTO_ENGINE_MBEDTLS; + else if (unformat (input, "openssl")) + *a = CRYPTO_ENGINE_OPENSSL; + else if (unformat (input, "picotls")) + *a = CRYPTO_ENGINE_PICOTLS; + else if (unformat (input, "vpp")) + *a = CRYPTO_ENGINE_VPP; + else + return 0; + return 1; } u8 * -format_application_worker (u8 * s, va_list * args) +format_crypto_context (u8 * s, va_list * args) { - app_worker_t *app_wrk = va_arg (*args, app_worker_t *); - u32 indent = 1; - - s = format (s, "%U wrk-index %u app-index %u map-index %u " - "api-client-index %d\n", format_white_space, indent, - app_wrk->wrk_index, app_wrk->app_index, app_wrk->wrk_map_index, - app_wrk->api_client_index); + crypto_context_t *crctx = va_arg (*args, crypto_context_t *); + s = format (s, "[0x%x][sub%d,ckpair%x]", crctx->ctx_index, + crctx->n_subscribers, crctx->ckpair_index); + s = format (s, "[%U]", format_crypto_engine, crctx->crypto_engine); return s; } @@ -2240,7 +1844,7 @@ format_application (u8 * s, va_list * args) { application_t *app = va_arg (*args, application_t *); CLIB_UNUSED (int verbose) = va_arg (*args, int); - segment_manager_properties_t *props; + segment_manager_props_t *props; const u8 *app_ns_name, *app_name; app_worker_map_t *wrk_map; app_worker_t *app_wrk; @@ -2257,30 +1861,28 @@ format_application (u8 * s, va_list * args) props = application_segment_manager_properties (app); if (!verbose) { - s = format (s, "%-10u%-20s%-40s", app->app_index, app_name, + s = format (s, "%-10u%-20v%-40v", app->app_index, app_name, app_ns_name); return s; } - s = format (s, "app-name %s app-index %u ns-index %u seg-size %U\n", + s = format (s, "app-name %v app-index %u ns-index %u seg-size %U\n", app_name, app->app_index, app->ns_index, format_memory_size, props->add_segment_size); s = format (s, "rx-fifo-size %U tx-fifo-size %U workers:\n", format_memory_size, props->rx_fifo_size, format_memory_size, props->tx_fifo_size); - /* *INDENT-OFF* */ - pool_foreach (wrk_map, app->worker_maps, ({ + pool_foreach (wrk_map, app->worker_maps) { app_wrk = app_worker_get (wrk_map->wrk_index); - s = format (s, "%U", format_application_worker, app_wrk); - })); - /* *INDENT-ON* */ + s = format (s, "%U", format_app_worker, app_wrk); + } return s; } void -application_format_all_listeners (vlib_main_t * vm, int do_local, int verbose) +application_format_all_listeners (vlib_main_t * vm, int verbose) { application_t *app; @@ -2290,29 +1892,15 @@ application_format_all_listeners (vlib_main_t * vm, int do_local, int verbose) return; } - if (do_local) - { - application_format_local_sessions (0, verbose); - /* *INDENT-OFF* */ - pool_foreach (app, app_main.app_pool, ({ - application_format_local_sessions (app, verbose); - })); - /* *INDENT-ON* */ - } - else - { - application_format_listeners (0, verbose); + application_format_listeners (0, verbose); - /* *INDENT-OFF* */ - pool_foreach (app, app_main.app_pool, ({ - application_format_listeners (app, verbose); - })); - /* *INDENT-ON* */ - } + pool_foreach (app, app_main.app_pool) { + application_format_listeners (app, verbose); + } } void -application_format_all_clients (vlib_main_t * vm, int do_local, int verbose) +application_format_all_clients (vlib_main_t * vm, int verbose) { application_t *app; @@ -2322,36 +1910,74 @@ application_format_all_clients (vlib_main_t * vm, int do_local, int verbose) return; } - if (do_local) - { - application_format_local_connects (0, verbose); + application_format_connects (0, verbose); - /* *INDENT-OFF* */ - pool_foreach (app, app_main.app_pool, ({ - application_format_local_connects (app, verbose); - })); - /* *INDENT-ON* */ - } - else - { - application_format_connects (0, verbose); + pool_foreach (app, app_main.app_pool) { + application_format_connects (app, verbose); + } +} + +static clib_error_t * +show_certificate_command_fn (vlib_main_t * vm, unformat_input_t * input, + vlib_cli_command_t * cmd) +{ + app_cert_key_pair_t *ckpair; + session_cli_return_if_not_enabled (); + + pool_foreach (ckpair, app_main.cert_key_pair_store) { + vlib_cli_output (vm, "%U", format_cert_key_pair, ckpair); + } + return 0; +} + +static inline void +appliction_format_app_mq (vlib_main_t * vm, application_t * app) +{ + app_worker_map_t *map; + app_worker_t *wrk; + int i; + + pool_foreach (map, app->worker_maps) { + wrk = app_worker_get (map->wrk_index); + vlib_cli_output (vm, "[A%d][%d]%U", app->app_index, + map->wrk_index, format_svm_msg_q, + wrk->event_queue); + } + + for (i = 0; i < vec_len (app->rx_mqs); i++) + vlib_cli_output (vm, "[A%d][R%d]%U", app->app_index, i, format_svm_msg_q, + app->rx_mqs[i].mq); +} + +static clib_error_t * +appliction_format_all_app_mq (vlib_main_t * vm) +{ + application_t *app; + int i, n_threads; + + n_threads = vlib_get_n_threads (); - /* *INDENT-OFF* */ - pool_foreach (app, app_main.app_pool, ({ - application_format_connects (app, verbose); - })); - /* *INDENT-ON* */ + for (i = 0; i < n_threads; i++) + { + vlib_cli_output (vm, "[Ctrl%d]%U", i, format_svm_msg_q, + session_main_get_vpp_event_queue (i)); } + + pool_foreach (app, app_main.app_pool) { + appliction_format_app_mq (vm, app); + } + return 0; } static clib_error_t * show_app_command_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - int do_server = 0, do_client = 0, do_local = 0; + int do_server = 0, do_client = 0, do_mq = 0, do_transports = 0; application_t *app; u32 app_index = ~0; int verbose = 0; + u8 is_ta; session_cli_return_if_not_enabled (); @@ -2361,8 +1987,10 @@ show_app_command_fn (vlib_main_t * vm, unformat_input_t * input, do_server = 1; else if (unformat (input, "client")) do_client = 1; - else if (unformat (input, "local")) - do_local = 1; + else if (unformat (input, "transports")) + do_transports = 1; + else if (unformat (input, "mq")) + do_mq = 1; else if (unformat (input, "%u", &app_index)) ; else if (unformat (input, "verbose")) @@ -2372,15 +2000,31 @@ show_app_command_fn (vlib_main_t * vm, unformat_input_t * input, format_unformat_error, input); } + if (do_mq && app_index != ~0) + { + app = application_get_if_valid (app_index); + if (!app) + return clib_error_return (0, "No app with index %u", app_index); + + appliction_format_app_mq (vm, app); + return 0; + } + + if (do_mq) + { + appliction_format_all_app_mq (vm); + return 0; + } + if (do_server) { - application_format_all_listeners (vm, do_local, verbose); + application_format_all_listeners (vm, verbose); return 0; } if (do_client) { - application_format_all_clients (vm, do_local, verbose); + application_format_all_clients (vm, verbose); return 0; } @@ -2398,24 +2042,139 @@ show_app_command_fn (vlib_main_t * vm, unformat_input_t * input, if (!do_server && !do_client) { vlib_cli_output (vm, "%U", format_application, 0, 0); - /* *INDENT-OFF* */ - pool_foreach (app, app_main.app_pool, ({ - vlib_cli_output (vm, "%U", format_application, app, 0); - })); - /* *INDENT-ON* */ + pool_foreach (app, app_main.app_pool) { + is_ta = app->flags & APP_OPTIONS_FLAGS_IS_TRANSPORT_APP; + if ((!do_transports && !is_ta) || (do_transports && is_ta)) + vlib_cli_output (vm, "%U", format_application, app, 0); + } } return 0; } -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (show_app_command, static) = +/* Certificate store */ + +static app_cert_key_pair_t * +app_cert_key_pair_alloc () +{ + app_cert_key_pair_t *ckpair; + pool_get (app_main.cert_key_pair_store, ckpair); + clib_memset (ckpair, 0, sizeof (*ckpair)); + ckpair->cert_key_index = ckpair - app_main.cert_key_pair_store; + return ckpair; +} + +app_cert_key_pair_t * +app_cert_key_pair_get_if_valid (u32 index) +{ + if (pool_is_free_index (app_main.cert_key_pair_store, index)) + return 0; + return app_cert_key_pair_get (index); +} + +app_cert_key_pair_t * +app_cert_key_pair_get (u32 index) +{ + return pool_elt_at_index (app_main.cert_key_pair_store, index); +} + +app_cert_key_pair_t * +app_cert_key_pair_get_default () +{ + /* To maintain legacy bapi */ + return app_cert_key_pair_get (0); +} + +int +vnet_app_add_cert_key_pair (vnet_app_add_cert_key_pair_args_t * a) +{ + app_cert_key_pair_t *ckpair = app_cert_key_pair_alloc (); + vec_validate (ckpair->cert, a->cert_len - 1); + clib_memcpy_fast (ckpair->cert, a->cert, a->cert_len); + vec_validate (ckpair->key, a->key_len - 1); + clib_memcpy_fast (ckpair->key, a->key, a->key_len); + a->index = ckpair->cert_key_index; + return 0; +} + +int +vnet_app_add_cert_key_interest (u32 index, u32 app_index) +{ + app_cert_key_pair_t *ckpair; + if (!(ckpair = app_cert_key_pair_get_if_valid (index))) + return -1; + if (vec_search (ckpair->app_interests, app_index) != ~0) + vec_add1 (ckpair->app_interests, app_index); + return 0; +} + +int +vnet_app_del_cert_key_pair (u32 index) +{ + app_cert_key_pair_t *ckpair; + application_t *app; + u32 *app_index; + + if (!(ckpair = app_cert_key_pair_get_if_valid (index))) + return SESSION_E_INVALID; + + vec_foreach (app_index, ckpair->app_interests) + { + if ((app = application_get_if_valid (*app_index)) + && app->cb_fns.app_cert_key_pair_delete_callback) + app->cb_fns.app_cert_key_pair_delete_callback (ckpair); + } + + vec_free (ckpair->cert); + vec_free (ckpair->key); + pool_put (app_main.cert_key_pair_store, ckpair); + return 0; +} + +clib_error_t * +application_init (vlib_main_t * vm) { + app_main_t *am = &app_main; + u32 n_workers; + + n_workers = vlib_num_workers (); + + /* Index 0 was originally used by legacy apis, maintain as invalid */ + (void) app_cert_key_pair_alloc (); + am->last_crypto_engine = CRYPTO_ENGINE_LAST; + am->app_by_name = hash_create_vec (0, sizeof (u8), sizeof (uword)); + + vec_validate (am->wrk, n_workers); + + return 0; +} + +VLIB_INIT_FUNCTION (application_init); + +VLIB_CLI_COMMAND (show_app_command, static) = { .path = "show app", - .short_help = "show app [server|client] [verbose]", + .short_help = "show app [index] [server|client] [mq] [verbose] " + "[transports]", .function = show_app_command_fn, }; -/* *INDENT-ON* */ + +VLIB_CLI_COMMAND (show_certificate_command, static) = { + .path = "show app certificate", + .short_help = "list app certs and keys present in store", + .function = show_certificate_command_fn, +}; + +crypto_engine_type_t +app_crypto_engine_type_add (void) +{ + return (++app_main.last_crypto_engine); +} + +u8 +app_crypto_engine_n_types (void) +{ + return (app_main.last_crypto_engine + 1); +} /* * fd.io coding-style-patch-verification: ON