X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession.h;h=babb002e07e5a8437c0724a4c5cc7aa09d9dd2c1;hb=5f45e01f5c3ce239eccd9546e2d04fa3141ca5cb;hp=63ed83d40df3334bdeb3be2b8a0dedc1327d8fc0;hpb=3ec66b023280b1aa4b2e92ae475ceb03e5ed3910;p=vpp.git diff --git a/src/vnet/session/session.h b/src/vnet/session/session.h index 63ed83d40df..babb002e07e 100644 --- a/src/vnet/session/session.h +++ b/src/vnet/session/session.h @@ -24,7 +24,7 @@ #define HALF_OPEN_LOOKUP_INVALID_VALUE ((u64)~0) #define INVALID_INDEX ((u32)~0) -#define SESSION_PROXY_LISTENER_INDEX ((u32)~0 - 1) +#define SESSION_PROXY_LISTENER_INDEX ((u8)~0 - 1) #define SESSION_LOCAL_HANDLE_PREFIX 0x7FFFFFFF /* TODO decide how much since we have pre-data as well */ @@ -36,9 +36,12 @@ typedef enum SESSION_IO_EVT_CT_RX, FIFO_EVENT_APP_TX, SESSION_IO_EVT_CT_TX, + SESSION_IO_EVT_TX_FLUSH, FIFO_EVENT_DISCONNECT, FIFO_EVENT_BUILTIN_RX, + FIFO_EVENT_BUILTIN_TX, FIFO_EVENT_RPC, + SESSION_CTRL_EVT_BOUND, SESSION_CTRL_EVT_ACCEPTED, SESSION_CTRL_EVT_ACCEPTED_REPLY, SESSION_CTRL_EVT_CONNECTED, @@ -46,7 +49,10 @@ typedef enum SESSION_CTRL_EVT_DISCONNECTED, SESSION_CTRL_EVT_DISCONNECTED_REPLY, SESSION_CTRL_EVT_RESET, - SESSION_CTRL_EVT_RESET_REPLY + SESSION_CTRL_EVT_RESET_REPLY, + SESSION_CTRL_EVT_REQ_WORKER_UPDATE, + SESSION_CTRL_EVT_WORKER_UPDATE, + SESSION_CTRL_EVT_WORKER_UPDATE_REPLY, } session_evt_type_t; static inline const char * @@ -170,51 +176,68 @@ typedef struct session_tx_context_ session_dgram_hdr_t hdr; } session_tx_context_t; -/* Forward definition */ -typedef struct _session_manager_main session_manager_main_t; +typedef struct session_manager_worker_ +{ + CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); -typedef int - (session_fifo_rx_fn) (vlib_main_t * vm, vlib_node_runtime_t * node, - session_event_t * e0, stream_session_t * s0, - int *n_tx_pkts); + /** Worker session pool */ + stream_session_t *sessions; -extern session_fifo_rx_fn session_tx_fifo_peek_and_snd; -extern session_fifo_rx_fn session_tx_fifo_dequeue_and_snd; -extern session_fifo_rx_fn session_tx_fifo_dequeue_internal; + /** vpp event message queue for worker */ + svm_msg_q_t *vpp_event_queue; -u8 session_node_lookup_fifo_event (svm_fifo_t * f, session_event_t * e); + /** Our approximation of a "complete" dispatch loop period */ + f64 dispatch_period; -struct _session_manager_main -{ - /** Per worker thread session pools */ - stream_session_t **sessions; + /** vlib_time_now last time around the track */ + f64 last_vlib_time; - /** Per worker-thread session pool peekers rw locks */ - clib_rwlock_t *peekers_rw_locks; + /** Per-proto enqueue epoch counters */ + u64 current_enqueue_epoch[TRANSPORT_N_PROTO]; - /** Per-proto, per-worker enqueue epoch counters */ - u32 *current_enqueue_epoch[TRANSPORT_N_PROTO]; + /** Per-proto vector of sessions to enqueue */ + u32 *session_to_enqueue[TRANSPORT_N_PROTO]; - /** Per-proto, per-worker thread vector of sessions to enqueue */ - u32 **session_to_enqueue[TRANSPORT_N_PROTO]; + /** Context for session tx */ + session_tx_context_t ctx; - /** per-worker tx buffer free lists */ - u32 **tx_buffers; + /** Vector of tx buffer free lists */ + u32 *tx_buffers; - /** Per worker-thread vector of partially read events */ - session_event_t **free_event_vector; + /** Vector of partially read events */ + session_event_t *free_event_vector; - /** per-worker active event vectors */ - session_event_t **pending_event_vector; + /** Vector of active event vectors */ + session_event_t *pending_event_vector; - /** per-worker postponed disconnects */ - session_event_t **pending_disconnects; + /** Vector of postponed disconnects */ + session_event_t *pending_disconnects; + + /** Vector of postponed events */ + session_event_t *postponed_event_vector; + + /** Peekers rw lock */ + clib_rwlock_t peekers_rw_locks; + + u32 last_tx_packets; + +} session_manager_worker_t; + +typedef int (session_fifo_rx_fn) (vlib_main_t * vm, + vlib_node_runtime_t * node, + session_manager_worker_t * wrk, + session_event_t * e, int *n_tx_pkts); + +extern session_fifo_rx_fn session_tx_fifo_peek_and_snd; +extern session_fifo_rx_fn session_tx_fifo_dequeue_and_snd; +extern session_fifo_rx_fn session_tx_fifo_dequeue_internal; - /** per-worker session context */ - session_tx_context_t *ctx; +u8 session_node_lookup_fifo_event (svm_fifo_t * f, session_event_t * e); - /** vpp fifo event queue */ - svm_msg_q_t **vpp_event_queues; +typedef struct session_manager_main_ +{ + /** Worker contexts */ + session_manager_worker_t *wrk; /** Event queues memfd segment initialized only if so configured */ ssvm_private_t evt_qs_segment; @@ -230,16 +253,16 @@ struct _session_manager_main * Trade memory for speed, for now */ u32 *session_type_to_next; + /* + * Config parameters + */ + /** Session manager is enabled */ u8 is_enabled; /** vpp fifo event queue configured length */ u32 configured_event_queue_length; - /* - * Config parameters - */ - /** Session ssvm segment configs*/ uword session_baseva; uword session_va_space_size; @@ -271,7 +294,7 @@ struct _session_manager_main f64 *last_event_poll_by_thread; #endif -}; +} session_manager_main_t; extern session_manager_main_t session_manager_main; extern vlib_node_registration_t session_queue_node; @@ -289,11 +312,17 @@ vnet_get_session_manager_main () return &session_manager_main; } +always_inline session_manager_worker_t * +session_manager_get_worker (u32 thread_index) +{ + return &session_manager_main.wrk[thread_index]; +} + always_inline u8 stream_session_is_valid (u32 si, u8 thread_index) { stream_session_t *s; - s = pool_elt_at_index (session_manager_main.sessions[thread_index], si); + s = pool_elt_at_index (session_manager_main.wrk[thread_index].sessions, si); if (s->thread_index != thread_index || s->session_index != si /* || s->server_rx_fifo->master_session_index != si || s->server_tx_fifo->master_session_index != si @@ -306,25 +335,29 @@ stream_session_is_valid (u32 si, u8 thread_index) stream_session_t *session_alloc (u32 thread_index); int session_alloc_fifos (segment_manager_t * sm, stream_session_t * s); void session_free (stream_session_t * s); +void session_free_w_fifos (stream_session_t * s); always_inline stream_session_t * session_get (u32 si, u32 thread_index) { ASSERT (stream_session_is_valid (si, thread_index)); - return pool_elt_at_index (session_manager_main.sessions[thread_index], si); + return pool_elt_at_index (session_manager_main.wrk[thread_index].sessions, + si); } always_inline stream_session_t * session_get_if_valid (u64 si, u32 thread_index) { - if (thread_index >= vec_len (session_manager_main.sessions)) + if (thread_index >= vec_len (session_manager_main.wrk)) return 0; - if (pool_is_free_index (session_manager_main.sessions[thread_index], si)) + if (pool_is_free_index (session_manager_main.wrk[thread_index].sessions, + si)) return 0; ASSERT (stream_session_is_valid (si, thread_index)); - return pool_elt_at_index (session_manager_main.sessions[thread_index], si); + return pool_elt_at_index (session_manager_main.wrk[thread_index].sessions, + si); } always_inline session_handle_t @@ -359,7 +392,7 @@ session_get_from_handle (session_handle_t handle) session_manager_main_t *smm = &session_manager_main; u32 session_index, thread_index; session_parse_handle (handle, &session_index, &thread_index); - return pool_elt_at_index (smm->sessions[thread_index], session_index); + return pool_elt_at_index (smm->wrk[thread_index].sessions, session_index); } always_inline stream_session_t * @@ -409,6 +442,19 @@ session_type_from_proto_and_ip (transport_proto_t proto, u8 is_ip4) return (proto << 1 | is_ip4); } +always_inline u64 +session_segment_handle (stream_session_t * s) +{ + svm_fifo_t *f; + + if (s->session_state == SESSION_STATE_LISTENING) + return SESSION_INVALID_HANDLE; + + f = s->server_rx_fifo; + return segment_manager_make_segment_handle (f->segment_manager, + f->segment_index); +} + always_inline u8 session_has_transport (stream_session_t * s) { @@ -432,19 +478,19 @@ u8 session_tx_is_dgram (stream_session_t * s); always_inline void session_pool_add_peeker (u32 thread_index) { - session_manager_main_t *smm = &session_manager_main; + session_manager_worker_t *wrk = &session_manager_main.wrk[thread_index]; if (thread_index == vlib_get_thread_index ()) return; - clib_rwlock_reader_lock (&smm->peekers_rw_locks[thread_index]); + clib_rwlock_reader_lock (&wrk->peekers_rw_locks); } always_inline void session_pool_remove_peeker (u32 thread_index) { - session_manager_main_t *smm = &session_manager_main; + session_manager_worker_t *wrk = &session_manager_main.wrk[thread_index]; if (thread_index == vlib_get_thread_index ()) return; - clib_rwlock_reader_unlock (&smm->peekers_rw_locks[thread_index]); + clib_rwlock_reader_unlock (&wrk->peekers_rw_locks); } /** @@ -455,18 +501,19 @@ session_pool_remove_peeker (u32 thread_index) always_inline stream_session_t * session_get_from_handle_safe (u64 handle) { - session_manager_main_t *smm = &session_manager_main; u32 thread_index = session_thread_from_handle (handle); + session_manager_worker_t *wrk = &session_manager_main.wrk[thread_index]; + if (thread_index == vlib_get_thread_index ()) { - return pool_elt_at_index (smm->sessions[thread_index], + return pool_elt_at_index (wrk->sessions, session_index_from_handle (handle)); } else { session_pool_add_peeker (thread_index); /* Don't use pool_elt_at index. See @ref session_pool_add_peeker */ - return smm->sessions[thread_index] + session_index_from_handle (handle); + return wrk->sessions + session_index_from_handle (handle); } } @@ -477,6 +524,13 @@ transport_max_rx_enqueue (transport_connection_t * tc) return svm_fifo_max_enqueue (s->server_rx_fifo); } +always_inline u32 +transport_max_tx_dequeue (transport_connection_t * tc) +{ + stream_session_t *s = session_get (tc->s_index, tc->thread_index); + return svm_fifo_max_dequeue (s->server_tx_fifo); +} + always_inline u32 transport_rx_fifo_size (transport_connection_t * tc) { @@ -491,10 +545,29 @@ transport_tx_fifo_size (transport_connection_t * tc) return s->server_tx_fifo->nitems; } +always_inline u8 +transport_rx_fifo_has_ooo_data (transport_connection_t * tc) +{ + stream_session_t *s = session_get (tc->c_index, tc->thread_index); + return svm_fifo_has_ooo_data (s->server_rx_fifo); +} + +always_inline f64 +transport_dispatch_period (u32 thread_index) +{ + return session_manager_main.wrk[thread_index].dispatch_period; +} + +always_inline f64 +transport_time_now (u32 thread_index) +{ + return session_manager_main.wrk[thread_index].last_vlib_time; +} + always_inline u32 session_get_index (stream_session_t * s) { - return (s - session_manager_main.sessions[s->thread_index]); + return (s - session_manager_main.wrk[s->thread_index].sessions); } always_inline stream_session_t * @@ -510,8 +583,8 @@ session_clone_safe (u32 session_index, u32 thread_index) */ session_pool_add_peeker (thread_index); new_s = session_alloc (current_thread_index); - old_s = session_manager_main.sessions[thread_index] + session_index; - clib_memcpy (new_s, old_s, sizeof (*new_s)); + old_s = session_manager_main.wrk[thread_index].sessions + session_index; + clib_memcpy_fast (new_s, old_s, sizeof (*new_s)); session_pool_remove_peeker (thread_index); new_s->thread_index = current_thread_index; new_s->session_index = session_get_index (new_s); @@ -542,24 +615,26 @@ int session_dequeue_notify (stream_session_t * s); void stream_session_init_fifos_pointers (transport_connection_t * tc, u32 rx_pointer, u32 tx_pointer); -void stream_session_accept_notify (transport_connection_t * tc); -void stream_session_disconnect_notify (transport_connection_t * tc); -void stream_session_delete_notify (transport_connection_t * tc); -void stream_session_reset_notify (transport_connection_t * tc); +int stream_session_accept_notify (transport_connection_t * tc); +void session_transport_closing_notify (transport_connection_t * tc); +void session_transport_delete_notify (transport_connection_t * tc); +void session_transport_closed_notify (transport_connection_t * tc); +void session_transport_reset_notify (transport_connection_t * tc); int stream_session_accept (transport_connection_t * tc, u32 listener_index, u8 notify); int session_open (u32 app_index, session_endpoint_t * tep, u32 opaque); -int stream_session_listen (stream_session_t * s, session_endpoint_t * tep); -int stream_session_stop_listen (stream_session_t * s); -void stream_session_disconnect (stream_session_t * s); -void stream_session_disconnect_transport (stream_session_t * s); -void stream_session_cleanup (stream_session_t * s); +int session_listen (stream_session_t * s, session_endpoint_cfg_t * sep); +int session_stop_listen (stream_session_t * s); +void session_close (stream_session_t * s); +void session_transport_close (stream_session_t * s); +void session_transport_cleanup (stream_session_t * s); int session_send_io_evt_to_thread (svm_fifo_t * f, session_evt_type_t evt_type); -int session_send_io_evt_to_thread_custom (svm_fifo_t * f, u32 thread_index, +int session_send_io_evt_to_thread_custom (void *data, u32 thread_index, session_evt_type_t evt_type); void session_send_rpc_evt_to_thread (u32 thread_index, void *fp, void *rpc_args); + ssvm_private_t *session_manager_get_evt_q_segment (void); u8 *format_stream_session (u8 * s, va_list * args); @@ -585,7 +660,7 @@ clib_error_t *vnet_session_enable_disable (vlib_main_t * vm, u8 is_en); always_inline svm_msg_q_t * session_manager_get_vpp_event_queue (u32 thread_index) { - return session_manager_main.vpp_event_queues[thread_index]; + return session_manager_main.wrk[thread_index].vpp_event_queue; } int session_manager_flush_enqueue_events (u8 proto, u32 thread_index);