X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession.c;h=fa4cd85e5e4dca1b1abf730061e731d4768add23;hb=07063b8ea;hp=110db2c2a4a5ca3809723ea654f04f26ea7243e2;hpb=d4295e61a0ca183f54e54696e9edc5c87d2d116c;p=vpp.git diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index 110db2c2a4a..fa4cd85e5e4 100644 --- a/src/vnet/session/session.c +++ b/src/vnet/session/session.c @@ -23,7 +23,7 @@ #include #include -session_manager_main_t session_manager_main; +session_main_t session_main; static inline int session_send_evt_to_thread (void *data, void *args, u32 thread_index, @@ -32,44 +32,37 @@ session_send_evt_to_thread (void *data, void *args, u32 thread_index, session_event_t *evt; svm_msg_q_msg_t msg; svm_msg_q_t *mq; - u32 tries = 0, max_tries; - mq = session_manager_get_vpp_event_queue (thread_index); - while (svm_msg_q_try_lock (mq)) - { - max_tries = vlib_get_current_process (vlib_get_main ())? 1e6 : 3; - if (tries++ == max_tries) - { - SESSION_DBG ("failed to enqueue evt"); - return -1; - } - } - if (PREDICT_FALSE (svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING))) - { - svm_msg_q_unlock (mq); - return -2; - } - msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); - if (PREDICT_FALSE (svm_msg_q_msg_is_invalid (&msg))) + mq = session_main_get_vpp_event_queue (thread_index); + if (PREDICT_FALSE (svm_msg_q_lock (mq))) + return -1; + if (PREDICT_FALSE (svm_msg_q_is_full (mq) + || svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING))) { svm_msg_q_unlock (mq); return -2; } - evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg); - evt->event_type = evt_type; switch (evt_type) { - case FIFO_EVENT_RPC: + case SESSION_CTRL_EVT_RPC: + msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); + evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg); evt->rpc_args.fp = data; evt->rpc_args.arg = args; break; - case FIFO_EVENT_APP_TX: + case SESSION_IO_EVT_RX: + case SESSION_IO_EVT_TX: case SESSION_IO_EVT_TX_FLUSH: - case FIFO_EVENT_BUILTIN_RX: - evt->fifo = data; + case SESSION_IO_EVT_BUILTIN_RX: + msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); + evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg); + evt->session_index = *(u32 *) data; break; - case FIFO_EVENT_BUILTIN_TX: - case FIFO_EVENT_DISCONNECT: + case SESSION_IO_EVT_BUILTIN_TX: + case SESSION_CTRL_EVT_CLOSE: + case SESSION_CTRL_EVT_RESET: + msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); + evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg); evt->session_handle = session_handle ((session_t *) data); break; default: @@ -77,6 +70,7 @@ session_send_evt_to_thread (void *data, void *args, u32 thread_index, svm_msg_q_unlock (mq); return -1; } + evt->event_type = evt_type; svm_msg_q_add_and_unlock (mq, &msg); return 0; @@ -85,7 +79,8 @@ session_send_evt_to_thread (void *data, void *args, u32 thread_index, int session_send_io_evt_to_thread (svm_fifo_t * f, session_evt_type_t evt_type) { - return session_send_evt_to_thread (f, 0, f->master_thread_index, evt_type); + return session_send_evt_to_thread (&f->master_session_index, 0, + f->master_thread_index, evt_type); } int @@ -98,17 +93,25 @@ session_send_io_evt_to_thread_custom (void *data, u32 thread_index, int session_send_ctrl_evt_to_thread (session_t * s, session_evt_type_t evt_type) { - /* only event supported for now is disconnect */ - ASSERT (evt_type == FIFO_EVENT_DISCONNECT); - return session_send_evt_to_thread (s, 0, s->thread_index, - FIFO_EVENT_DISCONNECT); + /* only events supported are disconnect and reset */ + ASSERT (evt_type == SESSION_CTRL_EVT_CLOSE + || evt_type == SESSION_CTRL_EVT_RESET); + return session_send_evt_to_thread (s, 0, s->thread_index, evt_type); +} + +void +session_send_rpc_evt_to_thread_force (u32 thread_index, void *fp, + void *rpc_args) +{ + session_send_evt_to_thread (fp, rpc_args, thread_index, + SESSION_CTRL_EVT_RPC); } void session_send_rpc_evt_to_thread (u32 thread_index, void *fp, void *rpc_args) { if (thread_index != vlib_get_thread_index ()) - session_send_evt_to_thread (fp, rpc_args, thread_index, FIFO_EVENT_RPC); + session_send_rpc_evt_to_thread_force (thread_index, fp, rpc_args); else { void (*fnp) (void *) = fp; @@ -116,31 +119,72 @@ session_send_rpc_evt_to_thread (u32 thread_index, void *fp, void *rpc_args) } } +void +session_add_self_custom_tx_evt (transport_connection_t * tc, u8 has_prio) +{ + session_t *s; + + 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; + wrk = session_main_get_worker (tc->thread_index); + if (has_prio) + elt = session_evt_alloc_new (wrk); + else + elt = session_evt_alloc_old (wrk); + elt->evt.session_index = tc->s_index; + elt->evt.event_type = SESSION_IO_EVT_TX; + tc->flags &= ~TRANSPORT_CONNECTION_F_DESCHED; + } + } +} + +void +sesssion_reschedule_tx (transport_connection_t * tc) +{ + session_worker_t *wrk = session_main_get_worker (tc->thread_index); + session_evt_elt_t *elt; + + ASSERT (tc->thread_index == vlib_get_thread_index ()); + + elt = session_evt_alloc_new (wrk); + elt->evt.session_index = tc->s_index; + elt->evt.event_type = SESSION_IO_EVT_TX; +} + static void -session_program_transport_close (session_t * s) +session_program_transport_ctrl_evt (session_t * s, session_evt_type_t evt) { u32 thread_index = vlib_get_thread_index (); - session_manager_worker_t *wrk; - session_event_t *evt; + session_evt_elt_t *elt; + session_worker_t *wrk; /* If we are in the handler thread, or being called with the worker barrier * held, just append a new event to pending disconnects vector. */ if (vlib_thread_is_main_w_barrier () || thread_index == s->thread_index) { - wrk = session_manager_get_worker (s->thread_index); - vec_add2 (wrk->pending_disconnects, evt, 1); - clib_memset (evt, 0, sizeof (*evt)); - evt->session_handle = session_handle (s); - evt->event_type = FIFO_EVENT_DISCONNECT; + wrk = session_main_get_worker (s->thread_index); + elt = session_evt_alloc_ctrl (wrk); + clib_memset (&elt->evt, 0, sizeof (session_event_t)); + elt->evt.session_handle = session_handle (s); + elt->evt.event_type = evt; } else - session_send_ctrl_evt_to_thread (s, FIFO_EVENT_DISCONNECT); + session_send_ctrl_evt_to_thread (s, evt); } session_t * session_alloc (u32 thread_index) { - session_manager_worker_t *wrk = &session_manager_main.wrk[thread_index]; + session_worker_t *wrk = &session_main.wrk[thread_index]; session_t *s; u8 will_expand = 0; pool_get_aligned_will_expand (wrk->sessions, will_expand, @@ -159,22 +203,66 @@ session_alloc (u32 thread_index) clib_memset (s, 0, sizeof (*s)); s->session_index = s - wrk->sessions; s->thread_index = thread_index; + s->app_index = APP_INVALID_INDEX; return s; } void session_free (session_t * s) { - pool_put (session_manager_main.wrk[s->thread_index].sessions, s); if (CLIB_DEBUG) - clib_memset (s, 0xFA, sizeof (*s)); + { + u8 thread_index = s->thread_index; + clib_memset (s, 0xFA, sizeof (*s)); + pool_put (session_main.wrk[thread_index].sessions, s); + return; + } + SESSION_EVT (SESSION_EVT_FREE, s); + pool_put (session_main.wrk[s->thread_index].sessions, s); +} + +u8 +session_is_valid (u32 si, u8 thread_index) +{ + session_t *s; + transport_connection_t *tc; + + 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; + + if (s->session_state == SESSION_STATE_TRANSPORT_DELETED + || s->session_state <= SESSION_STATE_LISTENING) + return 1; + + tc = session_get_transport (s); + if (s->connection_index != tc->c_index + || s->thread_index != tc->thread_index || tc->s_index != si) + return 0; + + return 1; +} + +static void +session_cleanup_notify (session_t * s, session_cleanup_ntf_t ntf) +{ + app_worker_t *app_wrk; + + app_wrk = app_worker_get_if_valid (s->app_wrk_index); + if (!app_wrk) + return; + app_worker_cleanup_notify (app_wrk, s, ntf); } void session_free_w_fifos (session_t * s) { - segment_manager_dealloc_fifos (s->svm_segment_index, s->rx_fifo, - s->tx_fifo); + session_cleanup_notify (s, SESSION_CLEANUP_SESSION); + segment_manager_dealloc_fifos (s->rx_fifo, s->tx_fifo); session_free (s); } @@ -190,12 +278,12 @@ session_delete (session_t * s) /* Delete from the main lookup table. */ if ((rv = session_lookup_del_session (s))) - clib_warning ("hash delete error, rv %d", rv); + clib_warning ("session %u hash delete rv %d", s->session_index, rv); session_free_w_fifos (s); } -static session_t * +session_t * session_alloc_for_connection (transport_connection_t * tc) { session_t *s; @@ -206,7 +294,6 @@ session_alloc_for_connection (transport_connection_t * tc) s = session_alloc (thread_index); s->session_type = session_type_from_proto_and_ip (tc->proto, tc->is_ip4); - s->enqueue_epoch = (u64) ~ 0; s->session_state = SESSION_STATE_CLOSED; /* Attach transport to session and vice versa */ @@ -283,7 +370,7 @@ session_enqueue_chain_tail (session_t * s, vlib_buffer_t * b, continue; if (is_in_order) { - rv = svm_fifo_enqueue_nowait (s->rx_fifo, len, data); + rv = svm_fifo_enqueue (s->rx_fifo, len, data); if (rv == len) { written += rv; @@ -324,6 +411,24 @@ session_enqueue_chain_tail (session_t * s, vlib_buffer_t * b, return 0; } +void +session_fifo_tuning (session_t * s, svm_fifo_t * f, + session_ft_action_t act, u32 len) +{ + if (s->flags & SESSION_F_CUSTOM_FIFO_TUNING) + { + app_worker_t *app_wrk = app_worker_get (s->app_wrk_index); + app_worker_session_fifo_tuning (app_wrk, s, f, act, len); + if (CLIB_ASSERT_ENABLE) + { + segment_manager_t *sm; + sm = segment_manager_get (f->segment_manager); + ASSERT (f->size >= 4096); + ASSERT (f->size <= sm->max_fifo_size); + } + } +} + /* * Enqueue data for delivery to session peer. Does not notify peer of enqueue * event but on request can queue notification events for later delivery by @@ -350,9 +455,9 @@ session_enqueue_stream_connection (transport_connection_t * tc, if (is_in_order) { - enqueued = svm_fifo_enqueue_nowait (s->rx_fifo, - b->current_length, - vlib_buffer_get_current (b)); + enqueued = svm_fifo_enqueue (s->rx_fifo, + b->current_length, + vlib_buffer_get_current (b)); if (PREDICT_FALSE ((b->flags & VLIB_BUFFER_NEXT_PRESENT) && enqueued >= 0)) { @@ -378,14 +483,16 @@ session_enqueue_stream_connection (transport_connection_t * tc, { /* Queue RX event on this fifo. Eventually these will need to be flushed * by calling stream_server_flush_enqueue_events () */ - session_manager_worker_t *wrk; + session_worker_t *wrk; - wrk = session_manager_get_worker (s->thread_index); - if (s->enqueue_epoch != wrk->current_enqueue_epoch[tc->proto]) + wrk = session_main_get_worker (s->thread_index); + if (!(s->flags & SESSION_F_RX_EVT)) { - s->enqueue_epoch = wrk->current_enqueue_epoch[tc->proto]; + s->flags |= SESSION_F_RX_EVT; vec_add1 (wrk->session_to_enqueue[tc->proto], s->session_index); } + + session_fifo_tuning (s, s->rx_fifo, SESSION_FT_ACTION_ENQUEUED, 0); } return enqueued; @@ -398,13 +505,12 @@ session_enqueue_dgram_connection (session_t * s, { int enqueued = 0, rv, in_order_off; - ASSERT (svm_fifo_max_enqueue (s->rx_fifo) + ASSERT (svm_fifo_max_enqueue_prod (s->rx_fifo) >= b->current_length + sizeof (*hdr)); - svm_fifo_enqueue_nowait (s->rx_fifo, sizeof (session_dgram_hdr_t), - (u8 *) hdr); - enqueued = svm_fifo_enqueue_nowait (s->rx_fifo, b->current_length, - vlib_buffer_get_current (b)); + svm_fifo_enqueue (s->rx_fifo, sizeof (session_dgram_hdr_t), (u8 *) hdr); + enqueued = svm_fifo_enqueue (s->rx_fifo, b->current_length, + vlib_buffer_get_current (b)); if (PREDICT_FALSE ((b->flags & VLIB_BUFFER_NEXT_PRESENT) && enqueued >= 0)) { in_order_off = enqueued > b->current_length ? enqueued : 0; @@ -416,56 +522,41 @@ session_enqueue_dgram_connection (session_t * s, { /* Queue RX event on this fifo. Eventually these will need to be flushed * by calling stream_server_flush_enqueue_events () */ - session_manager_worker_t *wrk; + session_worker_t *wrk; - wrk = session_manager_get_worker (s->thread_index); - if (s->enqueue_epoch != wrk->current_enqueue_epoch[proto]) + wrk = session_main_get_worker (s->thread_index); + if (!(s->flags & SESSION_F_RX_EVT)) { - s->enqueue_epoch = wrk->current_enqueue_epoch[proto]; + s->flags |= SESSION_F_RX_EVT; vec_add1 (wrk->session_to_enqueue[proto], s->session_index); } + + session_fifo_tuning (s, s->rx_fifo, SESSION_FT_ACTION_ENQUEUED, 0); } return enqueued; } -/** Check if we have space in rx fifo to push more bytes */ -u8 -stream_session_no_space (transport_connection_t * tc, u32 thread_index, - u16 data_len) -{ - session_t *s = session_get (tc->s_index, thread_index); - - if (PREDICT_FALSE (s->session_state != SESSION_STATE_READY)) - return 1; - - if (data_len > svm_fifo_max_enqueue (s->rx_fifo)) - return 1; - - return 0; -} - -u32 -session_tx_fifo_max_dequeue (transport_connection_t * tc) -{ - session_t *s = session_get (tc->s_index, tc->thread_index); - if (!s->tx_fifo) - return 0; - return svm_fifo_max_dequeue (s->tx_fifo); -} - int -stream_session_peek_bytes (transport_connection_t * tc, u8 * buffer, - u32 offset, u32 max_bytes) +session_tx_fifo_peek_bytes (transport_connection_t * tc, u8 * buffer, + u32 offset, u32 max_bytes) { session_t *s = session_get (tc->s_index, tc->thread_index); return svm_fifo_peek (s->tx_fifo, offset, max_bytes, buffer); } u32 -session_dequeue_drop (transport_connection_t * tc, u32 max_bytes) +session_tx_fifo_dequeue_drop (transport_connection_t * tc, u32 max_bytes) { session_t *s = session_get (tc->s_index, tc->thread_index); - return svm_fifo_dequeue_drop (s->tx_fifo, max_bytes); + u32 rv; + + rv = svm_fifo_dequeue_drop (s->tx_fifo, max_bytes); + session_fifo_tuning (s, s->tx_fifo, SESSION_FT_ACTION_DEQUEUED, rv); + + if (svm_fifo_needs_deq_ntf (s->tx_fifo, max_bytes)) + session_dequeue_notify (s); + + return rv; } static inline int @@ -501,9 +592,14 @@ session_notify_subscribers (u32 app_index, session_t * s, * @return 0 on success or negative number if failed to send notification. */ static inline int -session_enqueue_notify (session_t * s) +session_enqueue_notify_inline (session_t * s) { app_worker_t *app_wrk; + u32 session_index; + u8 n_subscribers; + + session_index = s->session_index; + n_subscribers = svm_fifo_n_subscribers (s->rx_fifo); app_wrk = app_worker_get_if_valid (s->app_wrk_index); if (PREDICT_FALSE (!app_wrk)) @@ -512,42 +608,79 @@ session_enqueue_notify (session_t * s) return 0; } - /* *INDENT-OFF* */ - SESSION_EVT_DBG(SESSION_EVT_ENQ, s, ({ - ed->data[0] = FIFO_EVENT_APP_RX; - ed->data[1] = svm_fifo_max_dequeue (s->rx_fifo); - })); - /* *INDENT-ON* */ + SESSION_EVT (SESSION_EVT_ENQ, s, svm_fifo_max_dequeue_prod (s->rx_fifo)); + s->flags &= ~SESSION_F_RX_EVT; if (PREDICT_FALSE (app_worker_lock_and_send_event (app_wrk, s, - FIFO_EVENT_APP_RX))) + SESSION_IO_EVT_RX))) return -1; - if (PREDICT_FALSE (svm_fifo_n_subscribers (s->rx_fifo))) - return session_notify_subscribers (app_wrk->app_index, s, - s->rx_fifo, FIFO_EVENT_APP_RX); + if (PREDICT_FALSE (n_subscribers)) + { + s = session_get (session_index, vlib_get_thread_index ()); + return session_notify_subscribers (app_wrk->app_index, s, + s->rx_fifo, SESSION_IO_EVT_RX); + } return 0; } +int +session_enqueue_notify (session_t * s) +{ + return session_enqueue_notify_inline (s); +} + +static void +session_enqueue_notify_rpc (void *arg) +{ + u32 session_index = pointer_to_uword (arg); + session_t *s; + + s = session_get_if_valid (session_index, vlib_get_thread_index ()); + if (!s) + return; + + session_enqueue_notify (s); +} + +/** + * Like session_enqueue_notify, but can be called from a thread that does not + * own the session. + */ +void +session_enqueue_notify_thread (session_handle_t sh) +{ + u32 thread_index = session_thread_from_handle (sh); + u32 session_index = session_index_from_handle (sh); + + /* + * Pass session index (u32) as opposed to handle (u64) in case pointers + * are not 64-bit. + */ + session_send_rpc_evt_to_thread (thread_index, + session_enqueue_notify_rpc, + uword_to_pointer (session_index, void *)); +} + int session_dequeue_notify (session_t * s) { app_worker_t *app_wrk; + svm_fifo_clear_deq_ntf (s->tx_fifo); + app_wrk = app_worker_get_if_valid (s->app_wrk_index); if (PREDICT_FALSE (!app_wrk)) return -1; if (PREDICT_FALSE (app_worker_lock_and_send_event (app_wrk, s, - FIFO_EVENT_APP_TX))) + SESSION_IO_EVT_TX))) return -1; if (PREDICT_FALSE (s->tx_fifo->n_subscribers)) return session_notify_subscribers (app_wrk->app_index, s, - s->tx_fifo, FIFO_EVENT_APP_TX); - - svm_fifo_clear_tx_ntf (s->tx_fifo); + s->tx_fifo, SESSION_IO_EVT_TX); return 0; } @@ -561,9 +694,9 @@ session_dequeue_notify (session_t * s) * failures due to API queue being full. */ int -session_manager_flush_enqueue_events (u8 transport_proto, u32 thread_index) +session_main_flush_enqueue_events (u8 transport_proto, u32 thread_index) { - session_manager_worker_t *wrk = session_manager_get_worker (thread_index); + session_worker_t *wrk = session_main_get_worker (thread_index); session_t *s; int i, errors = 0; u32 *indices; @@ -578,44 +711,33 @@ session_manager_flush_enqueue_events (u8 transport_proto, u32 thread_index) errors++; continue; } - if (PREDICT_FALSE (session_enqueue_notify (s))) + + session_fifo_tuning (s, s->rx_fifo, SESSION_FT_ACTION_ENQUEUED, + 0 /* TODO/not needed */ ); + + if (PREDICT_FALSE (session_enqueue_notify_inline (s))) errors++; } vec_reset_length (indices); wrk->session_to_enqueue[transport_proto] = indices; - wrk->current_enqueue_epoch[transport_proto]++; return errors; } int -session_manager_flush_all_enqueue_events (u8 transport_proto) +session_main_flush_all_enqueue_events (u8 transport_proto) { vlib_thread_main_t *vtm = vlib_get_thread_main (); int i, errors = 0; for (i = 0; i < 1 + vtm->n_threads; i++) - errors += session_manager_flush_enqueue_events (transport_proto, i); + errors += session_main_flush_enqueue_events (transport_proto, i); return errors; } -/** - * Init fifo tail and head pointers - * - * Useful if transport uses absolute offsets for tracking ooo segments. - */ -void -stream_session_init_fifos_pointers (transport_connection_t * tc, - u32 rx_pointer, u32 tx_pointer) -{ - session_t *s; - s = session_get (tc->s_index, tc->thread_index); - svm_fifo_init_pointers (s->rx_fifo, rx_pointer); - svm_fifo_init_pointers (s->tx_fifo, tx_pointer); -} - -int -session_stream_connect_notify (transport_connection_t * tc, u8 is_fail) +static inline int +session_stream_connect_notify_inline (transport_connection_t * tc, u8 is_fail, + session_state_t opened_state) { u32 opaque = 0, new_ti, new_si; app_worker_t *app_wrk; @@ -658,6 +780,10 @@ session_stream_connect_notify (transport_connection_t * tc, u8 is_fail) return -1; } + s = session_get (new_si, new_ti); + s->session_state = opened_state; + session_lookup_add_connection (tc, session_handle (s)); + if (app_worker_connect_notify (app_wrk, s, opaque)) { s = session_get (new_si, new_ti); @@ -665,13 +791,23 @@ session_stream_connect_notify (transport_connection_t * tc, u8 is_fail) return -1; } - s = session_get (new_si, new_ti); - s->session_state = SESSION_STATE_READY; - session_lookup_add_connection (tc, session_handle (s)); - return 0; } +int +session_stream_connect_notify (transport_connection_t * tc, u8 is_fail) +{ + return session_stream_connect_notify_inline (tc, is_fail, + SESSION_STATE_READY); +} + +int +session_ho_stream_connect_notify (transport_connection_t * tc, u8 is_fail) +{ + return session_stream_connect_notify_inline (tc, is_fail, + SESSION_STATE_OPENED); +} + typedef struct _session_switch_pool_args { u32 session_index; @@ -680,17 +816,35 @@ typedef struct _session_switch_pool_args u32 new_session_index; } session_switch_pool_args_t; +/** + * Notify old thread of the session pool switch + */ static void session_switch_pool (void *cb_args) { session_switch_pool_args_t *args = (session_switch_pool_args_t *) cb_args; + app_worker_t *app_wrk; session_t *s; + ASSERT (args->thread_index == vlib_get_thread_index ()); s = session_get (args->session_index, args->thread_index); s->tx_fifo->master_session_index = args->new_session_index; s->tx_fifo->master_thread_index = args->new_thread_index; transport_cleanup (session_get_transport_proto (s), s->connection_index, s->thread_index); + + app_wrk = app_worker_get_if_valid (s->app_wrk_index); + if (app_wrk) + { + session_handle_t new_sh; + new_sh = session_make_handle (args->new_session_index, + args->new_thread_index); + app_worker_migrate_notify (app_wrk, s, new_sh); + + /* Trigger app read on the new thread */ + session_enqueue_notify_thread (new_sh); + } + session_free (s); clib_mem_free (cb_args); } @@ -713,6 +867,7 @@ session_dgram_connect_notify (transport_connection_t * tc, new_s->rx_fifo->master_session_index = new_s->session_index; new_s->rx_fifo->master_thread_index = new_s->thread_index; new_s->session_state = SESSION_STATE_READY; + new_s->flags |= SESSION_F_IS_MIGRATING; session_lookup_add_connection (tc, session_handle (new_s)); /* @@ -744,18 +899,14 @@ void session_transport_closing_notify (transport_connection_t * tc) { app_worker_t *app_wrk; - application_t *app; session_t *s; s = session_get (tc->s_index, tc->thread_index); if (s->session_state >= SESSION_STATE_TRANSPORT_CLOSING) return; s->session_state = SESSION_STATE_TRANSPORT_CLOSING; - app_wrk = app_worker_get_if_valid (s->app_wrk_index); - if (!app_wrk) - return; - app = application_get (app_wrk->app_index); - app->cb_fns.session_disconnect_callback (s); + app_wrk = app_worker_get (s->app_wrk_index); + app_worker_close_notify (app_wrk, s); } /** @@ -775,75 +926,93 @@ session_transport_delete_notify (transport_connection_t * tc) if (!(s = session_get_if_valid (tc->s_index, tc->thread_index))) return; - /* Make sure we don't try to send anything more */ - svm_fifo_dequeue_drop_all (s->tx_fifo); - switch (s->session_state) { case SESSION_STATE_CREATED: /* Session was created but accept notification was not yet sent to the * app. Cleanup everything. */ session_lookup_del_session (s); - session_free_w_fifos (s); + segment_manager_dealloc_fifos (s->rx_fifo, s->tx_fifo); + session_free (s); break; case SESSION_STATE_ACCEPTING: case SESSION_STATE_TRANSPORT_CLOSING: + case SESSION_STATE_CLOSING: + case SESSION_STATE_TRANSPORT_CLOSED: /* If transport finishes or times out before we get a reply * from the app, mark transport as closed and wait for reply * before removing the session. Cleanup session table in advance * because transport will soon be closed and closed sessions * are assumed to have been removed from the lookup table */ session_lookup_del_session (s); - s->session_state = SESSION_STATE_TRANSPORT_CLOSED; + s->session_state = SESSION_STATE_TRANSPORT_DELETED; + session_cleanup_notify (s, SESSION_CLEANUP_TRANSPORT); + svm_fifo_dequeue_drop_all (s->tx_fifo); break; - case SESSION_STATE_CLOSING: - case SESSION_STATE_CLOSED_WAITING: + case SESSION_STATE_APP_CLOSED: /* Cleanup lookup table as transport needs to still be valid. * Program transport close to ensure that all session events * have been cleaned up. Once transport close is called, the * session is just removed because both transport and app have * confirmed the close*/ session_lookup_del_session (s); - s->session_state = SESSION_STATE_TRANSPORT_CLOSED; - session_program_transport_close (s); + s->session_state = SESSION_STATE_TRANSPORT_DELETED; + session_cleanup_notify (s, SESSION_CLEANUP_TRANSPORT); + svm_fifo_dequeue_drop_all (s->tx_fifo); + session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_CLOSE); break; - case SESSION_STATE_TRANSPORT_CLOSED: + case SESSION_STATE_TRANSPORT_DELETED: break; case SESSION_STATE_CLOSED: + session_cleanup_notify (s, SESSION_CLEANUP_TRANSPORT); session_delete (s); break; default: clib_warning ("session state %u", s->session_state); + session_cleanup_notify (s, SESSION_CLEANUP_TRANSPORT); session_delete (s); break; } } /** - * Notification from transport that session can be closed + * Notification from transport that it is closed * - * Should be called by transport only if it was closed with non-empty - * tx fifo and once it decides to begin the closing procedure prior to - * issuing a delete notify. This gives the chance to the session layer - * to cleanup any outstanding events. + * Should be called by transport, prior to calling delete notify, once it + * knows that no more data will be exchanged. This could serve as an + * early acknowledgment of an active close especially if transport delete + * can be delayed a long time, e.g., tcp time-wait. */ void session_transport_closed_notify (transport_connection_t * tc) { + app_worker_t *app_wrk; session_t *s; if (!(s = session_get_if_valid (tc->s_index, tc->thread_index))) 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. */ + if (s->session_state == SESSION_STATE_READY) + { + session_transport_closing_notify (tc); + svm_fifo_dequeue_drop_all (s->tx_fifo); + s->session_state = SESSION_STATE_TRANSPORT_CLOSED; + } /* If app close has not been received or has not yet resulted in * a transport close, only mark the session transport as closed */ - if (s->session_state <= SESSION_STATE_CLOSING) + else if (s->session_state <= SESSION_STATE_CLOSING) { - session_lookup_del_session (s); s->session_state = SESSION_STATE_TRANSPORT_CLOSED; } - else + /* If app also closed, switch to closed */ + else if (s->session_state == SESSION_STATE_APP_CLOSED) s->session_state = SESSION_STATE_CLOSED; + + app_wrk = app_worker_get_if_valid (s->app_wrk_index); + if (app_wrk) + app_worker_transport_closed_notify (app_wrk, s); } /** @@ -852,17 +1021,16 @@ session_transport_closed_notify (transport_connection_t * tc) void session_transport_reset_notify (transport_connection_t * tc) { - session_t *s; app_worker_t *app_wrk; - application_t *app; + session_t *s; + s = session_get (tc->s_index, tc->thread_index); svm_fifo_dequeue_drop_all (s->tx_fifo); if (s->session_state >= SESSION_STATE_TRANSPORT_CLOSING) return; s->session_state = SESSION_STATE_TRANSPORT_CLOSING; app_wrk = app_worker_get (s->app_wrk_index); - app = application_get (app_wrk->app_index); - app->cb_fns.session_reset_callback (s); + app_worker_reset_notify (app_wrk, s); } int @@ -876,7 +1044,14 @@ session_stream_accept_notify (transport_connection_t * tc) if (!app_wrk) return -1; s->session_state = SESSION_STATE_ACCEPTING; - return app_worker_accept_notify (app_wrk, s); + if (app_worker_accept_notify (app_wrk, s)) + { + /* On transport delete, no notifications should be sent. Unless, the + * accept is retried and successful. */ + s->session_state = SESSION_STATE_CREATED; + return -1; + } + return 0; } /** @@ -884,13 +1059,13 @@ session_stream_accept_notify (transport_connection_t * tc) */ int session_stream_accept (transport_connection_t * tc, u32 listener_index, - u8 notify) + u32 thread_index, u8 notify) { session_t *s; int rv; s = session_alloc_for_connection (tc); - s->listener_index = listener_index; + s->listener_handle = ((u64) thread_index << 32) | (u64) listener_index; s->session_state = SESSION_STATE_CREATED; if ((rv = app_worker_init_accepted (s))) @@ -914,6 +1089,7 @@ session_open_cl (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque) transport_connection_t *tc; transport_endpoint_cfg_t *tep; app_worker_t *app_wrk; + session_handle_t sh; session_t *s; int rv; @@ -938,6 +1114,8 @@ session_open_cl (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque) return -1; } + sh = session_handle (s); + session_lookup_add_connection (tc, sh); return app_worker_connect_notify (app_wrk, s, opaque); } @@ -973,6 +1151,8 @@ session_open_vc (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque) * thing but better than allocating a separate half-open pool. */ tc->s_index = opaque; + if (transport_half_open_has_fifos (rmt->transport_proto)) + return session_ho_stream_connect_notify (tc, 0 /* is_fail */ ); return 0; } @@ -1068,7 +1248,8 @@ session_stop_listen (session_t * s) if (!tc) return VNET_API_ERROR_ADDRESS_NOT_IN_USE; - session_lookup_del_connection (tc); + if (!(tc->flags & TRANSPORT_CONNECTION_F_NO_LOOKUP)) + session_lookup_del_connection (tc); transport_stop_listen (tp, s->connection_index); return 0; } @@ -1089,17 +1270,28 @@ session_close (session_t * s) { /* Session will only be removed once both app and transport * acknowledge the close */ - if (s->session_state == SESSION_STATE_TRANSPORT_CLOSED) - session_program_transport_close (s); - - /* Session already closed. Clear the tx fifo */ - if (s->session_state == SESSION_STATE_CLOSED) - svm_fifo_dequeue_drop_all (s->tx_fifo); + if (s->session_state == SESSION_STATE_TRANSPORT_CLOSED + || s->session_state == SESSION_STATE_TRANSPORT_DELETED) + session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_CLOSE); return; } s->session_state = SESSION_STATE_CLOSING; - session_program_transport_close (s); + session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_CLOSE); +} + +/** + * Force a close without waiting for data to be flushed + */ +void +session_reset (session_t * s) +{ + if (s->session_state >= SESSION_STATE_CLOSING) + return; + /* Drop all outstanding tx data */ + svm_fifo_dequeue_drop_all (s->tx_fifo); + s->session_state = SESSION_STATE_CLOSING; + session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_RESET); } /** @@ -1112,28 +1304,48 @@ session_close (session_t * s) void session_transport_close (session_t * s) { - /* If transport is already closed, just free the session */ - if (s->session_state >= SESSION_STATE_TRANSPORT_CLOSED) + if (s->session_state >= SESSION_STATE_APP_CLOSED) { - session_free_w_fifos (s); + if (s->session_state == SESSION_STATE_TRANSPORT_CLOSED) + s->session_state = SESSION_STATE_CLOSED; + /* If transport is already deleted, just free the session */ + else if (s->session_state >= SESSION_STATE_TRANSPORT_DELETED) + session_free_w_fifos (s); return; } - /* If tx queue wasn't drained, change state to closed waiting for transport. - * This way, the transport, if it so wishes, can continue to try sending the - * outstanding data (in closed state it cannot). It MUST however at one - * point, either after sending everything or after a timeout, call delete - * notify. This will finally lead to the complete cleanup of the session. + /* If the tx queue wasn't drained, the transport can continue to try + * sending the outstanding data (in closed state it cannot). It MUST however + * at one point, either after sending everything or after a timeout, call + * delete notify. This will finally lead to the complete cleanup of the + * session. */ - if (svm_fifo_max_dequeue (s->tx_fifo)) - s->session_state = SESSION_STATE_CLOSED_WAITING; - else - s->session_state = SESSION_STATE_CLOSED; + s->session_state = SESSION_STATE_APP_CLOSED; transport_close (session_get_transport_proto (s), s->connection_index, s->thread_index); } +/** + * Force transport close + */ +void +session_transport_reset (session_t * s) +{ + if (s->session_state >= SESSION_STATE_APP_CLOSED) + { + if (s->session_state == SESSION_STATE_TRANSPORT_CLOSED) + s->session_state = SESSION_STATE_CLOSED; + else if (s->session_state >= SESSION_STATE_TRANSPORT_DELETED) + session_free_w_fifos (s); + return; + } + + s->session_state = SESSION_STATE_APP_CLOSED; + transport_reset (session_get_transport_proto (s), s->connection_index, + s->thread_index); +} + /** * Cleanup transport and session state. * @@ -1144,15 +1356,15 @@ session_transport_close (session_t * s) void session_transport_cleanup (session_t * s) { - s->session_state = SESSION_STATE_CLOSED; - /* Delete from main lookup table before we axe the the transport */ session_lookup_del_session (s); - transport_cleanup (session_get_transport_proto (s), s->connection_index, - s->thread_index); + if (s->session_state != SESSION_STATE_TRANSPORT_DELETED) + transport_cleanup (session_get_transport_proto (s), s->connection_index, + s->thread_index); /* Since we called cleanup, no delete notification will come. So, make * sure the session is properly freed. */ - session_free_w_fifos (s); + segment_manager_dealloc_fifos (s->rx_fifo, s->tx_fifo); + session_free (s); } /** @@ -1165,11 +1377,10 @@ session_transport_cleanup (session_t * s) * vpp uses api svm region for event queues. */ void -session_vpp_event_queues_allocate (session_manager_main_t * smm) +session_vpp_event_queues_allocate (session_main_t * smm) { u32 evt_q_length = 2048, evt_size = sizeof (session_event_t); ssvm_private_t *eqs = &smm->evt_qs_segment; - api_main_t *am = &api_main; uword eqs_size = 64 << 20; pid_t vpp_pid = getpid (); void *oldheap; @@ -1199,7 +1410,7 @@ session_vpp_event_queues_allocate (session_manager_main_t * smm) if (smm->evt_qs_use_memfd_seg) oldheap = ssvm_push_heap (eqs->sh); else - oldheap = svm_push_data_heap (am->vlib_rp); + oldheap = vl_msg_push_heap (); for (i = 0; i < vec_len (smm->wrk); i++) { @@ -1224,18 +1435,31 @@ session_vpp_event_queues_allocate (session_manager_main_t * smm) if (smm->evt_qs_use_memfd_seg) ssvm_pop_heap (oldheap); else - svm_pop_heap (oldheap); + vl_msg_pop_heap (oldheap); } ssvm_private_t * -session_manager_get_evt_q_segment (void) +session_main_get_evt_q_segment (void) { - session_manager_main_t *smm = &session_manager_main; + session_main_t *smm = &session_main; if (smm->evt_qs_use_memfd_seg) return &smm->evt_qs_segment; return 0; } +u64 +session_segment_handle (session_t * s) +{ + svm_fifo_t *f; + + if (!s->rx_fifo) + return SESSION_INVALID_HANDLE; + + f = s->rx_fifo; + return segment_manager_make_segment_handle (f->segment_manager, + f->segment_index); +} + /* *INDENT-OFF* */ static session_fifo_rx_fn *session_tx_fns[TRANSPORT_TX_N_FNS] = { session_tx_fifo_peek_and_snd, @@ -1245,18 +1469,12 @@ static session_fifo_rx_fn *session_tx_fns[TRANSPORT_TX_N_FNS] = { }; /* *INDENT-ON* */ -/** - * Initialize session layer for given transport proto and ip version - * - * Allocates per session type (transport proto + ip version) data structures - * and adds arc from session queue node to session type output node. - */ void session_register_transport (transport_proto_t transport_proto, const transport_proto_vft_t * vft, u8 is_ip4, u32 output_node) { - session_manager_main_t *smm = &session_manager_main; + session_main_t *smm = &session_main; session_type_t session_type; u32 next_index = ~0; @@ -1277,7 +1495,26 @@ session_register_transport (transport_proto_t transport_proto, /* *INDENT-ON* */ smm->session_type_to_next[session_type] = next_index; - smm->session_tx_fns[session_type] = session_tx_fns[vft->tx_type]; + smm->session_tx_fns[session_type] = + session_tx_fns[vft->transport_options.tx_type]; +} + +transport_proto_t +session_add_transport_proto (void) +{ + session_main_t *smm = &session_main; + session_worker_t *wrk; + u32 thread; + + smm->last_transport_proto_type += 1; + + for (thread = 0; thread < vec_len (smm->wrk); thread++) + { + wrk = session_main_get_worker (thread); + vec_validate (wrk->session_to_enqueue, smm->last_transport_proto_type); + } + + return smm->last_transport_proto_type; } transport_connection_t * @@ -1291,6 +1528,18 @@ session_get_transport (session_t * s) s->connection_index); } +void +session_get_endpoint (session_t * s, transport_endpoint_t * tep, u8 is_lcl) +{ + if (s->session_state != SESSION_STATE_LISTENING) + return transport_get_endpoint (session_get_transport_proto (s), + s->connection_index, s->thread_index, tep, + is_lcl); + else + return transport_get_listener_endpoint (session_get_transport_proto (s), + s->connection_index, tep, is_lcl); +} + transport_connection_t * listen_session_get_transport (session_t * s) { @@ -1298,25 +1547,6 @@ listen_session_get_transport (session_t * s) s->connection_index); } -int -listen_session_get_local_session_endpoint (session_t * listener, - session_endpoint_t * sep) -{ - transport_connection_t *tc; - tc = listen_session_get_transport (listener); - if (!tc) - { - clib_warning ("no transport"); - return -1; - } - - /* N.B. The ip should not be copied because this is the local endpoint */ - sep->port = tc->lcl_port; - sep->transport_proto = tc->proto; - sep->is_ip4 = tc->is_ip4; - return 0; -} - void session_flush_frames_main_thread (vlib_main_t * vm) { @@ -1329,49 +1559,36 @@ static clib_error_t * session_manager_main_enable (vlib_main_t * vm) { segment_manager_main_init_args_t _sm_args = { 0 }, *sm_args = &_sm_args; - session_manager_main_t *smm = &session_manager_main; + session_main_t *smm = &session_main; vlib_thread_main_t *vtm = vlib_get_thread_main (); u32 num_threads, preallocated_sessions_per_worker; - session_manager_worker_t *wrk; - int i, j; + session_worker_t *wrk; + int i; num_threads = 1 /* main thread */ + vtm->n_threads; if (num_threads < 1) return clib_error_return (0, "n_thread_stacks not set"); + smm->last_transport_proto_type = TRANSPORT_PROTO_QUIC; /* Allocate cache line aligned worker contexts */ vec_validate_aligned (smm->wrk, num_threads - 1, CLIB_CACHE_LINE_BYTES); - for (i = 0; i < TRANSPORT_N_PROTO; i++) - { - for (j = 0; j < num_threads; j++) - smm->wrk[j].current_enqueue_epoch[i] = 1; - } - for (i = 0; i < num_threads; i++) { wrk = &smm->wrk[i]; - vec_validate (wrk->free_event_vector, 128); - _vec_len (wrk->free_event_vector) = 0; - vec_validate (wrk->pending_event_vector, 128); - _vec_len (wrk->pending_event_vector) = 0; - vec_validate (wrk->pending_disconnects, 128); - _vec_len (wrk->pending_disconnects) = 0; - vec_validate (wrk->postponed_event_vector, 128); - _vec_len (wrk->postponed_event_vector) = 0; - + 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->last_vlib_time = vlib_time_now (vlib_mains[i]); - wrk->dispatch_period = 500e-6; + wrk->last_vlib_us_time = wrk->last_vlib_time * CLIB_US_TIME_FREQ; + 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 SESSION_DEBUG - vec_validate (smm->last_event_poll_by_thread, num_threads - 1); -#endif - /* Allocate vpp event queues segment and queue */ session_vpp_event_queues_allocate (smm); @@ -1410,7 +1627,6 @@ session_manager_main_enable (vlib_main_t * vm) /* Enable transports */ transport_enable_disable (vm, 1); - transport_init_tx_pacers_period (); return 0; } @@ -1454,15 +1670,15 @@ vnet_session_enable_disable (vlib_main_t * vm, u8 is_en) clib_error_t *error = 0; if (is_en) { - if (session_manager_main.is_enabled) + if (session_main.is_enabled) return 0; - session_node_enable_disable (is_en); error = session_manager_main_enable (vm); + session_node_enable_disable (is_en); } else { - session_manager_main.is_enabled = 0; + session_main.is_enabled = 0; session_node_enable_disable (is_en); } @@ -1472,7 +1688,7 @@ vnet_session_enable_disable (vlib_main_t * vm, u8 is_en) clib_error_t * session_manager_main_init (vlib_main_t * vm) { - session_manager_main_t *smm = &session_manager_main; + session_main_t *smm = &session_main; smm->session_baseva = HIGH_SEGMENT_BASEVA; #if (HIGH_SEGMENT_BASEVA > (4ULL << 30)) smm->session_va_space_size = 128ULL << 30; @@ -1482,15 +1698,30 @@ session_manager_main_init (vlib_main_t * vm) smm->evt_qs_segment_size = 1 << 20; #endif smm->is_enabled = 0; + smm->session_enable_asap = 0; + return 0; +} + +static clib_error_t * +session_main_init (vlib_main_t * vm) +{ + session_main_t *smm = &session_main; + if (smm->session_enable_asap) + { + vlib_worker_thread_barrier_sync (vm); + vnet_session_enable_disable (vm, 1 /* is_en */ ); + vlib_worker_thread_barrier_release (vm); + } return 0; } VLIB_INIT_FUNCTION (session_manager_main_init); +VLIB_MAIN_LOOP_ENTER_FUNCTION (session_main_init); static clib_error_t * session_config_fn (vlib_main_t * vm, unformat_input_t * input) { - session_manager_main_t *smm = &session_manager_main; + session_main_t *smm = &session_main; u32 nitems; uword tmp; @@ -1566,6 +1797,8 @@ session_config_fn (vlib_main_t * vm, unformat_input_t * input) else if (unformat (input, "evt_qs_seg_size %U", unformat_memory_size, &smm->evt_qs_segment_size)) ; + else if (unformat (input, "enable")) + smm->session_enable_asap = 1; else return clib_error_return (0, "unknown input `%U'", format_unformat_error, input);