X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication.c;h=a70625a9bc5d80e33f21e1d69a42cc57ab49ffd1;hp=1ad94cc27783a0c332c4a76f87b15f0d076d8c11;hb=c1f5a43;hpb=1553197f9a1a3258b6954adeb9536bbe0191683d diff --git a/src/vnet/session/application.c b/src/vnet/session/application.c index 1ad94cc2778..a70625a9bc5 100644 --- a/src/vnet/session/application.c +++ b/src/vnet/session/application.c @@ -20,12 +20,62 @@ static app_main_t app_main; +static app_listener_t * +app_listener_alloc (application_t * app) +{ + app_listener_t *app_listener; + pool_get (app->listeners, app_listener); + clib_memset (app_listener, 0, sizeof (*app_listener)); + app_listener->al_index = app_listener - app->listeners; + return app_listener; +} + +static app_listener_t * +app_listener_get (application_t * app, u32 app_listener_index) +{ + return pool_elt_at_index (app->listeners, app_listener_index); +} + +static void +app_listener_free (application_t * app, app_listener_t * app_listener) +{ + clib_bitmap_free (app_listener->workers); + pool_put (app->listeners, app_listener); + if (CLIB_DEBUG) + clib_memset (app_listener, 0xfa, sizeof (*app_listener)); +} + +static app_listener_t * +app_local_listener_alloc (application_t * app) +{ + 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; +} + +static app_listener_t * +app_local_listener_get (application_t * app, u32 app_listener_index) +{ + return pool_elt_at_index (app->local_listeners, app_listener_index); +} + +static void +app_local_listener_free (application_t * app, app_listener_t * app_listener) +{ + clib_bitmap_free (app_listener->workers); + pool_put (app->local_listeners, app_listener); + if (CLIB_DEBUG) + clib_memset (app_listener, 0xfa, sizeof (*app_listener)); +} + static app_worker_map_t * app_worker_map_alloc (application_t * app) { app_worker_map_t *map; pool_get (app->worker_maps, map); - memset (map, 0, sizeof (*map)); + clib_memset (map, 0, sizeof (*map)); return map; } @@ -47,26 +97,9 @@ app_worker_map_get (application_t * app, u32 map_index) 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 u8 * +static const u8 * app_get_name (application_t * app) { - if (!app->name) - return app_get_name_from_reg_index (app); return app->name; } @@ -95,56 +128,51 @@ application_local_session_table (application_t * app) return app_ns->local_table_index; } -int -application_api_queue_is_full (application_t * app) +static void +application_local_listener_session_endpoint (local_session_t * ll, + session_endpoint_t * sep) { - 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; + 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 - * - * Since the name is not stored per app, we generate it on the fly. It is - * the caller's responsibility to free the vector + * Returns app name for app-index */ -u8 * +const u8 * application_name_from_index (u32 app_index) { application_t *app = application_get (app_index); if (!app) return 0; - return app_get_name_from_reg_index (app); + return app_get_name (app); +} + +static void +application_api_table_add (u32 app_index, u32 api_client_index) +{ + if (api_client_index != APP_INVALID_INDEX) + hash_set (app_main.app_by_api_client_index, api_client_index, app_index); +} + +static void +application_api_table_del (u32 api_client_index) +{ + hash_unset (app_main.app_by_api_client_index, 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 * @@ -153,7 +181,7 @@ application_lookup (u32 api_client_index) uword *p; p = hash_get (app_main.app_by_api_client_index, api_client_index); if (p) - return application_get (p[0]); + return application_get_if_valid (p[0]); return 0; } @@ -174,7 +202,7 @@ application_alloc (void) { application_t *app; pool_get (app_main.app_pool, app); - memset (app, 0, sizeof (*app)); + clib_memset (app, 0, sizeof (*app)); app->app_index = app - app_main.app_pool; return app; } @@ -196,12 +224,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) { @@ -281,7 +303,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]; @@ -315,8 +336,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); @@ -329,6 +354,9 @@ 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 @@ -340,6 +368,10 @@ application_free (application_t * app) if (application_is_proxy (app)) application_remove_proxy (app); + /* + * Free workers + */ + /* *INDENT-OFF* */ pool_flush (wrk_map, app->worker_maps, ({ app_wrk = app_worker_get (wrk_map->wrk_index); @@ -348,13 +380,76 @@ application_free (application_t * app) /* *INDENT-ON* */ pool_free (app->worker_maps); - application_table_del (app); + /* + * 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. + */ + 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); + + /* + * Cleanup remaining state + */ + 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 +application_detach_process (application_t * app, u32 api_client_index) +{ + vnet_app_worker_add_del_args_t _args = { 0 }, *args = &_args; + app_worker_map_t *wrk_map; + u32 *wrks = 0, *wrk_index; + app_worker_t *app_wrk; + + if (api_client_index == ~0) + { + application_free (app); + return; + } + + APP_DBG ("Detaching for app %v index %u api client index %u", app->name, + app->app_index, app->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_client_index == api_client_index) + vec_add1 (wrks, app_wrk->wrk_index); + })); + /* *INDENT-ON* */ + + if (!vec_len (wrks)) + { + clib_warning ("no workers for app %u api_index %u", app->app_index, + api_client_index); + return; + } + + args->app_index = app->app_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->is_add = 0; + vnet_app_worker_add_del (args); + } + vec_free (wrks); +} + app_worker_t * application_get_worker (application_t * app, u32 wrk_map_index) { @@ -371,12 +466,41 @@ application_get_default_worker (application_t * app) return application_get_worker (app, 0); } +u32 +application_n_workers (application_t * app) +{ + return pool_elts (app->worker_maps); +} + +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); - memset (app_wrk, 0, sizeof (*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; @@ -427,7 +551,7 @@ app_worker_free (app_worker_t * app_wrk) for (i = 0; i < vec_len (handles); i++) { a->app_index = app->app_index; - a->app_wrk_index = app_wrk->wrk_map_index; + a->wrk_map_index = app_wrk->wrk_map_index; a->handle = handles[i]; /* seg manager is removed when unbind completes */ vnet_unbind (a); @@ -449,23 +573,22 @@ app_worker_free (app_worker_t * app_wrk) && app_wrk->first_segment_manager != app_wrk->connects_seg_manager) { 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)) - { - sm->app_wrk_index = SEGMENT_MANAGER_INVALID_APP_INDEX; - segment_manager_del (sm); - } + segment_manager_del (sm); } /* * Local sessions */ - application_local_sessions_free (app_wrk); + app_worker_local_sessions_free (app_wrk); pool_put (app_main.workers, app_wrk); if (CLIB_DEBUG) - memset (app_wrk, 0xfe, sizeof (*app_wrk)); + clib_memset (app_wrk, 0xfe, sizeof (*app_wrk)); } int @@ -516,8 +639,18 @@ app_worker_alloc_and_init (application_t * app, app_worker_t ** wrk) return 0; } +application_t * +app_worker_get_app (u32 wrk_index) +{ + 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); +} + static segment_manager_t * -application_alloc_segment_manager (app_worker_t * app_wrk) +app_worker_alloc_segment_manager (app_worker_t * app_wrk) { segment_manager_t *sm = 0; @@ -536,6 +669,59 @@ application_alloc_segment_manager (app_worker_t * app_wrk) return sm; } +int +app_worker_start_listen (app_worker_t * app_wrk, stream_session_t * ls) +{ + 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) + { + if (session_alloc_fifos (sm, ls)) + return -1; + } + return 0; +} + +int +app_worker_stop_listen (app_worker_t * app_wrk, session_handle_t handle) +{ + segment_manager_t *sm; + uword *sm_indexp; + + sm_indexp = hash_get (app_wrk->listeners_table, handle); + if (PREDICT_FALSE (!sm_indexp)) + { + clib_warning ("listener handle was removed %llu!", handle); + return -1; + } + + sm = segment_manager_get (*sm_indexp); + if (app_wrk->first_segment_manager == *sm_indexp) + { + /* Delete sessions but don't remove segment manager */ + app_wrk->first_segment_manager_in_use = 0; + segment_manager_del_sessions (sm); + } + else + { + segment_manager_init_del (sm); + } + hash_unset (app_wrk->listeners_table, handle); + + return 0; +} + /** * Start listening local transport endpoint for requested transport. * @@ -544,40 +730,77 @@ application_alloc_segment_manager (app_worker_t * app_wrk) * it's own specific listening connection. */ int -app_worker_start_listen (app_worker_t * app_wrk, session_endpoint_t * sep, - session_handle_t * res) +application_start_listen (application_t * app, + session_endpoint_cfg_t * sep_ext, + session_handle_t * res) { - segment_manager_t *sm; - stream_session_t *s; - session_handle_t handle; + 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; - sst = session_type_from_proto_and_ip (sep->transport_proto, sep->is_ip4); - s = listen_session_new (0, sst); - s->app_wrk_index = app_wrk->wrk_index; + /* + * 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) + { + ls = listen_session_get_from_handle (lh); + if (ls->app_index != app->app_index) + return VNET_API_ERROR_ADDRESS_IN_USE; - /* Allocate segment manager. All sessions derived out of a listen session - * have fifos allocated by the same segment manager. */ - if (!(sm = application_alloc_segment_manager (app_wrk))) - goto err; + 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; - /* Add to app's listener table. Useful to find all child listeners - * when app goes down, although, just for unbinding this is not needed */ - handle = listen_session_get_handle (s); - hash_set (app_wrk->listeners_table, handle, segment_manager_index (sm)); + if (app_worker_start_listen (app_wrk, ls)) + return -1; - if (stream_session_listen (s, sep)) - { - segment_manager_del (sm); - hash_unset (app_wrk->listeners_table, handle); - goto err; + 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); + + *res = listen_session_get_handle (ls); + return 0; } - *res = handle; + /* + * 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; + + + ls = listen_session_get_from_handle (lh); + app_listener = app_listener_alloc (app); + ls->listener_db_index = app_listener->al_index; + + /* + * Setup app worker as a listener + */ + 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; err: - listen_session_del (s); + listen_session_del (ls); return -1; } @@ -585,48 +808,44 @@ err: * Stop listening on session associated to handle * * @param handle listener handle - * @param app_index index of the app owning the handle. This is used - * only for validating ownership + * @param app_index index of the app owning the handle. + * @param app_wrk_index index of the worker requesting the stop */ int -app_worker_stop_listen (session_handle_t handle, u32 app_index) +application_stop_listen (u32 app_index, u32 app_wrk_index, + session_handle_t handle) { + app_listener_t *app_listener; stream_session_t *listener; - segment_manager_t *sm; app_worker_t *app_wrk; - uword *indexp; + application_t *app; listener = listen_session_get_from_handle (handle); - app_wrk = app_worker_get (listener->app_wrk_index); - if (PREDICT_FALSE (!app_wrk || app_wrk->app_index != app_index)) + 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; } - if (PREDICT_FALSE (hash_get (app_wrk->listeners_table, handle) == 0)) + + app_listener = app_listener_get (app, listener->listener_db_index); + if (!clib_bitmap_get (app_listener->workers, app_wrk_index)) { - clib_warning ("listener handle was removed %llu!", handle); - return -1; + clib_warning ("worker %u not listening on handle %lu", app_wrk_index, + handle); + return 0; } - stream_session_stop_listen (listener); - - indexp = hash_get (app_wrk->listeners_table, handle); - ASSERT (indexp); + 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); - sm = segment_manager_get (*indexp); - if (app_wrk->first_segment_manager == *indexp) - { - /* Delete sessions but don't remove segment manager */ - app_wrk->first_segment_manager_in_use = 0; - segment_manager_del_sessions (sm); - } - else + if (clib_bitmap_is_zero (app_listener->workers)) { - segment_manager_init_del (sm); + session_stop_listen (listener); + app_listener_free (app, app_listener); + listen_session_del (listener); } - hash_unset (app_wrk->listeners_table, handle); - listen_session_del (listener); return 0; } @@ -653,7 +872,7 @@ app_worker_alloc_connects_segment_manager (app_worker_t * app_wrk) if (app_wrk->connects_seg_manager == APP_INVALID_SEGMENT_MANAGER_INDEX) { - sm = application_alloc_segment_manager (app_wrk); + sm = app_worker_alloc_segment_manager (app_wrk); if (sm == 0) return -1; app_wrk->connects_seg_manager = segment_manager_index (sm); @@ -670,10 +889,10 @@ app_worker_get_connect_segment_manager (app_worker_t * app) segment_manager_t * app_worker_get_listen_segment_manager (app_worker_t * app, - stream_session_t * s) + stream_session_t * listener) { uword *smp; - smp = hash_get (app->listeners_table, listen_session_get_handle (s)); + smp = hash_get (app->listeners_table, listen_session_get_handle (listener)); ASSERT (smp != 0); return segment_manager_get (*smp); } @@ -697,11 +916,17 @@ vnet_app_worker_add_del (vnet_app_worker_add_del_args_t * a) { if ((rv = app_worker_alloc_and_init (app, &app_wrk))) return clib_error_return_code (0, rv, 0, "app wrk init: %d", 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->first_segment_manager); fs = segment_manager_get_segment_w_lock (sm, 0); a->segment = &fs->ssvm; segment_manager_segment_reader_unlock (sm); a->evt_q = app_wrk->event_queue; + a->wrk_index = app_wrk->wrk_map_index; } else { @@ -711,11 +936,14 @@ vnet_app_worker_add_del (vnet_app_worker_add_del_args_t * a) "App %u does not have worker %u", app->app_index, a->wrk_index); app_wrk = app_worker_get (wrk_map->wrk_index); - app_worker_map_free (app, wrk_map); if (!app_wrk) return clib_error_return_code (0, VNET_API_ERROR_INVALID_VALUE, 0, "No worker %u", a->wrk_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; } @@ -769,6 +997,12 @@ 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 */ @@ -777,7 +1011,7 @@ app_worker_add_segment_notify (u32 app_wrk_index, ssvm_private_t * fs) { 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, fs); } u32 @@ -802,7 +1036,7 @@ app_worker_first_listener (app_worker_t * app, u8 fib_proto, hash_foreach (handle, sm_index, app->listeners_table, ({ listener = listen_session_get_from_handle (handle); if (listener->session_type == sst - && listener->listener_index != SESSION_PROXY_LISTENER_INDEX) + && listener->enqueue_epoch != SESSION_PROXY_LISTENER_INDEX) return listener; })); /* *INDENT-ON* */ @@ -832,7 +1066,7 @@ application_proxy_listener (app_worker_t * app, u8 fib_proto, hash_foreach (handle, sm_index, app->listeners_table, ({ listener = listen_session_get_from_handle (handle); if (listener->session_type == sst - && listener->listener_index == SESSION_PROXY_LISTENER_INDEX) + && listener->enqueue_epoch == SESSION_PROXY_LISTENER_INDEX) return listener; })); /* *INDENT-ON* */ @@ -846,7 +1080,7 @@ application_start_stop_proxy_fib_proto (application_t * app, u8 fib_proto, { app_namespace_t *app_ns = app_namespace_get (app->ns_index); u8 is_ip4 = (fib_proto == FIB_PROTOCOL_IP4); - session_endpoint_t sep = SESSION_ENDPOINT_NULL; + session_endpoint_cfg_t sep = SESSION_ENDPOINT_CFG_NULL; transport_connection_t *tc; app_worker_t *app_wrk; stream_session_t *s; @@ -863,9 +1097,10 @@ application_start_stop_proxy_fib_proto (application_t * app, u8 fib_proto, sep.fib_index = app_namespace_get_fib_index (app_ns, fib_proto); sep.sw_if_index = app_ns->sw_if_index; sep.transport_proto = transport_proto; - app_worker_start_listen (app_wrk, &sep, &handle); + sep.app_wrk_index = app_wrk->wrk_index; /* only default */ + application_start_listen (app, &sep, &handle); s = listen_session_get_from_handle (handle); - s->listener_index = SESSION_PROXY_LISTENER_INDEX; + s->enqueue_epoch = SESSION_PROXY_LISTENER_INDEX; } } else @@ -885,9 +1120,12 @@ application_start_stop_proxy_fib_proto (application_t * app, u8 fib_proto, sep.port = 0; sti = session_lookup_get_index_for_fib (fib_proto, sep.fib_index); if (is_start) - session_lookup_add_session_endpoint (sti, &sep, s->session_index); + session_lookup_add_session_endpoint (sti, + (session_endpoint_t *) & sep, + s->session_index); else - session_lookup_del_session_endpoint (sti, &sep); + session_lookup_del_session_endpoint (sti, + (session_endpoint_t *) & sep); } return 0; @@ -1053,9 +1291,10 @@ app_send_io_evt_rx (app_worker_t * app_wrk, stream_session_t * s, u8 lock) 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; - (void) svm_fifo_set_event (s->server_rx_fifo); return 0; } @@ -1105,42 +1344,47 @@ static app_send_evt_handler_fn * const app_send_evt_handler_fns[3] = { /** * Send event to application * - * Logic from queue perspective is non-blocking. That is, if there's - * not enough space to enqueue a message, we return. However, if the lock - * flag is set, we do wait for queue mutex. + * Logic from queue perspective is non-blocking. If there's + * not enough space to enqueue a message, we return. */ int -application_send_event (app_worker_t * app, stream_session_t * s, u8 evt_type) +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 -application_lock_and_send_event (app_worker_t * app, stream_session_t * s, - u8 evt_type) +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_alloc_local_session (app_worker_t * app) +application_local_session_alloc (app_worker_t * app_wrk) { local_session_t *s; - pool_get (app->local_sessions, s); - memset (s, 0, sizeof (*s)); - s->app_wrk_index = app->app_index; - s->session_index = s - app->local_sessions; + 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_free_local_session (app_worker_t * app, local_session_t * s) +application_local_session_free (app_worker_t * app, local_session_t * s) { pool_put (app->local_sessions, s); if (CLIB_DEBUG) - memset (s, 0xfc, sizeof (*s)); + clib_memset (s, 0xfc, sizeof (*s)); } local_session_t * @@ -1163,44 +1407,80 @@ application_get_local_session_from_handle (session_handle_t handle) return application_get_local_session (server_wrk, session_index); } -always_inline void -application_local_listener_session_endpoint (local_session_t * ll, - session_endpoint_t * sep) +local_session_t * +application_local_listen_session_alloc (application_t * app) { - sep->transport_proto = - session_type_transport_proto (ll->listener_session_type); - sep->port = ll->port; - sep->is_ip4 = ll->listener_session_type & 1; + 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 (app_worker_t * app_wrk, - session_endpoint_t * sep, +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; - application_t *app; u32 table_index; - app = application_get (app_wrk->app_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) - return VNET_API_ERROR_ADDRESS_IN_USE; + { + 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; + } - pool_get (app_wrk->local_listen_sessions, ll); - memset (ll, 0, sizeof (*ll)); + 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 = ll - app_wrk->local_listen_sessions; - ll->port = sep->port; + 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->transport_proto, sep->is_ip4); + 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); @@ -1214,10 +1494,12 @@ application_start_local_listen (app_worker_t * app_wrk, * so parse it. */ int -application_stop_local_listen (session_handle_t lh, u32 app_index) +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_wrk_index; + 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; @@ -1242,28 +1524,44 @@ application_stop_local_listen (session_handle_t lh, u32 app_index) return -1; } - local_session_parse_handle (lh, &server_wrk_index, &ll_index); - server_wrk = app_worker_get (server_wrk_index); - if (PREDICT_FALSE (server_wrk->app_index != app_index)) + 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_wrk, ll_index); + + ll = application_get_local_listen_session (server, ll_index); if (PREDICT_FALSE (!ll)) { clib_warning ("no local listener"); return -1; } - application_local_listener_session_endpoint (ll, &sep); - session_lookup_del_session_endpoint (table_index, &sep); + 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* */ - pool_put_index (server_wrk->local_listen_sessions, ll->session_index); + + 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; } @@ -1300,8 +1598,7 @@ application_local_session_connect (app_worker_t * client_wrk, local_session_t *ls; svm_msg_q_t *sq, *cq; - ls = application_alloc_local_session (server_wrk); - + ls = application_local_session_alloc (server_wrk); server = application_get (server_wrk->app_index); client = application_get (client_wrk->app_index); @@ -1354,17 +1651,16 @@ application_local_session_connect (app_worker_t * client_wrk, segment_manager_segment_reader_unlock (sm); goto failed; } - ls->server_rx_fifo->master_session_index = ls->session_index; - ls->server_tx_fifo->master_session_index = ls->session_index; - ls->server_rx_fifo->master_thread_index = ~0; - ls->server_tx_fifo->master_thread_index = ~0; + 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; - if ((rv = server->cb_fns.add_segment_callback (server->api_client_index, + if ((rv = server->cb_fns.add_segment_callback (server_wrk->api_client_index, &seg->ssvm))) { clib_warning ("failed to notify server of new segment"); @@ -1418,7 +1714,7 @@ 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, + if ((rv = client->cb_fns.add_segment_callback (client_wrk->api_client_index, &seg->ssvm))) { clib_warning ("failed to notify client %u of new segment", @@ -1448,54 +1744,78 @@ application_local_session_cleanup (app_worker_t * client_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; - has_transport = session_has_transport ((stream_session_t *) ls); - client_key = application_client_local_connect_key (ls); + /* 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 - sm = app_worker_get_listen_segment_manager (server_wrk, - (stream_session_t *) ls); + { + 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) - hash_unset (client_wrk->local_connects, client_key); + { + 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); - server->cb_fns.del_segment_callback (server->api_client_index, + server->cb_fns.del_segment_callback (server_wrk->api_client_index, &seg->ssvm); if (client_wrk) { application_t *client = application_get (client_wrk->app_index); - client->cb_fns.del_segment_callback (client->api_client_index, + client->cb_fns.del_segment_callback (client_wrk->api_client_index, &seg->ssvm); } segment_manager_del_segment (sm, seg); } - application_free_local_session (server_wrk, ls); + application_local_session_free (server_wrk, ls); return 0; } int -application_local_session_disconnect (u32 app_wrk_index, local_session_t * ls) +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_wrk_index == ls->client_wrk_index) + if (app_index == ls->client_wrk_index) { mq_send_local_session_disconnected_cb (ls->app_wrk_index, ls); } @@ -1539,29 +1859,15 @@ application_local_session_disconnect_w_index (u32 app_wrk_index, u32 ls_index) } void -application_local_sessions_free (app_worker_t * app_wrk) +app_worker_local_sessions_free (app_worker_t * app_wrk) { - u32 index, server_wrk_index, session_index, table_index; - segment_manager_t *sm; + u32 index, server_wrk_index, session_index; u64 handle, *handles = 0; - local_session_t *ls, *ll; app_worker_t *server_wrk; - session_endpoint_t sep; - application_t *app; + segment_manager_t *sm; + local_session_t *ls; int i; - /* - * Local listens. Don't bother with local sessions, we clean them lower - */ - app = application_get (app_wrk->app_index); - table_index = application_local_session_table (app); - /* *INDENT-OFF* */ - pool_foreach (ll, app_wrk->local_listen_sessions, ({ - application_local_listener_session_endpoint (ll, &sep); - session_lookup_del_session_endpoint (table_index, &sep); - })); - /* *INDENT-ON* */ - /* * Local sessions */ @@ -1634,34 +1940,34 @@ 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; - u8 *app_name, *str; + const u8 *app_name; + u8 *str; if (!app_wrk) { if (verbose) - s = format (s, "%-40s%-25s%-15s%-15s%-10s", "Connection", "App", - "API Client", "ListenerID", "SegManager"); + s = format (s, "%-40s%-25s%=10s%-15s%-15s%-10s", "Connection", "App", + "Wrk", "API Client", "ListenerID", "SegManager"); else - s = format (s, "%-40s%-25s", "Connection", "App"); + s = format (s, "%-40s%-25s%=10s", "Connection", "App", "Wrk"); return s; } - app = application_get (app_wrk->app_index); - app_name = app_get_name_from_reg_index (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); if (verbose) { - s = format (s, "%-40s%-25s%-15u%-15u%-10u", str, app_name, - app->api_client_index, handle, sm_index); + 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", str, app_name); + s = format (s, "%-40s%-25s%=10u", str, app_name, app_wrk->wrk_map_index); - vec_free (app_name); return s; } @@ -1700,8 +2006,8 @@ 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; - u8 *app_name, *s = 0; - application_t *app; + const u8 *app_name; + u8 *s = 0; /* Header */ if (!app_wrk) @@ -1714,11 +2020,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_from_reg_index (app); + app_name = application_name_from_index (app_wrk->app_index); /* Across all fifo segments */ sm = segment_manager_get (app_wrk->connects_seg_manager); @@ -1730,33 +2035,32 @@ 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* */ - vec_free (app_name); } static void @@ -1800,13 +2104,6 @@ app_worker_format_local_sessions (app_worker_t * app_wrk, int verbose) return; /* *INDENT-OFF* */ - pool_foreach (ls, app_wrk->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); - })); 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, @@ -1823,8 +2120,12 @@ app_worker_format_local_sessions (app_worker_t * app_wrk, int verbose) 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) { @@ -1832,6 +2133,23 @@ application_format_local_sessions (application_t * app, int 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); @@ -1903,18 +2221,15 @@ 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; - const u8 *app_ns_name; - u8 *app_name; + const u8 *app_ns_name, *app_name; 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"); + s = format (s, "%-10s%-20s%-15s%-15s%-15s%-15s", "Index", "Name", + "Namespace", "Add seg size", "Rx-f size", "Tx-f size"); else - s = format (s, "%-10s%-20s%-15s%-40s", "Index", "Name", "API Client", - "Namespace"); + s = format (s, "%-10s%-20s%-40s", "Index", "Name", "Namespace"); return s; } @@ -1922,14 +2237,13 @@ format_application (u8 * s, va_list * args) 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, + s = format (s, "%-10u%-20s%-15u%-15U%-15U%-15U", app->app_index, + app_name, 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); + s = format (s, "%-10u%-20s%-40s", app->app_index, app_name, app_ns_name); return s; }