session_send_evt_to_thread (void *data, void *args, u32 thread_index,
session_evt_type_t evt_type)
{
+ session_worker_t *wrk = session_main_get_worker (thread_index);
session_event_t *evt;
svm_msg_q_msg_t msg;
svm_msg_q_t *mq;
- mq = session_main_get_vpp_event_queue (thread_index);
+ mq = wrk->vpp_event_queue;
if (PREDICT_FALSE (svm_msg_q_lock (mq)))
return -1;
if (PREDICT_FALSE (svm_msg_q_is_full (mq)
evt->event_type = evt_type;
svm_msg_q_add_and_unlock (mq, &msg);
+
+ if (PREDICT_FALSE (wrk->state == SESSION_WRK_INTERRUPT))
+ vlib_node_set_interrupt_pending (wrk->vm, session_queue_node.index);
+
return 0;
}
int
session_send_ctrl_evt_to_thread (session_t * s, session_evt_type_t evt_type)
{
- /* only events supported are disconnect and reset */
- ASSERT (evt_type == SESSION_CTRL_EVT_CLOSE
- || evt_type == SESSION_CTRL_EVT_RESET);
+ /* only events supported are disconnect, shutdown and reset */
+ ASSERT (evt_type == SESSION_CTRL_EVT_CLOSE ||
+ evt_type == SESSION_CTRL_EVT_HALF_CLOSE ||
+ evt_type == SESSION_CTRL_EVT_RESET);
return session_send_evt_to_thread (s, 0, s->thread_index, evt_type);
}
void
session_add_self_custom_tx_evt (transport_connection_t * tc, u8 has_prio)
{
- session_t *s;
+ session_t *s = session_get (tc->s_index, tc->thread_index);
- s = session_get (tc->s_index, tc->thread_index);
ASSERT (s->thread_index == vlib_get_thread_index ());
ASSERT (s->session_state != SESSION_STATE_TRANSPORT_DELETED);
+
if (!(s->flags & SESSION_F_CUSTOM_TX))
{
s->flags |= SESSION_F_CUSTOM_TX;
if (svm_fifo_set_event (s->tx_fifo)
|| transport_connection_is_descheduled (tc))
{
- session_worker_t *wrk;
session_evt_elt_t *elt;
+ session_worker_t *wrk;
+
wrk = session_main_get_worker (tc->thread_index);
if (has_prio)
elt = session_evt_alloc_new (wrk);
elt->evt.session_index = tc->s_index;
elt->evt.event_type = SESSION_IO_EVT_TX;
tc->flags &= ~TRANSPORT_CONNECTION_F_DESCHED;
+
+ if (PREDICT_FALSE (wrk->state == SESSION_WRK_INTERRUPT))
+ vlib_node_set_interrupt_pending (wrk->vm,
+ session_queue_node.index);
}
}
}
elt = session_evt_alloc_new (wrk);
elt->evt.session_index = tc->s_index;
elt->evt.event_type = SESSION_IO_EVT_TX;
+
+ if (PREDICT_FALSE (wrk->state == SESSION_WRK_INTERRUPT))
+ vlib_node_set_interrupt_pending (wrk->vm, session_queue_node.index);
}
static void
clib_memset (&elt->evt, 0, sizeof (session_event_t));
elt->evt.session_handle = session_handle (s);
elt->evt.event_type = evt;
+
+ if (PREDICT_FALSE (wrk->state == SESSION_WRK_INTERRUPT))
+ vlib_node_set_interrupt_pending (wrk->vm, session_queue_node.index);
}
else
session_send_ctrl_evt_to_thread (s, evt);
s = pool_elt_at_index (session_main.wrk[thread_index].sessions, si);
- if (!s)
- return 1;
-
if (s->thread_index != thread_index || s->session_index != si)
return 0;
|| s->session_state <= SESSION_STATE_LISTENING)
return 1;
+ if (s->session_state == SESSION_STATE_CONNECTING &&
+ (s->flags & SESSION_F_HALF_OPEN))
+ return 1;
+
tc = session_get_transport (s);
if (s->connection_index != tc->c_index
|| s->thread_index != tc->thread_index || tc->s_index != si)
}
void
-session_cleanup_half_open (transport_proto_t tp, session_handle_t ho_handle)
+session_cleanup_half_open (session_handle_t ho_handle)
+{
+ session_t *ho = session_get_from_handle (ho_handle);
+
+ /* App transports can migrate their half-opens */
+ if (ho->flags & SESSION_F_IS_MIGRATING)
+ {
+ /* Session still migrating, move to closed state to signal that the
+ * session should be removed. */
+ if (ho->connection_index == ~0)
+ {
+ ho->session_state = SESSION_STATE_CLOSED;
+ return;
+ }
+ /* Migrated transports are no longer half-opens */
+ transport_cleanup (session_get_transport_proto (ho),
+ ho->connection_index, ho->app_index /* overloaded */);
+ }
+ else
+ transport_cleanup_half_open (session_get_transport_proto (ho),
+ ho->connection_index);
+ session_free (ho);
+}
+
+static void
+session_half_open_free (session_t *ho)
+{
+ app_worker_t *app_wrk;
+
+ ASSERT (vlib_get_thread_index () <= 1);
+ app_wrk = app_worker_get (ho->app_wrk_index);
+ app_worker_del_half_open (app_wrk, ho);
+ session_free (ho);
+}
+
+static void
+session_half_open_free_rpc (void *args)
+{
+ session_t *ho = ho_session_get (pointer_to_uword (args));
+ session_half_open_free (ho);
+}
+
+void
+session_half_open_delete_notify (transport_connection_t *tc)
{
- transport_cleanup_half_open (tp, session_handle_index (ho_handle));
+ /* Notification from ctrl thread accepted without rpc */
+ if (tc->thread_index <= 1)
+ {
+ session_half_open_free (ho_session_get (tc->s_index));
+ }
+ else
+ {
+ void *args = uword_to_pointer ((uword) tc->s_index, void *);
+ u32 ctrl_thread = vlib_num_workers () ? 1 : 0;
+ session_send_rpc_evt_to_thread (ctrl_thread, session_half_open_free_rpc,
+ args);
+ }
}
void
-session_half_open_delete_notify (transport_proto_t tp,
- session_handle_t ho_handle)
+session_half_open_migrate_notify (transport_connection_t *tc)
{
- app_worker_t *app_wrk = app_worker_get (session_handle_data (ho_handle));
- app_worker_del_half_open (app_wrk, tp, ho_handle);
+ session_t *ho;
+
+ ho = ho_session_get (tc->s_index);
+ ho->flags |= SESSION_F_IS_MIGRATING;
+ ho->connection_index = ~0;
+}
+
+int
+session_half_open_migrated_notify (transport_connection_t *tc)
+{
+ session_t *ho;
+
+ ho = ho_session_get (tc->s_index);
+
+ /* App probably detached so the half-open must be cleaned up */
+ if (ho->session_state == SESSION_STATE_CLOSED)
+ {
+ session_half_open_delete_notify (tc);
+ return -1;
+ }
+ ho->connection_index = tc->c_index;
+ /* Overload app index for half-open with new thread */
+ ho->app_index = tc->thread_index;
+ return 0;
}
session_t *
return s;
}
+session_t *
+session_alloc_for_half_open (transport_connection_t *tc)
+{
+ session_t *s;
+
+ s = ho_session_alloc ();
+ s->session_type = session_type_from_proto_and_ip (tc->proto, tc->is_ip4);
+ s->connection_index = tc->c_index;
+ tc->s_index = s->session_index;
+ return s;
+}
+
/**
* Discards bytes from buffer chain
*
session_stream_connect_notify (transport_connection_t * tc,
session_error_t err)
{
- session_handle_t ho_handle, wrk_handle;
u32 opaque = 0, new_ti, new_si;
app_worker_t *app_wrk;
- session_t *s = 0;
+ session_t *s = 0, *ho;
/*
- * Find connection handle and cleanup half-open table
+ * Cleanup half-open table
*/
- ho_handle = session_lookup_half_open_handle (tc);
- if (ho_handle == HALF_OPEN_LOOKUP_INVALID_VALUE)
- {
- SESSION_DBG ("half-open was removed!");
- return -1;
- }
session_lookup_del_half_open (tc);
- /* Get the app's index from the handle we stored when opening connection
- * and the opaque (api_context for external apps) from transport session
- * index */
- app_wrk = app_worker_get_if_valid (session_handle_data (ho_handle));
+ ho = ho_session_get (tc->s_index);
+ opaque = ho->opaque;
+ app_wrk = app_worker_get_if_valid (ho->app_wrk_index);
if (!app_wrk)
return -1;
- wrk_handle = app_worker_lookup_half_open (app_wrk, tc->proto, ho_handle);
- if (wrk_handle == SESSION_INVALID_HANDLE)
- return -1;
-
- /* Make sure this is the same half-open index */
- if (session_handle_index (wrk_handle) != session_handle_index (ho_handle))
- return -1;
-
- opaque = session_handle_data (wrk_handle);
-
if (err)
return app_worker_connect_notify (app_wrk, s, err, opaque);
return;
/* Transport thinks that app requested close but it actually didn't.
- * Can happen for tcp if fin and rst are received in close succession. */
+ * Can happen for tcp:
+ * 1)if fin and rst are received in close succession.
+ * 2)if app shutdown the connection. */
if (s->session_state == SESSION_STATE_READY)
{
session_transport_closing_notify (tc);
app_wrk = app_worker_get_if_valid (s->app_wrk_index);
if (!app_wrk)
return -1;
+ if (s->session_state != SESSION_STATE_CREATED)
+ return 0;
s->session_state = SESSION_STATE_ACCEPTING;
if (app_worker_accept_notify (app_wrk, s))
{
}
int
-session_open_cl (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque)
+session_open_cl (session_endpoint_cfg_t *rmt, session_handle_t *rsh)
{
transport_connection_t *tc;
transport_endpoint_cfg_t *tep;
tc = transport_get_half_open (rmt->transport_proto, (u32) rv);
/* For dgram type of service, allocate session and fifos now */
- app_wrk = app_worker_get (app_wrk_index);
+ app_wrk = app_worker_get (rmt->app_wrk_index);
s = session_alloc_for_connection (tc);
s->app_wrk_index = app_wrk->wrk_index;
s->session_state = SESSION_STATE_OPENED;
}
sh = session_handle (s);
+ *rsh = sh;
+
session_lookup_add_connection (tc, sh);
- return app_worker_connect_notify (app_wrk, s, SESSION_E_NONE, opaque);
+ return app_worker_connect_notify (app_wrk, s, SESSION_E_NONE, rmt->opaque);
}
int
-session_open_vc (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque)
+session_open_vc (session_endpoint_cfg_t *rmt, session_handle_t *rsh)
{
transport_connection_t *tc;
transport_endpoint_cfg_t *tep;
- u64 handle, wrk_handle;
+ app_worker_t *app_wrk;
+ session_t *ho;
int rv;
tep = session_endpoint_to_transport_cfg (rmt);
tc = transport_get_half_open (rmt->transport_proto, (u32) rv);
- /* If transport offers a stream service, only allocate session once the
- * connection has been established.
- * Add connection to half-open table and save app and tc index. The
- * latter is needed to help establish the connection while the former
- * is needed when the connect notify comes and we have to notify the
- * external app
- */
- handle = session_make_handle (tc->c_index, app_wrk_index);
- session_lookup_add_half_open (tc, handle);
+ app_wrk = app_worker_get (rmt->app_wrk_index);
- /* Store the half-open handle in the connection. Transport will use it
- * when cleaning up @ref session_half_open_delete_notify
+ /* If transport offers a vc service, only allocate established
+ * session once the connection has been established.
+ * In the meantime allocate half-open session for tracking purposes
+ * associate half-open connection to it and add session to app-worker
+ * half-open table. These are needed to allocate the established
+ * session on transport notification, and to cleanup the half-open
+ * session if the app detaches before connection establishment.
*/
- tc->s_ho_handle = handle;
+ ho = session_alloc_for_half_open (tc);
+ ho->app_wrk_index = app_wrk->wrk_index;
+ ho->ho_index = app_worker_add_half_open (app_wrk, session_handle (ho));
+ ho->opaque = rmt->opaque;
+ *rsh = session_handle (ho);
- /* Track the half-open connections in case we want to forcefully
- * clean them up @ref session_cleanup_half_open
- */
- wrk_handle = session_make_handle (tc->c_index, opaque);
- app_worker_add_half_open (app_worker_get (app_wrk_index),
- rmt->transport_proto, handle, wrk_handle);
+ if (!(tc->flags & TRANSPORT_CONNECTION_F_NO_LOOKUP))
+ session_lookup_add_half_open (tc, tc->c_index);
return 0;
}
int
-session_open_app (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque)
+session_open_app (session_endpoint_cfg_t *rmt, session_handle_t *rsh)
{
- session_endpoint_cfg_t *sep = (session_endpoint_cfg_t *) rmt;
- transport_endpoint_cfg_t *tep_cfg = session_endpoint_to_transport_cfg (sep);
-
- sep->app_wrk_index = app_wrk_index;
- sep->opaque = opaque;
+ transport_endpoint_cfg_t *tep_cfg = session_endpoint_to_transport_cfg (rmt);
+ /* Not supported for now */
+ *rsh = SESSION_INVALID_HANDLE;
return transport_connect (rmt->transport_proto, tep_cfg);
}
-typedef int (*session_open_service_fn) (u32, session_endpoint_t *, u32);
+typedef int (*session_open_service_fn) (session_endpoint_cfg_t *,
+ session_handle_t *);
/* *INDENT-OFF* */
static session_open_service_fn session_open_srv_fns[TRANSPORT_N_SERVICES] = {
* on open completion.
*/
int
-session_open (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque)
+session_open (session_endpoint_cfg_t *rmt, session_handle_t *rsh)
{
transport_service_type_t tst;
tst = transport_protocol_service_type (rmt->transport_proto);
- return session_open_srv_fns[tst] (app_wrk_index, rmt, opaque);
+ return session_open_srv_fns[tst](rmt, rsh);
}
/**
return 0;
}
+/**
+ * Initialize session half-closing procedure.
+ *
+ * Note that half-closing will not change the state of the session.
+ */
+void
+session_half_close (session_t *s)
+{
+ if (!s)
+ return;
+
+ session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_HALF_CLOSE);
+}
+
/**
* Initialize session closing procedure.
*
session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_RESET);
}
+/**
+ * Notify transport the session can be half-disconnected.
+ *
+ * Must be called from the session's thread.
+ */
+void
+session_transport_half_close (session_t *s)
+{
+ /* Only READY session can be half-closed */
+ if (s->session_state != SESSION_STATE_READY)
+ {
+ return;
+ }
+
+ transport_half_close (session_get_transport_proto (s), s->connection_index,
+ s->thread_index);
+}
+
/**
* Notify transport the session can be disconnected. This should eventually
* result in a delete notification that allows us to cleanup session state.
cfg->ring_cfgs = rc;
smm->wrk[i].vpp_event_queue = fifo_segment_msg_q_alloc (eqs, i, cfg);
-
- if (svm_msg_q_alloc_consumer_eventfd (smm->wrk[i].vpp_event_queue))
- clib_warning ("eventfd returned");
}
}
vec_validate (smm->session_type_to_next, session_type);
vec_validate (smm->session_tx_fns, session_type);
- /* *INDENT-OFF* */
if (output_node != ~0)
- {
- foreach_vlib_main (({
- next_index = vlib_node_add_next (this_vlib_main,
- session_queue_node.index,
- output_node);
- }));
- }
- /* *INDENT-ON* */
+ next_index = vlib_node_add_next (vlib_get_main (),
+ session_queue_node.index, output_node);
smm->session_type_to_next[session_type] = next_index;
smm->session_tx_fns[session_type] =
s->connection_index, tep, is_lcl);
}
+int
+session_transport_attribute (session_t *s, u8 is_get,
+ transport_endpt_attr_t *attr)
+{
+ if (s->session_state < SESSION_STATE_READY)
+ return -1;
+
+ return transport_connection_attribute (session_get_transport_proto (s),
+ s->connection_index, s->thread_index,
+ is_get, attr);
+}
+
transport_connection_t *
listen_session_get_transport (session_t * s)
{
session_queue_run_on_main_thread (vlib_main_t * vm)
{
ASSERT (vlib_get_thread_index () == 0);
- vlib_process_signal_event_mt (vm, session_queue_process_node.index,
- SESSION_Q_PROCESS_RUN_ON_MAIN, 0);
+ vlib_node_set_interrupt_pending (vm, session_queue_node.index);
}
static clib_error_t *
wrk->ctrl_head = clib_llist_make_head (wrk->event_elts, evt_list);
wrk->new_head = clib_llist_make_head (wrk->event_elts, evt_list);
wrk->old_head = clib_llist_make_head (wrk->event_elts, evt_list);
- wrk->vm = vlib_mains[i];
+ wrk->pending_connects = clib_llist_make_head (wrk->event_elts, evt_list);
+ wrk->vm = vlib_get_main_by_index (i);
wrk->last_vlib_time = vlib_time_now (vm);
wrk->last_vlib_us_time = wrk->last_vlib_time * CLIB_US_TIME_FREQ;
+ wrk->timerfd = -1;
vec_validate (wrk->session_to_enqueue, smm->last_transport_proto_type);
if (num_threads > 1)
clib_rwlock_init (&smm->wrk[i].peekers_rw_locks);
+
+ if (!smm->no_adaptive && smm->use_private_rx_mqs)
+ session_wrk_enable_adaptive_mode (wrk);
}
/* Allocate vpp event queues segment and queue */
void
session_node_enable_disable (u8 is_en)
{
+ u8 mstate = is_en ? VLIB_NODE_STATE_INTERRUPT : VLIB_NODE_STATE_DISABLED;
u8 state = is_en ? VLIB_NODE_STATE_POLLING : VLIB_NODE_STATE_DISABLED;
- vlib_thread_main_t *vtm = vlib_get_thread_main ();
- u8 have_workers = vtm->n_threads != 0;
-
- /* *INDENT-OFF* */
- foreach_vlib_main (({
- if (have_workers && ii == 0)
- {
- if (is_en)
- {
- vlib_node_set_state (this_vlib_main,
- session_queue_process_node.index, state);
- vlib_node_t *n = vlib_get_node (this_vlib_main,
- session_queue_process_node.index);
- vlib_start_process (this_vlib_main, n->runtime_index);
- }
- else
- {
- vlib_process_signal_event_mt (this_vlib_main,
- session_queue_process_node.index,
- SESSION_Q_PROCESS_STOP, 0);
- }
- if (!session_main.poll_main)
- continue;
- }
- vlib_node_set_state (this_vlib_main, session_queue_node.index,
- state);
- }));
- /* *INDENT-ON* */
+ session_main_t *sm = &session_main;
+ vlib_main_t *vm;
+ vlib_node_t *n;
+ int n_vlibs, i;
+
+ n_vlibs = vlib_get_n_threads ();
+ for (i = 0; i < n_vlibs; i++)
+ {
+ vm = vlib_get_main_by_index (i);
+ /* main thread with workers and not polling */
+ if (i == 0 && n_vlibs > 1)
+ {
+ vlib_node_set_state (vm, session_queue_node.index, mstate);
+ if (is_en)
+ {
+ session_main_get_worker (0)->state = SESSION_WRK_INTERRUPT;
+ vlib_node_set_state (vm, session_queue_process_node.index,
+ state);
+ n = vlib_get_node (vm, session_queue_process_node.index);
+ vlib_start_process (vm, n->runtime_index);
+ }
+ else
+ {
+ vlib_process_signal_event_mt (vm,
+ session_queue_process_node.index,
+ SESSION_Q_PROCESS_STOP, 0);
+ }
+ if (!sm->poll_main)
+ continue;
+ }
+ vlib_node_set_state (vm, session_queue_node.index, state);
+ }
+
+ if (sm->use_private_rx_mqs)
+ application_enable_rx_mqs_nodes (is_en);
}
clib_error_t *
smm->is_enabled = 0;
smm->session_enable_asap = 0;
smm->poll_main = 0;
+ smm->use_private_rx_mqs = 0;
+ smm->no_adaptive = 0;
smm->session_baseva = HIGH_SEGMENT_BASEVA;
#if (HIGH_SEGMENT_BASEVA > (4ULL << 30))
smm->evt_qs_segment_size = 1 << 20;
#endif
- smm->last_transport_proto_type = TRANSPORT_PROTO_QUIC;
+ smm->last_transport_proto_type = TRANSPORT_PROTO_SRTP;
return 0;
}
appns_sapi_enable ();
else if (unformat (input, "poll-main"))
smm->poll_main = 1;
+ else if (unformat (input, "use-private-rx-mqs"))
+ smm->use_private_rx_mqs = 1;
+ else if (unformat (input, "no-adaptive"))
+ smm->no_adaptive = 1;
else
return clib_error_return (0, "unknown input `%U'",
format_unformat_error, input);