X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession.h;h=0a72f97a2f82d73e1d45ed4243831a9e9f2cface;hp=8f7bd6c999c23bbcfede5e762e65d5aad993ae86;hb=07063b8ea;hpb=26dd6de91b4d36ac04154c7eb6339684db6684a0 diff --git a/src/vnet/session/session.h b/src/vnet/session/session.h index 8f7bd6c999c..0a72f97a2f8 100644 --- a/src/vnet/session/session.h +++ b/src/vnet/session/session.h @@ -48,14 +48,12 @@ typedef struct session_tx_context_ session_t *s; transport_proto_vft_t *transport_vft; transport_connection_t *tc; + transport_send_params_t sp; u32 max_dequeue; - u32 snd_space; u32 left_to_snd; - u32 tx_offset; u32 max_len_to_snd; u16 deq_per_first_buf; u16 deq_per_buf; - u16 snd_mss; u16 n_segs_per_evt; u8 n_bufs_per_seg; CLIB_CACHE_LINE_ALIGN_MARK (cacheline1); @@ -68,6 +66,11 @@ typedef struct session_evt_elt session_event_t evt; } session_evt_elt_t; +typedef struct session_ctrl_evt_data_ +{ + u8 data[SESSION_CTRL_MSG_MAX_SIZE]; +} session_evt_ctrl_data_t; + typedef struct session_worker_ { CLIB_CACHE_LINE_ALIGN_MARK (cacheline0); @@ -79,13 +82,16 @@ typedef struct session_worker_ svm_msg_q_t *vpp_event_queue; /** vlib_time_now last time around the track */ - f64 last_vlib_time; + clib_time_type_t last_vlib_time; + + /** vlib_time_now rounded to us precision and as u64 */ + clib_us_time_t last_vlib_us_time; /** 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]; + u32 **session_to_enqueue; /** Context for session tx */ session_tx_context_t ctx; @@ -96,24 +102,30 @@ typedef struct session_worker_ /** Pool of session event list elements */ session_evt_elt_t *event_elts; + /** Pool of ctrl events data buffers */ + session_evt_ctrl_data_t *ctrl_evts_data; + + /** Head of control events list */ + clib_llist_index_t ctrl_head; + /** Head of list of elements */ clib_llist_index_t new_head; /** Head of list of pending events */ clib_llist_index_t old_head; - /** 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; + /** Vector of buffers to be sent */ + u32 *pending_tx_buffers; + + /** Vector of nexts for the pending tx buffers */ + u16 *pending_tx_nexts; + #if SESSION_DEBUG /** last event poll time by thread */ - f64 last_event_poll; + clib_time_type_t last_event_poll; #endif } session_worker_t; @@ -146,12 +158,16 @@ typedef struct session_main_ * Trade memory for speed, for now */ u32 *session_type_to_next; + transport_proto_t last_transport_proto_type; + /* * Config parameters */ /** Session manager is enabled */ u8 is_enabled; + /** Enable session manager at startup */ + u8 session_enable_asap; /** vpp fifo event queue configured length */ u32 configured_event_queue_length; @@ -189,6 +205,9 @@ extern vlib_node_registration_t session_queue_pre_input_node; #define SESSION_Q_PROCESS_FLUSH_FRAMES 1 #define SESSION_Q_PROCESS_STOP 2 +#define TRANSPORT_PROTO_INVALID (session_main.last_transport_proto_type + 1) +#define TRANSPORT_N_PROTOS (session_main.last_transport_proto_type + 1) + static inline session_evt_elt_t * session_evt_elt_alloc (session_worker_t * wrk) { @@ -203,44 +222,51 @@ 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) +static inline void +session_evt_add_old (session_worker_t * wrk, session_evt_elt_t * elt) { - return pool_elt_at_index (wrk->event_elts, wrk->old_head); + clib_llist_add_tail (wrk->event_elts, evt_list, elt, + pool_elt_at_index (wrk->event_elts, wrk->old_head)); } -static inline session_evt_elt_t * -session_evt_postponed_head (session_worker_t * wrk) +static inline void +session_evt_add_head_old (session_worker_t * wrk, session_evt_elt_t * elt) { - return pool_elt_at_index (wrk->event_elts, wrk->postponed_head); + clib_llist_add (wrk->event_elts, evt_list, elt, + pool_elt_at_index (wrk->event_elts, wrk->old_head)); } -static inline session_evt_elt_t * -session_evt_pending_disconnects_head (session_worker_t * wrk) + +static inline u32 +session_evt_ctrl_data_alloc (session_worker_t * wrk) { - return pool_elt_at_index (wrk->event_elts, wrk->disconnects_head); + session_evt_ctrl_data_t *data; + pool_get (wrk->ctrl_evts_data, data); + return (data - wrk->ctrl_evts_data); } -static inline void -session_evt_add_old (session_worker_t * wrk, session_evt_elt_t * elt) +static inline session_evt_elt_t * +session_evt_alloc_ctrl (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, - session_evt_old_head (wrk)); + pool_elt_at_index (wrk->event_elts, wrk->ctrl_head)); + return elt; } -static inline void -session_evt_add_postponed (session_worker_t * wrk, session_evt_elt_t * elt) +static inline void * +session_evt_ctrl_data (session_worker_t * wrk, session_evt_elt_t * elt) { - clib_llist_add_tail (wrk->event_elts, evt_list, elt, - session_evt_postponed_head (wrk)); + return (void *) (pool_elt_at_index (wrk->ctrl_evts_data, + elt->evt.ctrl_data_index)); } static inline void -session_evt_add_pending_disconnects (session_worker_t * wrk, - session_evt_elt_t * elt) +session_evt_ctrl_data_free (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)); + ASSERT (elt->evt.event_type > SESSION_IO_EVT_BUILTIN_TX); + pool_put_index (wrk->ctrl_evts_data, elt->evt.ctrl_data_index); } static inline session_evt_elt_t * @@ -263,22 +289,10 @@ session_evt_alloc_old (session_worker_t * wrk) return elt; } -always_inline u8 -session_is_valid (u32 si, u8 thread_index) -{ - session_t *s; - 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); void session_free (session_t * s); void session_free_w_fifos (session_t * s); +u8 session_is_valid (u32 si, u8 thread_index); always_inline session_t * session_get (u32 si, u32 thread_index) @@ -402,7 +416,9 @@ int session_open (u32 app_index, session_endpoint_t * tep, u32 opaque); int session_listen (session_t * s, session_endpoint_cfg_t * sep); int session_stop_listen (session_t * s); void session_close (session_t * s); +void session_reset (session_t * s); void session_transport_close (session_t * s); +void session_transport_reset (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); @@ -416,6 +432,7 @@ 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); +void sesssion_reschedule_tx (transport_connection_t * tc); transport_connection_t *session_get_transport (session_t * s); void session_get_endpoint (session_t * s, transport_endpoint_t * tep, u8 is_lcl); @@ -447,9 +464,22 @@ 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, u32 thread_index, u8 notify); +/** + * 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. + * + * @param transport_proto transport proto to be registered + * @param vft virtual function table for transport + * @param is_ip4 flag that indicates if transports uses ipv4 + * as underlying network layer + * @param output_node output node for transport + */ void session_register_transport (transport_proto_t transport_proto, const transport_proto_vft_t * vft, u8 is_ip4, u32 output_node); +transport_proto_t session_add_transport_proto (void); 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); @@ -479,14 +509,14 @@ always_inline u32 transport_rx_fifo_size (transport_connection_t * tc) { session_t *s = session_get (tc->s_index, tc->thread_index); - return s->rx_fifo->nitems; + return svm_fifo_size (s->rx_fifo); } always_inline u32 transport_tx_fifo_size (transport_connection_t * tc) { session_t *s = session_get (tc->s_index, tc->thread_index); - return s->tx_fifo->nitems; + return svm_fifo_size (s->tx_fifo); } always_inline u8 @@ -496,12 +526,18 @@ transport_rx_fifo_has_ooo_data (transport_connection_t * tc) return svm_fifo_has_ooo_data (s->rx_fifo); } -always_inline f64 +always_inline clib_time_type_t transport_time_now (u32 thread_index) { return session_main.wrk[thread_index].last_vlib_time; } +always_inline clib_us_time_t +transport_us_time_now (u32 thread_index) +{ + return session_main.wrk[thread_index].last_vlib_us_time; +} + always_inline void transport_add_tx_event (transport_connection_t * tc) { @@ -576,6 +612,14 @@ session_main_get_worker (u32 thread_index) return &session_main.wrk[thread_index]; } +static inline session_worker_t * +session_main_get_worker_if_valid (u32 thread_index) +{ + if (thread_index > vec_len (session_main.wrk)) + return 0; + return &session_main.wrk[thread_index]; +} + always_inline svm_msg_q_t * session_main_get_vpp_event_queue (u32 thread_index) { @@ -590,17 +634,28 @@ session_main_is_enabled () #define session_cli_return_if_not_enabled() \ do { \ - if (!session_main.is_enabled) \ - return clib_error_return(0, "session layer is not enabled"); \ + if (!session_main.is_enabled) \ + return clib_error_return (0, "session layer is not enabled"); \ } while (0) 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); + +always_inline void +session_add_pending_tx_buffer (session_type_t st, u32 thread_index, u32 bi) +{ + session_worker_t *wrk = session_main_get_worker (thread_index); + vec_add1 (wrk->pending_tx_buffers, bi); + vec_add1 (wrk->pending_tx_nexts, session_main.session_type_to_next[st]); +} + 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); +session_t *session_alloc_for_connection (transport_connection_t * tc); + #endif /* __included_session_h__ */ /*