_(SESSION_RULES_DUMP, session_rules_dump) \
static int
-send_add_segment_callback (u32 api_client_index, const u8 * segment_name,
- u32 segment_size)
+session_send_memfd_fd (vl_api_registration_t * reg, const ssvm_private_t * sp)
+{
+ clib_error_t *error;
+ if (vl_api_registration_file_index (reg) == VL_API_INVALID_FI)
+ {
+ clib_warning ("can't send memfd fd");
+ return -1;
+ }
+ error = vl_api_send_fd_msg (reg, sp->fd);
+ if (error)
+ {
+ clib_error_report (error);
+ return -1;
+ }
+ return 0;
+}
+
+static int
+send_add_segment_callback (u32 api_client_index, const ssvm_private_t * sp)
{
vl_api_map_another_segment_t *mp;
- unix_shared_memory_queue_t *q;
+ vl_api_registration_t *reg;
- q = vl_api_client_index_to_input_queue (api_client_index);
+ reg = vl_mem_api_client_index_to_registration (api_client_index);
+ if (!reg)
+ {
+ clib_warning ("no registration: %u", api_client_index);
+ return -1;
+ }
- if (!q)
- return -1;
+ if (ssvm_type (sp) == SSVM_SEGMENT_MEMFD
+ && vl_api_registration_file_index (reg) == VL_API_INVALID_FI)
+ {
+ clib_warning ("can't send memfd fd");
+ return -1;
+ }
mp = vl_msg_api_alloc_as_if_client (sizeof (*mp));
memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_MAP_ANOTHER_SEGMENT);
- mp->segment_size = segment_size;
- strncpy ((char *) mp->segment_name, (char *) segment_name,
+ mp->segment_size = sp->ssvm_size;
+ strncpy ((char *) mp->segment_name, (char *) sp->name,
sizeof (mp->segment_name) - 1);
- vl_msg_api_send_shmem (q, (u8 *) & mp);
+ vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
+
+ if (ssvm_type (sp) == SSVM_SEGMENT_MEMFD)
+ return session_send_memfd_fd (reg, sp);
return 0;
}
static int
send_session_accept_callback (stream_session_t * s)
{
- vl_api_accept_session_t *mp;
- unix_shared_memory_queue_t *q, *vpp_queue;
application_t *server = application_get (s->app_index);
- transport_connection_t *tc;
transport_proto_vft_t *tp_vft;
+ vl_api_accept_session_t *mp;
+ vl_api_registration_t *reg;
+ transport_connection_t *tc;
stream_session_t *listener;
+ svm_queue_t *vpp_queue;
- q = vl_api_client_index_to_input_queue (server->api_client_index);
vpp_queue = session_manager_get_vpp_event_queue (s->thread_index);
+ reg = vl_mem_api_client_index_to_registration (server->api_client_index);
+ if (!reg)
+ {
+ clib_warning ("no registration: %u", server->api_client_index);
+ return -1;
+ }
- if (!q)
- return -1;
-
- mp = vl_msg_api_alloc_as_if_client (sizeof (*mp));
+ mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp));
memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_ACCEPT_SESSION);
mp->port = tc->rmt_port;
mp->is_ip4 = tc->is_ip4;
clib_memcpy (&mp->ip, &tc->rmt_ip, sizeof (tc->rmt_ip));
- vl_msg_api_send_shmem (q, (u8 *) & mp);
+ vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
return 0;
}
static void
send_session_disconnect_callback (stream_session_t * s)
{
- vl_api_disconnect_session_t *mp;
- unix_shared_memory_queue_t *q;
application_t *app = application_get (s->app_index);
+ vl_api_disconnect_session_t *mp;
+ vl_api_registration_t *reg;
- q = vl_api_client_index_to_input_queue (app->api_client_index);
-
- if (!q)
- return;
+ reg = vl_mem_api_client_index_to_registration (app->api_client_index);
+ if (!reg)
+ {
+ clib_warning ("no registration: %u", app->api_client_index);
+ return;
+ }
- mp = vl_msg_api_alloc_as_if_client (sizeof (*mp));
+ mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp));
memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_DISCONNECT_SESSION);
mp->handle = session_handle (s);
- vl_msg_api_send_shmem (q, (u8 *) & mp);
+ vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
}
static void
send_session_reset_callback (stream_session_t * s)
{
- vl_api_reset_session_t *mp;
- unix_shared_memory_queue_t *q;
application_t *app = application_get (s->app_index);
+ vl_api_registration_t *reg;
+ vl_api_reset_session_t *mp;
- q = vl_api_client_index_to_input_queue (app->api_client_index);
-
- if (!q)
- return;
+ reg = vl_mem_api_client_index_to_registration (app->api_client_index);
+ if (!reg)
+ {
+ clib_warning ("no registration: %u", app->api_client_index);
+ return;
+ }
- mp = vl_msg_api_alloc_as_if_client (sizeof (*mp));
+ mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp));
memset (mp, 0, sizeof (*mp));
mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_RESET_SESSION);
mp->handle = session_handle (s);
- vl_msg_api_send_shmem (q, (u8 *) & mp);
+ vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
}
int
stream_session_t * s, u8 is_fail)
{
vl_api_connect_session_reply_t *mp;
- unix_shared_memory_queue_t *q;
- application_t *app;
- unix_shared_memory_queue_t *vpp_queue;
transport_connection_t *tc;
+ vl_api_registration_t *reg;
+ svm_queue_t *vpp_queue;
+ application_t *app;
app = application_get (app_index);
- q = vl_api_client_index_to_input_queue (app->api_client_index);
-
- if (!q)
- return -1;
+ reg = vl_mem_api_client_index_to_registration (app->api_client_index);
+ if (!reg)
+ {
+ clib_warning ("no registration: %u", app->api_client_index);
+ return -1;
+ }
- mp = vl_msg_api_alloc_as_if_client (sizeof (*mp));
+ mp = vl_mem_api_alloc_as_if_client_w_reg (reg, sizeof (*mp));
mp->_vl_msg_id = clib_host_to_net_u16 (VL_API_CONNECT_SESSION_REPLY);
mp->context = api_context;
done:
mp->retval = is_fail ?
clib_host_to_net_u32 (VNET_API_ERROR_SESSION_CONNECT) : 0;
- vl_msg_api_send_shmem (q, (u8 *) & mp);
+ vl_msg_api_send_shmem (reg->vl_input_queue, (u8 *) & mp);
return 0;
}
redirect_connect_callback (u32 server_api_client_index, void *mp_arg)
{
vl_api_connect_sock_t *mp = mp_arg;
- unix_shared_memory_queue_t *server_q, *client_q;
+ svm_queue_t *server_q, *client_q;
segment_manager_properties_t *props;
vlib_main_t *vm = vlib_get_main ();
f64 timeout = vlib_time_now (vm) + 0.5;
}
props = segment_manager_properties_get (app->sm_properties);
- mp->options[SESSION_OPTIONS_RX_FIFO_SIZE] = props->rx_fifo_size;
- mp->options[SESSION_OPTIONS_TX_FIFO_SIZE] = props->tx_fifo_size;
+ mp->options[APP_OPTIONS_RX_FIFO_SIZE] = props->rx_fifo_size;
+ mp->options[APP_OPTIONS_TX_FIFO_SIZE] = props->tx_fifo_size;
/*
* Bounce message handlers MUST NOT block the data-plane.
while (vlib_time_now (vm) < timeout)
{
- rv =
- unix_shared_memory_queue_add (server_q, (u8 *) & mp, 1 /*nowait */ );
+ rv = svm_queue_add (server_q, (u8 *) & mp, 1 /*nowait */ );
switch (rv)
{
/* correctly enqueued */
vl_api_application_attach_t_handler (vl_api_application_attach_t * mp)
{
vl_api_application_attach_reply_t *rmp;
+ ssvm_private_t *segp, *evt_q_segment;
vnet_app_attach_args_t _a, *a = &_a;
+ vl_api_registration_t *reg;
clib_error_t *error = 0;
int rv = 0;
goto done;
}
- STATIC_ASSERT (sizeof (u64) * SESSION_OPTIONS_N_OPTIONS <=
+ STATIC_ASSERT (sizeof (u64) * APP_OPTIONS_N_OPTIONS <=
sizeof (mp->options),
"Out of options, fix api message definition");
REPLY_MACRO2 (VL_API_APPLICATION_ATTACH_REPLY, ({
if (!rv)
{
+ segp = a->segment;
rmp->segment_name_length = 0;
- rmp->segment_size = a->segment_size;
- if (a->segment_name_length)
+ rmp->segment_size = segp->ssvm_size;
+ if (vec_len (segp->name))
{
- memcpy (rmp->segment_name, a->segment_name,
- a->segment_name_length);
- rmp->segment_name_length = a->segment_name_length;
+ memcpy (rmp->segment_name, segp->name, vec_len (segp->name));
+ rmp->segment_name_length = vec_len (segp->name);
}
rmp->app_event_queue_address = a->app_event_queue_address;
}
}));
/* *INDENT-ON* */
+
+ if (rv)
+ return;
+
+ reg = vl_api_client_index_to_registration (mp->client_index);
+
+ /* Send fifo segment fd if needed */
+ if (ssvm_type (a->segment) == SSVM_SEGMENT_MEMFD)
+ session_send_memfd_fd (reg, a->segment);
+ /* Send event queues segment */
+ if ((evt_q_segment = session_manager_get_evt_q_segment ()))
+ session_send_memfd_fd (reg, evt_q_segment);
}
static void
{
rmp->handle = a->handle;
rmp->lcl_port = mp->port;
- if (application_has_global_scope (app))
+ if (app && application_has_global_scope (app))
{
s = listen_session_get_from_handle (a->handle);
tc = listen_session_get_transport (s);
app = application_lookup (mp->client_index);
if (app)
{
- unix_shared_memory_queue_t *client_q;
+ svm_queue_t *client_q;
ip46_address_t *ip46 = (ip46_address_t *) mp->ip;
client_q = vl_api_client_index_to_input_queue (mp->client_index);
static void
send_session_rule_details4 (mma_rule_16_t * rule, u8 is_local,
u8 transport_proto, u32 appns_index, u8 * tag,
- unix_shared_memory_queue_t * q, u32 context)
+ vl_api_registration_t * reg, u32 context)
{
vl_api_session_rules_details_t *rmp = 0;
session_mask_or_match_4_t *match =
rmp->tag[vec_len (tag)] = 0;
}
- vl_msg_api_send_shmem (q, (u8 *) & rmp);
+ vl_api_send_msg (reg, (u8 *) rmp);
}
static void
send_session_rule_details6 (mma_rule_40_t * rule, u8 is_local,
u8 transport_proto, u32 appns_index, u8 * tag,
- unix_shared_memory_queue_t * q, u32 context)
+ vl_api_registration_t * reg, u32 context)
{
vl_api_session_rules_details_t *rmp = 0;
session_mask_or_match_6_t *match =
rmp->tag[vec_len (tag)] = 0;
}
- vl_msg_api_send_shmem (q, (u8 *) & rmp);
+ vl_api_send_msg (reg, (u8 *) rmp);
}
static void
send_session_rules_table_details (session_rules_table_t * srt, u8 fib_proto,
u8 tp, u8 is_local, u32 appns_index,
- unix_shared_memory_queue_t * q, u32 context)
+ vl_api_registration_t * reg, u32 context)
{
mma_rule_16_t *rule16;
mma_rule_40_t *rule40;
ri = mma_rules_table_rule_index_16 (srt16, rule16);
tag = session_rules_table_rule_tag (srt, ri, 1);
send_session_rule_details4 (rule16, is_local, tp, appns_index, tag,
- q, context);
+ reg, context);
}));
/* *INDENT-ON* */
}
ri = mma_rules_table_rule_index_40 (srt40, rule40);
tag = session_rules_table_rule_tag (srt, ri, 1);
send_session_rule_details6 (rule40, is_local, tp, appns_index, tag,
- q, context);
+ reg, context);
}));
/* *INDENT-ON* */
}
static void
vl_api_session_rules_dump_t_handler (vl_api_one_map_server_dump_t * mp)
{
- unix_shared_memory_queue_t *q = NULL;
+ vl_api_registration_t *reg;
session_table_t *st;
u8 tp;
- q = vl_api_client_index_to_input_queue (mp->client_index);
- if (q == 0)
+ reg = vl_api_client_index_to_registration (mp->client_index);
+ if (!reg)
return;
/* *INDENT-OFF* */
{
send_session_rules_table_details (&st->session_rules[tp],
st->active_fib_proto, tp,
- st->is_local, st->appns_index, q,
+ st->is_local, st->appns_index, reg,
mp->context);
}
}));