X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication.c;h=85b5f93942713b58d5b06294f156a04de0b4c9e7;hb=30e79c2e388a98160a3660f4f03103890c9b1b7c;hp=72c57688e4288a3c8d37208ffdaf669325f6dfa5;hpb=053a0e44edb21713e0825f9c09ba4af12e686b38;p=vpp.git diff --git a/src/vnet/session/application.c b/src/vnet/session/application.c index 72c57688e42..85b5f939427 100644 --- a/src/vnet/session/application.c +++ b/src/vnet/session/application.c @@ -94,29 +94,14 @@ 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); } -static u8 * -app_get_name_from_reg_index (application_t * app) -{ - u8 *app_name; - - vl_api_registration_t *regp; - regp = vl_api_client_index_to_registration (app->api_client_index); - if (!regp) - app_name = format (0, "builtin-%d%c", app->app_index, 0); - else - app_name = format (0, "%s%c", regp->name, 0); - - return app_name; -} - static const u8 * app_get_name (application_t * app) { - if (!app->name) - app->name = app_get_name_from_reg_index (app); return app->name; } @@ -155,24 +140,6 @@ application_local_listener_session_endpoint (local_session_t * ll, sep->is_ip4 = ll->listener_session_type & 1; } -int -application_api_queue_is_full (application_t * app) -{ - svm_queue_t *q; - - /* builtin servers are always OK */ - if (app->api_client_index == ~0) - return 0; - - q = vl_api_client_index_to_input_queue (app->api_client_index); - if (!q) - return 1; - - if (q->cursize == q->maxsize) - return 1; - return 0; -} - /** * Returns app name for app-index */ @@ -188,7 +155,8 @@ application_name_from_index (u32 app_index) static void application_api_table_add (u32 app_index, u32 api_client_index) { - hash_set (app_main.app_by_api_client_index, api_client_index, app_index); + if (api_client_index != APP_INVALID_INDEX) + hash_set (app_main.app_by_api_client_index, api_client_index, app_index); } static void @@ -198,22 +166,15 @@ application_api_table_del (u32 api_client_index) } static void -application_table_add (application_t * app) +application_name_table_add (application_t * app) { - if (app->api_client_index != APP_INVALID_INDEX) - hash_set (app_main.app_by_api_client_index, app->api_client_index, - app->app_index); - else if (app->name) - hash_set_mem (app_main.app_by_name, app->name, app->app_index); + hash_set_mem (app_main.app_by_name, app->name, app->app_index); } static void -application_table_del (application_t * app) +application_name_table_del (application_t * app) { - if (app->api_client_index != APP_INVALID_INDEX) - hash_unset (app_main.app_by_api_client_index, app->api_client_index); - else if (app->name) - hash_unset_mem (app_main.app_by_name, app->name); + hash_unset_mem (app_main.app_by_name, app->name); } application_t * @@ -265,12 +226,6 @@ application_get_if_valid (u32 app_index) return pool_elt_at_index (app_main.app_pool, app_index); } -u32 -application_index (application_t * app) -{ - return app - app_main.app_pool; -} - static void application_verify_cb_fns (session_cb_vft_t * cb_fns) { @@ -350,7 +305,6 @@ application_alloc_and_init (app_init_args_t * a) /* Check that the obvious things are properly set up */ application_verify_cb_fns (a->session_cb_vft); - app->api_client_index = a->api_client_index; app->flags = options[APP_OPTIONS_FLAGS]; app->cb_fns = *a->session_cb_vft; app->ns_index = options[APP_OPTIONS_NAMESPACE]; @@ -384,8 +338,12 @@ application_alloc_and_init (app_init_args_t * a) props->segment_type = seg_type; /* Add app to lookup by api_client_index table */ - application_table_add (app); - a->app_index = application_index (app); + if (!application_is_builtin (app)) + application_api_table_add (app->app_index, a->api_client_index); + else + application_name_table_add (app); + + 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); @@ -442,7 +400,8 @@ application_free (application_t * app) /* * Cleanup remaining state */ - application_table_del (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); @@ -469,7 +428,7 @@ application_detach_process (application_t * app, u32 api_client_index) /* *INDENT-OFF* */ pool_foreach (wrk_map, app->worker_maps, ({ app_wrk = app_worker_get (wrk_map->wrk_index); - if (app_wrk->api_index == api_client_index) + if (app_wrk->api_client_index == api_client_index) vec_add1 (wrks, app_wrk->wrk_index); })); /* *INDENT-ON* */ @@ -482,11 +441,11 @@ application_detach_process (application_t * app, u32 api_client_index) } args->app_index = app->app_index; - args->api_index = api_client_index; + args->api_client_index = api_client_index; vec_foreach (wrk_index, wrks) { app_wrk = app_worker_get (wrk_index[0]); - args->wrk_index = app_wrk->wrk_map_index; + args->wrk_map_index = app_wrk->wrk_map_index; args->is_add = 0; vnet_app_worker_add_del (args); } @@ -668,7 +627,6 @@ app_worker_alloc_and_init (application_t * app, app_worker_t ** wrk) 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); - app_wrk->api_index = app->api_client_index; /* * Segment manager for local sessions @@ -766,6 +724,48 @@ app_worker_stop_listen (app_worker_t * app_wrk, session_handle_t handle) return 0; } +int +app_worker_own_session (app_worker_t * app_wrk, stream_session_t * s) +{ + segment_manager_t *sm; + svm_fifo_t *rxf, *txf; + + s->app_wrk_index = app_wrk->wrk_index; + + rxf = s->server_rx_fifo; + txf = s->server_tx_fifo; + + if (!rxf || !txf) + return 0; + + s->server_rx_fifo = 0; + s->server_tx_fifo = 0; + + sm = app_worker_get_or_alloc_connect_segment_manager (app_wrk); + if (session_alloc_fifos (sm, s)) + return -1; + + if (!svm_fifo_is_empty (rxf)) + { + clib_memcpy_fast (s->server_rx_fifo->data, rxf->data, rxf->nitems); + s->server_rx_fifo->head = rxf->head; + s->server_rx_fifo->tail = rxf->tail; + s->server_rx_fifo->cursize = rxf->cursize; + } + + if (!svm_fifo_is_empty (txf)) + { + clib_memcpy_fast (s->server_tx_fifo->data, txf->data, txf->nitems); + s->server_tx_fifo->head = txf->head; + s->server_tx_fifo->tail = txf->tail; + s->server_tx_fifo->cursize = txf->cursize; + } + + segment_manager_dealloc_fifos (rxf->segment_index, rxf, txf); + + return 0; +} + /** * Start listening local transport endpoint for requested transport. * @@ -931,6 +931,14 @@ app_worker_get_connect_segment_manager (app_worker_t * app) return segment_manager_get (app->connects_seg_manager); } +segment_manager_t * +app_worker_get_or_alloc_connect_segment_manager (app_worker_t * app_wrk) +{ + if (app_wrk->connects_seg_manager == (u32) ~ 0) + app_worker_alloc_connects_segment_manager (app_wrk); + return segment_manager_get (app_wrk->connects_seg_manager); +} + segment_manager_t * app_worker_get_listen_segment_manager (app_worker_t * app, stream_session_t * listener) @@ -962,33 +970,29 @@ vnet_app_worker_add_del (vnet_app_worker_add_del_args_t * a) return clib_error_return_code (0, rv, 0, "app wrk init: %d", rv); /* Map worker api index to the app */ - if (a->api_index != app->api_client_index - && app->api_client_index != APP_INVALID_INDEX) - { - app_wrk->api_index = a->api_index; - application_api_table_add (app->app_index, a->api_index); - } + 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->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_index = app_wrk->wrk_map_index; + a->wrk_map_index = app_wrk->wrk_map_index; } else { - wrk_map = app_worker_map_get (app, a->wrk_index); + 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_index); + 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_index); - if (app->api_client_index != app_wrk->api_index) - application_api_table_del (app_wrk->api_index); + "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) @@ -1056,11 +1060,12 @@ application_use_mq_for_ctrl (application_t * app) * Send an API message to the external app, to map new segment */ int -app_worker_add_segment_notify (u32 app_wrk_index, ssvm_private_t * fs) +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->api_client_index, fs); + return app->cb_fns.add_segment_callback (app_wrk->api_client_index, + segment_handle); } u32 @@ -1638,14 +1643,15 @@ application_local_session_connect (app_worker_t * client_wrk, local_session_t * ll, u32 opaque) { u32 seg_size, evt_q_sz, evt_q_elts, margin = 16 << 10; + u32 round_rx_fifo_sz, round_tx_fifo_sz, sm_index; 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); @@ -1700,8 +1706,13 @@ application_local_session_connect (app_worker_t * client_wrk, segment_manager_segment_reader_unlock (sm); goto failed; } + sm_index = segment_manager_index (sm); ls->server_rx_fifo->ct_session_index = ls->session_index; ls->server_tx_fifo->ct_session_index = ls->session_index; + ls->server_rx_fifo->segment_manager = sm_index; + ls->server_tx_fifo->segment_manager = sm_index; + ls->server_rx_fifo->segment_index = seg_index; + ls->server_tx_fifo->segment_index = seg_index; ls->svm_segment_index = seg_index; ls->listener_index = ll->session_index; ls->client_wrk_index = client_wrk->wrk_index; @@ -1709,8 +1720,9 @@ application_local_session_connect (app_worker_t * client_wrk, ls->listener_session_type = ll->session_type; ls->session_state = SESSION_STATE_READY; - if ((rv = server->cb_fns.add_segment_callback (server->api_client_index, - &seg->ssvm))) + 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); @@ -1733,14 +1745,14 @@ failed: return rv; } -static uword +static u64 application_client_local_connect_key (local_session_t * ls) { - return ((uword) ls->app_wrk_index << 32 | (uword) ls->session_index); + return (((u64) ls->app_wrk_index) << 32 | (u64) ls->session_index); } static void -application_client_local_connect_key_parse (uword key, u32 * app_wrk_index, +application_client_local_connect_key_parse (u64 key, u32 * app_wrk_index, u32 * session_index) { *app_wrk_index = key >> 32; @@ -1755,7 +1767,8 @@ application_local_session_connect_notify (local_session_t * ls) segment_manager_t *sm; application_t *client; int rv, is_fail = 0; - uword client_key; + u64 segment_handle; + u64 client_key; client_wrk = app_worker_get (ls->client_wrk_index); server_wrk = app_worker_get (ls->app_wrk_index); @@ -1763,8 +1776,9 @@ application_local_session_connect_notify (local_session_t * ls) sm = application_get_local_segment_manager_w_session (server_wrk, ls); seg = segment_manager_get_segment_w_lock (sm, ls->svm_segment_index); - if ((rv = client->cb_fns.add_segment_callback (client->api_client_index, - &seg->ssvm))) + 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); @@ -1795,7 +1809,7 @@ application_local_session_cleanup (app_worker_t * client_wrk, svm_fifo_segment_private_t *seg; stream_session_t *listener; segment_manager_t *sm; - uword client_key; + u64 client_key; u8 has_transport; /* Retrieve listener transport type as it is the one that decides where @@ -1819,13 +1833,14 @@ application_local_session_cleanup (app_worker_t * client_wrk, if (!has_transport) { application_t *server = application_get (server_wrk->app_index); - server->cb_fns.del_segment_callback (server->api_client_index, - &seg->ssvm); + 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->api_client_index, - &seg->ssvm); + client->cb_fns.del_segment_callback (client_wrk->api_client_index, + segment_handle); } segment_manager_del_segment (sm, seg); } @@ -1989,7 +2004,6 @@ format_app_worker_listener (u8 * s, va_list * args) u32 sm_index = va_arg (*args, u32); int verbose = va_arg (*args, int); stream_session_t *listener; - application_t *app; const u8 *app_name; u8 *str; @@ -2004,8 +2018,7 @@ format_app_worker_listener (u8 * s, va_list * args) return s; } - app = application_get (app_wrk->app_index); - app_name = app_get_name (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); @@ -2014,7 +2027,7 @@ format_app_worker_listener (u8 * s, va_list * args) 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->api_client_index, handle, sm_index); + buf, app_wrk->api_client_index, handle, sm_index); } else s = format (s, "%-40s%-25s%=10u", str, app_name, app_wrk->wrk_map_index); @@ -2058,7 +2071,6 @@ app_worker_format_connects (app_worker_t * app_wrk, int verbose) vlib_main_t *vm = vlib_get_main (); segment_manager_t *sm; const u8 *app_name; - application_t *app; u8 *s = 0; /* Header */ @@ -2072,11 +2084,10 @@ app_worker_format_connects (app_worker_t * app_wrk, int verbose) return; } - app = application_get (app_wrk->app_index); if (app_wrk->connects_seg_manager == (u32) ~ 0) return; - app_name = app_get_name (app); + app_name = application_name_from_index (app_wrk->app_index); /* Across all fifo segments */ sm = segment_manager_get (app_wrk->connects_seg_manager); @@ -2088,28 +2099,28 @@ app_worker_format_connects (app_worker_t * app_wrk, int verbose) fifo = svm_fifo_segment_get_fifo_list (fifo_segment); while (fifo) - { - u32 session_index, thread_index; - stream_session_t *session; + { + u32 session_index, thread_index; + stream_session_t *session; - session_index = fifo->master_session_index; - thread_index = fifo->master_thread_index; + 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); + 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->api_client_index, app_wrk->connects_seg_manager); - else - s = format (s, "%-40s%-20s", str, app_name); + 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); + vlib_cli_output (vm, "%v", s); + vec_reset_length (s); + vec_free (str); - fifo = fifo->next; - } + fifo = fifo->next; + } vec_free (s); })); /* *INDENT-ON* */ @@ -2218,7 +2229,7 @@ app_worker_format_local_connects (app_worker_t * app, int verbose) u32 app_wrk_index, session_index; app_worker_t *server_wrk; local_session_t *ls; - uword client_key; + u64 client_key; u64 value; /* Header */ @@ -2268,6 +2279,19 @@ application_format_local_connects (application_t * app, int verbose) /* *INDENT-ON* */ } +u8 * +format_application_worker (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); + return s; +} + u8 * format_application (u8 * s, va_list * args) { @@ -2275,31 +2299,40 @@ format_application (u8 * s, va_list * args) CLIB_UNUSED (int verbose) = va_arg (*args, int); segment_manager_properties_t *props; const u8 *app_ns_name, *app_name; + app_worker_map_t *wrk_map; + app_worker_t *app_wrk; if (app == 0) { - if (verbose) - s = format (s, "%-10s%-20s%-15s%-15s%-15s%-15s%-15s", "Index", "Name", - "API Client", "Namespace", "Add seg size", "Rx-f size", - "Tx-f size"); - else - s = format (s, "%-10s%-20s%-15s%-40s", "Index", "Name", "API Client", - "Namespace"); + if (!verbose) + s = format (s, "%-10s%-20s%-40s", "Index", "Name", "Namespace"); return s; } app_name = app_get_name (app); app_ns_name = app_namespace_id_from_index (app->ns_index); props = application_segment_manager_properties (app); - if (verbose) - s = format (s, "%-10u%-20s%-15d%-15u%-15U%-15U%-15U", app->app_index, - app_name, app->api_client_index, app->ns_index, - format_memory_size, props->add_segment_size, - format_memory_size, props->rx_fifo_size, format_memory_size, - props->tx_fifo_size); - else - s = format (s, "%-10u%-20s%-15d%-40s", app->app_index, app_name, - app->api_client_index, app_ns_name); + if (!verbose) + { + s = format (s, "%-10u%-20s%-40s", 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", + 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, ({ + app_wrk = app_worker_get (wrk_map->wrk_index); + s = format (s, "%U", format_application_worker, app_wrk); + })); + /* *INDENT-ON* */ + return s; } @@ -2374,6 +2407,7 @@ show_app_command_fn (vlib_main_t * vm, unformat_input_t * input, { int do_server = 0, do_client = 0, do_local = 0; application_t *app; + u32 app_index = ~0; int verbose = 0; session_cli_return_if_not_enabled (); @@ -2386,25 +2420,44 @@ show_app_command_fn (vlib_main_t * vm, unformat_input_t * input, do_client = 1; else if (unformat (input, "local")) do_local = 1; + else if (unformat (input, "%u", &app_index)) + ; else if (unformat (input, "verbose")) verbose = 1; else - break; + return clib_error_return (0, "unknown input `%U'", + format_unformat_error, input); } if (do_server) - application_format_all_listeners (vm, do_local, verbose); + { + application_format_all_listeners (vm, do_local, verbose); + return 0; + } if (do_client) - application_format_all_clients (vm, do_local, verbose); + { + application_format_all_clients (vm, do_local, verbose); + return 0; + } + + if (app_index != ~0) + { + app = application_get_if_valid (app_index); + if (!app) + return clib_error_return (0, "No app with index %u", app_index); + + vlib_cli_output (vm, "%U", format_application, app, /* verbose */ 1); + return 0; + } /* Print app related info */ if (!do_server && !do_client) { - vlib_cli_output (vm, "%U", format_application, 0, verbose); + 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, verbose); + vlib_cli_output (vm, "%U", format_application, app, 0); })); /* *INDENT-ON* */ }