X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fapplication_interface.c;h=6b012bb845d3166439f275fefff28d411d4cbf7f;hb=2179513b71963a0b42ca6f1f2b641e79ce89447b;hp=dbd5e49417f37ca37380bb40879c1a78e7255f75;hpb=8f89dd01289ea9e97405432d2351a19c842dd6d5;p=vpp.git diff --git a/src/vnet/session/application_interface.c b/src/vnet/session/application_interface.c index dbd5e49417f..6b012bb845d 100644 --- a/src/vnet/session/application_interface.c +++ b/src/vnet/session/application_interface.c @@ -97,8 +97,8 @@ session_endpoint_is_zero (session_endpoint_t * sep) u8 session_endpoint_in_ns (session_endpoint_t * sep) { - u8 is_zero = ip_is_zero (&sep->ip, sep->is_ip4); - if (!is_zero && sep->sw_if_index != ENDPOINT_INVALID_INDEX + u8 is_lep = session_endpoint_is_local (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", @@ -106,7 +106,7 @@ session_endpoint_in_ns (session_endpoint_t * sep) sep->is_ip4); return 0; } - return (is_zero || ip_is_local (sep->fib_index, &sep->ip, sep->is_ip4)); + return (is_lep || ip_is_local (sep->fib_index, &sep->ip, sep->is_ip4)); } int @@ -130,11 +130,25 @@ api_parse_session_handle (u64 handle, u32 * session_index, u32 * thread_index) } static void -session_endpoint_update_for_app (session_endpoint_t * sep, +session_endpoint_update_for_app (session_endpoint_extended_t * sep, application_t * app) { app_namespace_t *app_ns; - app_ns = app_namespace_get (app->ns_index); + u32 ns_index; + + ns_index = app->ns_index; + + /* App is a transport proto, so fetch the calling app's ns */ + if (app->flags & APP_OPTIONS_FLAGS_IS_TRANSPORT_APP) + { + app_worker_t *owner_wrk; + application_t *owner_app; + + owner_wrk = app_worker_get (sep->app_wrk_index); + owner_app = application_get (owner_wrk->app_index); + ns_index = owner_app->ns_index; + } + app_ns = app_namespace_get (ns_index); if (app_ns) { /* Ask transport and network to bind to/connect using local interface @@ -147,40 +161,38 @@ session_endpoint_update_for_app (session_endpoint_t * sep, } } -static int -vnet_bind_i (u32 app_index, session_endpoint_t * sep, u64 * handle) +static inline int +vnet_bind_inline (vnet_bind_args_t * a) { - u64 lh, ll_handle = SESSION_INVALID_HANDLE; + u64 ll_handle = SESSION_INVALID_HANDLE; + app_worker_t *app_wrk; application_t *app; - u32 table_index; int rv; - app = application_get_if_valid (app_index); + app = application_get_if_valid (a->app_index); if (!app) { SESSION_DBG ("app not attached"); return VNET_API_ERROR_APPLICATION_NOT_ATTACHED; } + app_wrk = application_get_worker (app, a->wrk_map_index); + a->sep_ext.app_wrk_index = app_wrk->wrk_index; - session_endpoint_update_for_app (sep, app); - if (!session_endpoint_in_ns (sep)) + session_endpoint_update_for_app (&a->sep_ext, app); + if (!session_endpoint_in_ns (&a->sep)) return VNET_API_ERROR_INVALID_VALUE_2; - table_index = application_session_table (app, - session_endpoint_fib_proto (sep)); - lh = session_lookup_endpoint_listener (table_index, sep, 1); - if (lh != SESSION_INVALID_HANDLE) - return VNET_API_ERROR_ADDRESS_IN_USE; - /* * 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_zero (sep)) + if (application_has_local_scope (app) + && session_endpoint_is_local (&a->sep)) { - if ((rv = application_start_local_listen (app, sep, handle))) + if ((rv = application_start_local_listen (app, &a->sep_ext, + &a->handle))) return rv; - ll_handle = *handle; + ll_handle = a->handle; } if (!application_has_global_scope (app)) @@ -191,13 +203,17 @@ vnet_bind_i (u32 app_index, session_endpoint_t * sep, u64 * handle) */ /* Setup listen path down to transport */ - rv = application_start_listen (app, sep, handle); + rv = application_start_listen (app, &a->sep_ext, &a->handle); if (rv && ll_handle != SESSION_INVALID_HANDLE) - session_lookup_del_session_endpoint (table_index, sep); + { + application_stop_local_listen (a->app_index, a->wrk_map_index, + ll_handle); + return rv; + } /* * Store in local table listener the index of the transport layer - * listener. We'll need local listeners are hit and we need to + * listener. We'll need if if local listeners are hit and we need to * return global handle */ if (ll_handle != SESSION_INVALID_HANDLE) @@ -205,27 +221,29 @@ vnet_bind_i (u32 app_index, session_endpoint_t * sep, u64 * handle) local_session_t *ll; stream_session_t *tl; ll = application_get_local_listener_w_handle (ll_handle); - tl = listen_session_get_from_handle (*handle); - ll->transport_listener_index = tl->session_index; + tl = listen_session_get_from_handle (a->handle); + if (ll->transport_listener_index == ~0) + ll->transport_listener_index = tl->session_index; } return rv; } -int -vnet_unbind_i (u32 app_index, session_handle_t handle) +static inline int +vnet_unbind_inline (vnet_unbind_args_t * a) { application_t *app; int rv; - if (!(app = application_get_if_valid (app_index))) + if (!(app = application_get_if_valid (a->app_index))) { - SESSION_DBG ("app (%d) not attached", app_index); + SESSION_DBG ("app (%d) not attached", wrk_map_index); return VNET_API_ERROR_APPLICATION_NOT_ATTACHED; } if (application_has_local_scope (app)) { - if ((rv = application_stop_local_listen (app, handle))) + if ((rv = application_stop_local_listen (a->app_index, + a->wrk_map_index, a->handle))) return rv; } @@ -233,25 +251,28 @@ vnet_unbind_i (u32 app_index, session_handle_t handle) * Clear the global scope table of the listener */ if (application_has_global_scope (app)) - return application_stop_listen (app, handle); + return application_stop_listen (a->app_index, a->wrk_map_index, + a->handle); return 0; } -int -application_connect (u32 client_index, u32 api_context, - session_endpoint_t * sep) +static int +application_connect (vnet_connect_args_t * a) { - application_t *server, *client; + app_worker_t *server_wrk, *client_wrk; u32 table_index, server_index, li; stream_session_t *listener; + application_t *client, *server; local_session_t *ll; + u8 fib_proto; u64 lh; - if (session_endpoint_is_zero (sep)) + if (session_endpoint_is_zero (&a->sep)) return VNET_API_ERROR_INVALID_VALUE; - client = application_get (client_index); - session_endpoint_update_for_app (sep, client); + client = application_get (a->app_index); + session_endpoint_update_for_app (&a->sep_ext, client); + client_wrk = application_get_worker (client, a->wrk_map_index); /* * First check the local scope for locally attached destinations. @@ -261,7 +282,7 @@ application_connect (u32 client_index, u32 api_context, if (application_has_local_scope (client)) { table_index = application_local_session_table (client); - lh = session_lookup_local_endpoint (table_index, sep); + lh = session_lookup_local_endpoint (table_index, &a->sep); if (lh == SESSION_DROP_HANDLE) return VNET_API_ERROR_APP_CONNECT_FILTERED; @@ -275,12 +296,16 @@ application_connect (u32 client_index, u32 api_context, * can happen if client is a generic proxy. Route connect through * global table instead. */ - if (server_index != client_index) + if (server_index != a->app_index) { server = application_get (server_index); ll = application_get_local_listen_session (server, li); - return application_local_session_connect (table_index, client, - server, ll, api_context); + listener = (stream_session_t *) ll; + server_wrk = application_listener_select_worker (listener, + 1 /* is_local */ ); + return application_local_session_connect (client_wrk, + server_wrk, ll, + a->api_context); } } @@ -290,28 +315,28 @@ application_connect (u32 client_index, u32 api_context, */ global_scope: - if (session_endpoint_is_local (sep)) + if (session_endpoint_is_local (&a->sep)) return VNET_API_ERROR_SESSION_CONNECT; if (!application_has_global_scope (client)) return VNET_API_ERROR_APP_CONNECT_SCOPE; - table_index = application_session_table (client, - session_endpoint_fib_proto (sep)); - listener = session_lookup_listener (table_index, sep); + fib_proto = session_endpoint_fib_proto (&a->sep); + table_index = application_session_table (client, fib_proto); + listener = session_lookup_listener (table_index, &a->sep); if (listener) { - server = application_get (listener->app_index); - if (server) - return application_local_session_connect (table_index, client, server, - (local_session_t *) - listener, api_context); + server_wrk = application_listener_select_worker (listener, + 0 /* is_local */ ); + ll = (local_session_t *) listener; + return application_local_session_connect (client_wrk, server_wrk, ll, + a->api_context); } /* * Not connecting to a local server, propagate to transport */ - if (application_open_session (client, sep, api_context)) + if (app_worker_open_session (client_wrk, &a->sep, a->api_context)) return VNET_API_ERROR_SESSION_CONNECT; return 0; } @@ -415,7 +440,7 @@ parse_uri (char *uri, session_endpoint_extended_t * sep) } static int -session_validate_namespace (u8 * namespace_id, u64 secret, u32 * app_ns_index) +app_validate_namespace (u8 * namespace_id, u64 secret, u32 * app_ns_index) { app_namespace_t *app_ns; if (vec_len (namespace_id) == 0) @@ -448,28 +473,38 @@ vnet_application_attach (vnet_app_attach_args_t * a) { svm_fifo_segment_private_t *fs; application_t *app = 0; + app_worker_t *app_wrk; segment_manager_t *sm; u32 app_ns_index = 0; u64 secret; int rv; - app = application_lookup (a->api_client_index); + 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 clib_error_return_code (0, VNET_API_ERROR_INVALID_VALUE, 0, + "api index or name must be provided"); + if (app) - return clib_error_return_code (0, VNET_API_ERROR_APP_ALREADY_ATTACHED, - 0, "app already attached"); + return clib_error_return_code (0, VNET_API_ERROR_APP_ALREADY_ATTACHED, 0, + "app already attached"); secret = a->options[APP_OPTIONS_NAMESPACE_SECRET]; - if ((rv = session_validate_namespace (a->namespace_id, secret, - &app_ns_index))) + if ((rv = app_validate_namespace (a->namespace_id, secret, &app_ns_index))) return clib_error_return_code (0, rv, 0, "namespace validation: %d", rv); a->options[APP_OPTIONS_NAMESPACE] = app_ns_index; - app = application_new (); - if ((rv = application_init (app, a->api_client_index, a->options, - a->session_cb_vft))) + + if ((rv = application_alloc_and_init ((app_init_args_t *) a))) return clib_error_return_code (0, rv, 0, "app init: %d", rv); - a->app_event_queue_address = pointer_to_uword (app->event_queue); - sm = segment_manager_get (app->first_segment_manager); + app = application_get (a->app_index); + if ((rv = app_worker_alloc_and_init (app, &app_wrk))) + return clib_error_return_code (0, rv, 0, "app default wrk init: %d", rv); + + a->app_evt_q = app_wrk->event_queue; + sm = segment_manager_get (app_wrk->first_segment_manager); fs = segment_manager_get_segment_w_lock (sm, 0); if (application_is_proxy (app)) @@ -477,7 +512,6 @@ vnet_application_attach (vnet_app_attach_args_t * a) ASSERT (vec_len (fs->ssvm.name) <= 128); a->segment = &fs->ssvm; - a->app_index = app->index; segment_manager_segment_reader_unlock (sm); @@ -499,7 +533,7 @@ vnet_application_detach (vnet_app_detach_args_t * a) return VNET_API_ERROR_APPLICATION_NOT_ATTACHED; } - application_del (app); + application_free (app); return 0; } @@ -512,8 +546,8 @@ vnet_bind_uri (vnet_bind_args_t * a) rv = parse_uri (a->uri, &sep); if (rv) return rv; - - return vnet_bind_i (a->app_index, (session_endpoint_t *) & sep, &a->handle); + clib_memcpy (&a->sep_ext, &sep, sizeof (sep)); + return vnet_bind_inline (a); } int @@ -521,18 +555,22 @@ vnet_unbind_uri (vnet_unbind_args_t * a) { session_endpoint_extended_t sep = SESSION_ENDPOINT_EXT_NULL; stream_session_t *listener; + u32 table_index; int rv; rv = parse_uri (a->uri, &sep); if (rv) return rv; - /* NOTE: only default table supported for uri */ - listener = session_lookup_listener (0, (session_endpoint_t *) & sep); + /* NOTE: only default fib tables supported for uri apis */ + table_index = session_lookup_get_index_for_fib (fib_ip_proto (!sep.is_ip4), + 0); + listener = session_lookup_listener (table_index, + (session_endpoint_t *) & sep); if (!listener) return VNET_API_ERROR_ADDRESS_NOT_IN_USE; - - return vnet_unbind_i (a->app_index, listen_session_get_handle (listener)); + a->handle = listen_session_get_handle (listener); + return vnet_unbind_inline (a); } clib_error_t * @@ -546,8 +584,8 @@ vnet_connect_uri (vnet_connect_args_t * a) if (rv) return clib_error_return_code (0, rv, 0, "app init: %d", rv); - if ((rv = application_connect (a->app_index, a->api_context, - (session_endpoint_t *) & sep))) + clib_memcpy (&a->sep_ext, &sep, sizeof (sep)); + if ((rv = application_connect (a))) return clib_error_return_code (0, rv, 0, "connect failed"); return 0; } @@ -558,20 +596,30 @@ vnet_disconnect_session (vnet_disconnect_args_t * a) if (session_handle_is_local (a->handle)) { local_session_t *ls; - ls = application_get_local_session_from_handle (a->handle); - if (ls->app_index != a->app_index && ls->client_index != a->app_index) + + /* Disconnect reply came to worker 1 not main thread */ + if (vlib_get_thread_index () == 1) { - clib_warning ("app %u is neither client nor server for session %u", - a->app_index, a->app_index); - return VNET_API_ERROR_INVALID_VALUE; + vlib_rpc_call_main_thread (vnet_disconnect_session, (u8 *) a, + sizeof (*a)); + return 0; } + + if (!(ls = application_get_local_session_from_handle (a->handle))) + return 0; + return application_local_session_disconnect (a->app_index, ls); } else { + app_worker_t *app_wrk; stream_session_t *s; + s = session_get_from_handle_if_valid (a->handle); - if (!s || s->app_index != a->app_index) + if (!s) + return VNET_API_ERROR_INVALID_VALUE; + app_wrk = app_worker_get (s->app_wrk_index); + if (app_wrk->app_index != a->app_index) return VNET_API_ERROR_INVALID_VALUE; /* We're peeking into another's thread pool. Make sure */ @@ -586,8 +634,8 @@ clib_error_t * vnet_bind (vnet_bind_args_t * a) { int rv; - if ((rv = vnet_bind_i (a->app_index, &a->sep, &a->handle))) - return clib_error_return_code (0, rv, 0, "bind failed"); + if ((rv = vnet_bind_inline (a))) + return clib_error_return_code (0, rv, 0, "bind failed: %d", rv); return 0; } @@ -595,19 +643,18 @@ clib_error_t * vnet_unbind (vnet_unbind_args_t * a) { int rv; - if ((rv = vnet_unbind_i (a->app_index, a->handle))) - return clib_error_return_code (0, rv, 0, "unbind failed"); + if ((rv = vnet_unbind_inline (a))) + return clib_error_return_code (0, rv, 0, "unbind failed: %d", rv); return 0; } clib_error_t * vnet_connect (vnet_connect_args_t * a) { - session_endpoint_t *sep = (session_endpoint_t *) & a->sep; int rv; - if ((rv = application_connect (a->app_index, a->api_context, sep))) - return clib_error_return_code (0, rv, 0, "connect failed"); + if ((rv = application_connect (a))) + return clib_error_return_code (0, rv, 0, "connect failed: %d", rv); return 0; }