int
application_api_queue_is_full (application_t * app)
{
- unix_shared_memory_queue_t *q;
+ svm_queue_t *q;
/* builtin servers are always OK */
if (app->api_client_index == ~0)
clib_warning ("No session reset callback function provided");
}
+/**
+ * Check app config for given segment type
+ *
+ * Returns 1 on success and 0 otherwise
+ */
+static u8
+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);
+ 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);
+ if (!is_valid)
+ clib_warning ("shm seg: vpp's event qs NOT IN binary api svm region");
+ return is_valid;
+ }
+ else
+ return 1;
+}
+
int
application_init (application_t * app, u32 api_client_index, u64 * options,
session_cb_vft_t * cb_fns)
{
- segment_manager_t *sm;
- segment_manager_properties_t *props;
+ ssvm_segment_type_t st = SSVM_SEGMENT_MEMFD;
u32 app_evt_queue_size, first_seg_size;
- u32 default_rx_fifo_size = 16 << 10, default_tx_fifo_size = 16 << 10;
+ segment_manager_properties_t *props;
+ vl_api_registration_t *reg;
+ segment_manager_t *sm;
int rv;
- app_evt_queue_size = options[APP_EVT_QUEUE_SIZE] > 0 ?
- options[APP_EVT_QUEUE_SIZE] : default_app_evt_queue_size;
+ /*
+ * Make sure we support the requested configuration
+ */
+ reg = vl_api_client_index_to_registration (api_client_index);
+ if (!reg)
+ return VNET_API_ERROR_APP_UNSUPPORTED_CFG;
+
+ if (vl_api_registration_file_index (reg) == ~0)
+ st = SSVM_SEGMENT_SHM;
+
+ if (!application_verify_cfg (st))
+ return VNET_API_ERROR_APP_UNSUPPORTED_CFG;
/*
* Setup segment manager
sm->app_index = app->index;
props = segment_manager_properties_alloc ();
app->sm_properties = segment_manager_properties_index (props);
- props->add_segment_size = options[SESSION_OPTIONS_ADD_SEGMENT_SIZE];
- props->rx_fifo_size = options[SESSION_OPTIONS_RX_FIFO_SIZE];
- props->rx_fifo_size =
- props->rx_fifo_size ? props->rx_fifo_size : default_rx_fifo_size;
- props->tx_fifo_size = options[SESSION_OPTIONS_TX_FIFO_SIZE];
- props->tx_fifo_size =
- props->tx_fifo_size ? props->tx_fifo_size : default_tx_fifo_size;
- props->add_segment = props->add_segment_size != 0;
+ if (options[APP_OPTIONS_ADD_SEGMENT_SIZE])
+ {
+ props->add_segment_size = options[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];
props->preallocated_fifo_pairs = options[APP_OPTIONS_PREALLOC_FIFO_PAIRS];
- props->use_private_segment = options[APP_OPTIONS_FLAGS]
- & APP_OPTIONS_FLAGS_IS_BUILTIN;
props->private_segment_count = options[APP_OPTIONS_PRIVATE_SEGMENT_COUNT];
- props->private_segment_size = options[APP_OPTIONS_PRIVATE_SEGMENT_SIZE];
+ if (options[APP_OPTIONS_FLAGS] & APP_OPTIONS_FLAGS_IS_BUILTIN)
+ props->segment_type = SSVM_N_SEGMENT_TYPES;
+ else
+ props->segment_type = st;
- first_seg_size = options[SESSION_OPTIONS_SEGMENT_SIZE];
- if ((rv = segment_manager_init (sm, app->sm_properties, first_seg_size)))
+ app_evt_queue_size = options[APP_OPTIONS_EVT_QUEUE_SIZE] > 0 ?
+ options[APP_OPTIONS_EVT_QUEUE_SIZE] : default_app_evt_queue_size;
+ first_seg_size = options[APP_OPTIONS_SEGMENT_SIZE];
+ if ((rv = segment_manager_init (sm, app->sm_properties, first_seg_size,
+ app_evt_queue_size)))
return rv;
sm->first_is_protected = 1;
application_add_segment_notify (u32 app_index, u32 fifo_segment_index)
{
application_t *app = application_get (app_index);
- u32 seg_size = 0;
- u8 *seg_name;
+ svm_fifo_segment_private_t *fs;
/* Send an API message to the external app, to map new segment */
ASSERT (app->cb_fns.add_segment_callback);
- segment_manager_get_segment_info (fifo_segment_index, &seg_name, &seg_size);
- return app->cb_fns.add_segment_callback (app->api_client_index, seg_name,
- seg_size);
+ fs = segment_manager_get_segment (fifo_segment_index);
+ return app->cb_fns.add_segment_callback (app->api_client_index, &fs->ssvm);
}
u8
/* *INDENT-OFF* */
hash_foreach (handle, sm_index, app->listeners_table, ({
listener = listen_session_get_from_handle (handle);
- if (listener->session_type == sst)
+ if (listener->session_type == sst
+ && listener->listener_index != SESSION_PROXY_LISTENER_INDEX)
+ return listener;
+ }));
+ /* *INDENT-ON* */
+
+ return 0;
+}
+
+stream_session_t *
+application_proxy_listener (application_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->listener_index == SESSION_PROXY_LISTENER_INDEX)
return listener;
}));
/* *INDENT-ON* */
if (is_start)
{
- sep.is_ip4 = is_ip4;
- 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;
- application_start_listen (app, &sep, &handle);
- s = listen_session_get_from_handle (handle);
+ s = application_first_listener (app, fib_proto, transport_proto);
+ if (!s)
+ {
+ sep.is_ip4 = is_ip4;
+ 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;
+ application_start_listen (app, &sep, &handle);
+ s = listen_session_get_from_handle (handle);
+ s->listener_index = SESSION_PROXY_LISTENER_INDEX;
+ }
}
else
{
- s = application_first_listener (app, fib_proto, transport_proto);
+ s = application_proxy_listener (app, fib_proto, transport_proto);
+ ASSERT (s);
}
+
tc = listen_session_get_transport (s);
if (!ip_is_zero (&tc->lcl_ip, 1))
sep.transport_proto = transport_proto;
sep.port = 0;
sti = session_lookup_get_index_for_fib (fib_proto, sep.fib_index);
- session_lookup_add_session_endpoint (sti, &sep, s->session_index);
+ if (is_start)
+ session_lookup_add_session_endpoint (sti, &sep, s->session_index);
+ else
+ session_lookup_del_session_endpoint (sti, &sep);
}
+
return 0;
}
-void
-application_start_stop_proxy (application_t * app, u8 transport_proto,
- u8 is_start)
+static void
+application_start_stop_proxy_local_scope (application_t * app,
+ u8 transport_proto, u8 is_start)
{
- if (application_has_local_scope (app))
+ session_endpoint_t sep = SESSION_ENDPOINT_NULL;
+ app_namespace_t *app_ns;
+ app_ns = app_namespace_get (app->ns_index);
+ sep.is_ip4 = 1;
+ sep.transport_proto = transport_proto;
+ sep.port = 0;
+
+ if (is_start)
{
- session_endpoint_t sep = SESSION_ENDPOINT_NULL;
- app_namespace_t *app_ns;
- app_ns = app_namespace_get (app->ns_index);
- sep.is_ip4 = 1;
- sep.transport_proto = transport_proto;
- sep.port = 0;
session_lookup_add_session_endpoint (app_ns->local_table_index, &sep,
app->index);
-
sep.is_ip4 = 0;
session_lookup_add_session_endpoint (app_ns->local_table_index, &sep,
app->index);
}
+ else
+ {
+ session_lookup_del_session_endpoint (app_ns->local_table_index, &sep);
+ sep.is_ip4 = 0;
+ session_lookup_del_session_endpoint (app_ns->local_table_index, &sep);
+ }
+}
+
+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_setup_proxy (application_t * app)
{
u16 transports = app->proxied_transports;
+ transport_proto_t tp;
+
ASSERT (application_is_proxy (app));
if (application_is_builtin (app))
return;
- if (transports & (1 << TRANSPORT_PROTO_TCP))
- application_start_stop_proxy (app, TRANSPORT_PROTO_TCP, 1);
- if (transports & (1 << TRANSPORT_PROTO_UDP))
- application_start_stop_proxy (app, TRANSPORT_PROTO_UDP, 1);
+
+ /* *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));
- if (transports & (1 << TRANSPORT_PROTO_TCP))
- application_start_stop_proxy (app, TRANSPORT_PROTO_TCP, 0);
- if (transports & (1 << TRANSPORT_PROTO_UDP))
- application_start_stop_proxy (app, TRANSPORT_PROTO_UDP, 0);
+
+ /* *INDENT-OFF* */
+ transport_proto_foreach (tp, ({
+ if (transports & (1 << tp))
+ application_start_stop_proxy (app, tp, 0);
+ }));
+ /* *INDENT-ON* */
}
u8 *
{
if (verbose)
s = format (s, "%-10s%-20s%-15s%-15s%-15s%-15s%-15s", "Index", "Name",
- "Namespace", "API Client", "Add seg size", "Rx fifo size",
+ "API Client", "Namespace", "Add seg size", "Rx fifo size",
"Tx fifo size");
else
s =
- format (s, "%-10s%-20s%-15s%-20s", "Index", "Name", "Namespace",
- "API Client");
+ format (s, "%-10s%-20s%-15s%-40s", "Index", "Name", "API Client",
+ "Namespace");
return s;
}
props = segment_manager_properties_get (app->sm_properties);
if (verbose)
s =
- format (s, "%-10d%-20s%-15s%-15d%-15d%-15d%-15d", app->index, app_name,
- app_ns_name, app->api_client_index,
+ format (s, "%-10d%-20s%-15d%-15d%-15d%-15d%-15d", app->index, app_name,
+ app->api_client_index, app->ns_index,
props->add_segment_size,
props->rx_fifo_size, props->tx_fifo_size);
else
- s = format (s, "%-10d%-20s%-15s%-20d", app->index, app_name, app_ns_name,
- app->api_client_index);
+ s = format (s, "%-10d%-20s%-15d%-40s", app->index, app_name,
+ app->api_client_index, app_ns_name);
return s;
}
Code Review / vpp.git / blobdiff