X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession.h;h=8f7bd6c999c23bbcfede5e762e65d5aad993ae86;hb=26dd6de91b4d36ac04154c7eb6339684db6684a0;hp=7722f4f03e336cd47c80bda3138d9e15cc2e361d;hpb=c9940fc20bf248ba10dad10108415219f0f8360f;p=vpp.git diff --git a/src/vnet/session/session.h b/src/vnet/session/session.h index 7722f4f03e3..8f7bd6c999c 100644 --- a/src/vnet/session/session.h +++ b/src/vnet/session/session.h @@ -15,13 +15,12 @@ #ifndef __included_session_h__ #define __included_session_h__ +#include #include #include #include -#include #include - -#define SESSION_PROXY_LISTENER_INDEX ((u8)~0 - 1) +#include #define foreach_session_input_error \ _(NO_SESSION, "No session drops") \ @@ -49,7 +48,6 @@ typedef struct session_tx_context_ session_t *s; transport_proto_vft_t *transport_vft; transport_connection_t *tc; - vlib_buffer_t *b; u32 max_dequeue; u32 snd_space; u32 left_to_snd; @@ -64,7 +62,13 @@ typedef struct session_tx_context_ session_dgram_hdr_t hdr; } session_tx_context_t; -typedef struct session_manager_worker_ +typedef struct session_evt_elt +{ + clib_llist_anchor_t evt_list; + session_event_t evt; +} session_evt_elt_t; + +typedef struct session_worker_ { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); @@ -74,14 +78,11 @@ typedef struct session_manager_worker_ /** vpp event message queue for worker */ svm_msg_q_t *vpp_event_queue; - /** Our approximation of a "complete" dispatch loop period */ - f64 dispatch_period; - /** vlib_time_now last time around the track */ f64 last_vlib_time; - /** Per-proto enqueue epoch counters */ - u64 current_enqueue_epoch[TRANSPORT_N_PROTO]; + /** Convenience pointer to this worker's vlib_main */ + vlib_main_t *vm; /** Per-proto vector of sessions to enqueue */ u32 *session_to_enqueue[TRANSPORT_N_PROTO]; @@ -92,29 +93,33 @@ typedef struct session_manager_worker_ /** Vector of tx buffer free lists */ u32 *tx_buffers; - /** Vector of partially read events */ - session_event_t *free_event_vector; + /** Pool of session event list elements */ + session_evt_elt_t *event_elts; - /** Vector of active event vectors */ - session_event_t *pending_event_vector; + /** Head of list of elements */ + clib_llist_index_t new_head; - /** Vector of postponed disconnects */ - session_event_t *pending_disconnects; + /** Head of list of pending events */ + clib_llist_index_t old_head; - /** Vector of postponed events */ - session_event_t *postponed_event_vector; + /** Head of list of postponed events */ + clib_llist_index_t postponed_head; + + /** Head of list of disconnect events */ + clib_llist_index_t disconnects_head; /** Peekers rw lock */ clib_rwlock_t peekers_rw_locks; - u32 last_tx_packets; - -} session_manager_worker_t; +#if SESSION_DEBUG + /** last event poll time by thread */ + f64 last_event_poll; +#endif +} session_worker_t; -typedef int (session_fifo_rx_fn) (vlib_main_t * vm, +typedef int (session_fifo_rx_fn) (session_worker_t * wrk, vlib_node_runtime_t * node, - session_manager_worker_t * wrk, - session_event_t * e, int *n_tx_pkts); + session_evt_elt_t * e, int *n_tx_packets); extern session_fifo_rx_fn session_tx_fifo_peek_and_snd; extern session_fifo_rx_fn session_tx_fifo_dequeue_and_snd; @@ -122,10 +127,10 @@ extern session_fifo_rx_fn session_tx_fifo_dequeue_internal; u8 session_node_lookup_fifo_event (svm_fifo_t * f, session_event_t * e); -typedef struct session_manager_main_ +typedef struct session_main_ { /** Worker contexts */ - session_manager_worker_t *wrk; + session_worker_t *wrk; /** Event queues memfd segment initialized only if so configured */ ssvm_private_t evt_qs_segment; @@ -154,7 +159,7 @@ typedef struct session_manager_main_ /** Session ssvm segment configs*/ uword session_baseva; uword session_va_space_size; - u32 evt_qs_segment_size; + uword evt_qs_segment_size; u8 evt_qs_use_memfd_seg; /** Session table size parameters */ @@ -174,69 +179,131 @@ typedef struct session_manager_main_ /** Preallocate session config parameter */ u32 preallocated_sessions; -#if SESSION_DEBUG - /** - * last event poll time by thread - * Debug only. Will cause false cache-line sharing as-is - */ - f64 *last_event_poll_by_thread; -#endif - -} session_manager_main_t; +} session_main_t; -extern session_manager_main_t session_manager_main; +extern session_main_t session_main; extern vlib_node_registration_t session_queue_node; extern vlib_node_registration_t session_queue_process_node; +extern vlib_node_registration_t session_queue_pre_input_node; #define SESSION_Q_PROCESS_FLUSH_FRAMES 1 #define SESSION_Q_PROCESS_STOP 2 +static inline session_evt_elt_t * +session_evt_elt_alloc (session_worker_t * wrk) +{ + session_evt_elt_t *elt; + pool_get (wrk->event_elts, elt); + return elt; +} + +static inline void +session_evt_elt_free (session_worker_t * wrk, session_evt_elt_t * elt) +{ + pool_put (wrk->event_elts, elt); +} + +static inline session_evt_elt_t * +session_evt_old_head (session_worker_t * wrk) +{ + return pool_elt_at_index (wrk->event_elts, wrk->old_head); +} + +static inline session_evt_elt_t * +session_evt_postponed_head (session_worker_t * wrk) +{ + return pool_elt_at_index (wrk->event_elts, wrk->postponed_head); +} + +static inline session_evt_elt_t * +session_evt_pending_disconnects_head (session_worker_t * wrk) +{ + return pool_elt_at_index (wrk->event_elts, wrk->disconnects_head); +} + +static inline void +session_evt_add_old (session_worker_t * wrk, session_evt_elt_t * elt) +{ + clib_llist_add_tail (wrk->event_elts, evt_list, elt, + session_evt_old_head (wrk)); +} + +static inline void +session_evt_add_postponed (session_worker_t * wrk, session_evt_elt_t * elt) +{ + clib_llist_add_tail (wrk->event_elts, evt_list, elt, + session_evt_postponed_head (wrk)); +} + +static inline void +session_evt_add_pending_disconnects (session_worker_t * wrk, + session_evt_elt_t * elt) +{ + clib_llist_add_tail (wrk->event_elts, evt_list, elt, + session_evt_pending_disconnects_head (wrk)); +} + +static inline session_evt_elt_t * +session_evt_alloc_new (session_worker_t * wrk) +{ + session_evt_elt_t *elt; + elt = session_evt_elt_alloc (wrk); + clib_llist_add_tail (wrk->event_elts, evt_list, elt, + pool_elt_at_index (wrk->event_elts, wrk->new_head)); + return elt; +} + +static inline session_evt_elt_t * +session_evt_alloc_old (session_worker_t * wrk) +{ + session_evt_elt_t *elt; + elt = session_evt_elt_alloc (wrk); + clib_llist_add_tail (wrk->event_elts, evt_list, elt, + pool_elt_at_index (wrk->event_elts, wrk->old_head)); + return elt; +} + always_inline u8 -stream_session_is_valid (u32 si, u8 thread_index) +session_is_valid (u32 si, u8 thread_index) { session_t *s; - 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 - || s->server_rx_fifo->master_thread_index != thread_index - || s->server_tx_fifo->master_thread_index != thread_index */ ) + s = pool_elt_at_index (session_main.wrk[thread_index].sessions, si); + if (s->session_state == SESSION_STATE_CLOSED) + return 1; + + if (s->thread_index != thread_index || s->session_index != si) return 0; return 1; } session_t *session_alloc (u32 thread_index); -int session_alloc_fifos (segment_manager_t * sm, session_t * s); void session_free (session_t * s); void session_free_w_fifos (session_t * s); always_inline 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.wrk[thread_index].sessions, - si); + ASSERT (session_is_valid (si, thread_index)); + return pool_elt_at_index (session_main.wrk[thread_index].sessions, si); } always_inline session_t * session_get_if_valid (u64 si, u32 thread_index) { - if (thread_index >= vec_len (session_manager_main.wrk)) + if (thread_index >= vec_len (session_main.wrk)) return 0; - if (pool_is_free_index (session_manager_main.wrk[thread_index].sessions, - si)) + if (pool_is_free_index (session_main.wrk[thread_index].sessions, si)) return 0; - ASSERT (stream_session_is_valid (si, thread_index)); - return pool_elt_at_index (session_manager_main.wrk[thread_index].sessions, - si); + ASSERT (session_is_valid (si, thread_index)); + return pool_elt_at_index (session_main.wrk[thread_index].sessions, si); } always_inline session_t * session_get_from_handle (session_handle_t handle) { - session_manager_main_t *smm = &session_manager_main; + session_main_t *smm = &session_main; u32 session_index, thread_index; session_parse_handle (handle, &session_index, &thread_index); return pool_elt_at_index (smm->wrk[thread_index].sessions, session_index); @@ -250,18 +317,7 @@ session_get_from_handle_if_valid (session_handle_t handle) return session_get_if_valid (session_index, thread_index); } -always_inline u64 -session_segment_handle (session_t * s) -{ - svm_fifo_t *f; - - if (s->session_state == SESSION_STATE_LISTENING) - return SESSION_INVALID_HANDLE; - - f = s->rx_fifo; - return segment_manager_make_segment_handle (f->segment_manager, - f->segment_index); -} +u64 session_segment_handle (session_t * s); /** * Acquires a lock that blocks a session pool from expanding. @@ -276,7 +332,7 @@ session_segment_handle (session_t * s) always_inline void session_pool_add_peeker (u32 thread_index) { - session_manager_worker_t *wrk = &session_manager_main.wrk[thread_index]; + session_worker_t *wrk = &session_main.wrk[thread_index]; if (thread_index == vlib_get_thread_index ()) return; clib_rwlock_reader_lock (&wrk->peekers_rw_locks); @@ -285,7 +341,7 @@ session_pool_add_peeker (u32 thread_index) always_inline void session_pool_remove_peeker (u32 thread_index) { - session_manager_worker_t *wrk = &session_manager_main.wrk[thread_index]; + session_worker_t *wrk = &session_main.wrk[thread_index]; if (thread_index == vlib_get_thread_index ()) return; clib_rwlock_reader_unlock (&wrk->peekers_rw_locks); @@ -300,7 +356,7 @@ always_inline session_t * session_get_from_handle_safe (u64 handle) { u32 thread_index = session_thread_from_handle (handle); - session_manager_worker_t *wrk = &session_manager_main.wrk[thread_index]; + session_worker_t *wrk = &session_main.wrk[thread_index]; if (thread_index == vlib_get_thread_index ()) { @@ -318,7 +374,7 @@ session_get_from_handle_safe (u64 handle) always_inline u32 session_get_index (session_t * s) { - return (s - session_manager_main.wrk[s->thread_index].sessions); + return (s - session_main.wrk[s->thread_index].sessions); } always_inline session_t * @@ -334,7 +390,7 @@ 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.wrk[thread_index].sessions + session_index; + old_s = session_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; @@ -350,16 +406,22 @@ void session_transport_close (session_t * s); void session_transport_cleanup (session_t * s); int session_send_io_evt_to_thread (svm_fifo_t * f, session_evt_type_t evt_type); +int session_enqueue_notify (session_t * s); int session_dequeue_notify (session_t * s); 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); +void session_send_rpc_evt_to_thread_force (u32 thread_index, void *fp, + void *rpc_args); +void session_add_self_custom_tx_evt (transport_connection_t * tc, + u8 has_prio); transport_connection_t *session_get_transport (session_t * s); +void session_get_endpoint (session_t * s, transport_endpoint_t * tep, + u8 is_lcl); - -u8 *format_stream_session (u8 * s, va_list * args); -uword unformat_stream_session (unformat_input_t * input, va_list * args); +u8 *format_session (u8 * s, va_list * args); +uword unformat_session (unformat_input_t * input, va_list * args); uword unformat_transport_connection (unformat_input_t * input, va_list * args); @@ -374,41 +436,43 @@ int session_enqueue_dgram_connection (session_t * s, session_dgram_hdr_t * hdr, vlib_buffer_t * b, u8 proto, u8 queue_event); -int stream_session_peek_bytes (transport_connection_t * tc, u8 * buffer, - u32 offset, u32 max_bytes); -u32 stream_session_dequeue_drop (transport_connection_t * tc, u32 max_bytes); - int session_stream_connect_notify (transport_connection_t * tc, u8 is_fail); int session_dgram_connect_notify (transport_connection_t * tc, u32 old_thread_index, session_t ** new_session); -void stream_session_init_fifos_pointers (transport_connection_t * tc, - u32 rx_pointer, u32 tx_pointer); - -int stream_session_accept_notify (transport_connection_t * tc); +int session_stream_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 session_stream_accept (transport_connection_t * tc, u32 listener_index, - u8 notify); -u32 session_tx_fifo_max_dequeue (transport_connection_t * tc); + u32 thread_index, u8 notify); void session_register_transport (transport_proto_t transport_proto, const transport_proto_vft_t * vft, u8 is_ip4, u32 output_node); +int session_tx_fifo_peek_bytes (transport_connection_t * tc, u8 * buffer, + u32 offset, u32 max_bytes); +u32 session_tx_fifo_dequeue_drop (transport_connection_t * tc, u32 max_bytes); always_inline u32 transport_max_rx_enqueue (transport_connection_t * tc) { session_t *s = session_get (tc->s_index, tc->thread_index); - return svm_fifo_max_enqueue (s->rx_fifo); + return svm_fifo_max_enqueue_prod (s->rx_fifo); } always_inline u32 transport_max_tx_dequeue (transport_connection_t * tc) { session_t *s = session_get (tc->s_index, tc->thread_index); - return svm_fifo_max_dequeue (s->tx_fifo); + return svm_fifo_max_dequeue_cons (s->tx_fifo); +} + +always_inline u32 +transport_max_rx_dequeue (transport_connection_t * tc) +{ + session_t *s = session_get (tc->s_index, tc->thread_index); + return svm_fifo_max_dequeue (s->rx_fifo); } always_inline u32 @@ -432,16 +496,10 @@ transport_rx_fifo_has_ooo_data (transport_connection_t * tc) return svm_fifo_has_ooo_data (s->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; + return session_main.wrk[thread_index].last_vlib_time; } always_inline void @@ -450,7 +508,7 @@ transport_add_tx_event (transport_connection_t * tc) session_t *s = session_get (tc->s_index, tc->thread_index); if (svm_fifo_has_event (s->tx_fifo)) return; - session_send_io_evt_to_thread (s->tx_fifo, FIFO_EVENT_APP_TX); + session_send_io_evt_to_thread (s->tx_fifo, SESSION_IO_EVT_TX); } /* @@ -460,7 +518,8 @@ transport_add_tx_event (transport_connection_t * tc) always_inline u64 listen_session_get_handle (session_t * s) { - ASSERT (s->session_state == SESSION_STATE_LISTENING); + ASSERT (s->session_state == SESSION_STATE_LISTENING || + session_get_transport_proto (s) == TRANSPORT_PROTO_QUIC); return session_handle (s); } @@ -478,7 +537,7 @@ listen_session_parse_handle (session_handle_t handle, u32 * index, } always_inline session_t * -listen_session_new (u8 thread_index, session_type_t type) +listen_session_alloc (u8 thread_index, session_type_t type) { session_t *s; s = session_alloc (thread_index); @@ -488,61 +547,57 @@ listen_session_new (u8 thread_index, session_type_t type) } always_inline session_t * -listen_session_get (u32 index) +listen_session_get (u32 ls_index) { - return session_get (index, 0); + return session_get (ls_index, 0); } always_inline void -listen_session_del (session_t * s) +listen_session_free (session_t * s) { session_free (s); } transport_connection_t *listen_session_get_transport (session_t * s); -int -listen_session_get_local_session_endpoint (session_t * listener, - session_endpoint_t * sep); - /* - * Session manager functions + * Session layer functions */ -always_inline session_manager_main_t * -vnet_get_session_manager_main () +always_inline session_main_t * +vnet_get_session_main () { - return &session_manager_main; + return &session_main; } -always_inline session_manager_worker_t * -session_manager_get_worker (u32 thread_index) +always_inline session_worker_t * +session_main_get_worker (u32 thread_index) { - return &session_manager_main.wrk[thread_index]; + return &session_main.wrk[thread_index]; } always_inline svm_msg_q_t * -session_manager_get_vpp_event_queue (u32 thread_index) +session_main_get_vpp_event_queue (u32 thread_index) { - return session_manager_main.wrk[thread_index].vpp_event_queue; + return session_main.wrk[thread_index].vpp_event_queue; } always_inline u8 -session_manager_is_enabled () +session_main_is_enabled () { - return session_manager_main.is_enabled == 1; + return session_main.is_enabled == 1; } #define session_cli_return_if_not_enabled() \ do { \ - if (!session_manager_main.is_enabled) \ + if (!session_main.is_enabled) \ return clib_error_return(0, "session layer is not enabled"); \ } while (0) -int session_manager_flush_enqueue_events (u8 proto, u32 thread_index); -int session_manager_flush_all_enqueue_events (u8 transport_proto); +int session_main_flush_enqueue_events (u8 proto, u32 thread_index); +int session_main_flush_all_enqueue_events (u8 transport_proto); void session_flush_frames_main_thread (vlib_main_t * vm); -ssvm_private_t *session_manager_get_evt_q_segment (void); +ssvm_private_t *session_main_get_evt_q_segment (void); void session_node_enable_disable (u8 is_en); clib_error_t *vnet_session_enable_disable (vlib_main_t * vm, u8 is_en);