X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession.h;h=ec00e29172179d484d3a430d7188407c8c12174f;hb=a332c46a51f9b4e13963340dfee1318e7513c124;hp=cf1bc9d87fc4341d2baae542fa5593e2d42db747;hpb=c3ddea8fa9b959956fd8df66c8d3c4dbe99e0a77;p=vpp.git diff --git a/src/vnet/session/session.h b/src/vnet/session/session.h index cf1bc9d87fc..ec00e291721 100644 --- a/src/vnet/session/session.h +++ b/src/vnet/session/session.h @@ -18,9 +18,9 @@ #include #include #include -#include #include #include +#include #define HALF_OPEN_LOOKUP_INVALID_VALUE ((u64)~0) #define INVALID_INDEX ((u32)~0) @@ -70,7 +70,8 @@ _(FIFO_FULL, "Packets dropped for lack of rx fifo space") \ _(EVENT_FIFO_FULL, "Events not sent for lack of event fifo space") \ _(API_QUEUE_FULL, "Sessions not created for lack of API queue space") \ _(NEW_SEG_NO_SPACE, "Created segment, couldn't allocate a fifo pair") \ -_(NO_SPACE, "Couldn't allocate a fifo pair") +_(NO_SPACE, "Couldn't allocate a fifo pair") \ +_(SEG_CREATE, "Couldn't create a new segment") typedef enum { @@ -80,17 +81,6 @@ typedef enum SESSION_N_ERROR, } session_error_t; -/* Event queue input node static next indices */ -typedef enum -{ - SESSION_QUEUE_NEXT_DROP, - SESSION_QUEUE_NEXT_TCP_IP4_OUTPUT, - SESSION_QUEUE_NEXT_IP4_LOOKUP, - SESSION_QUEUE_NEXT_TCP_IP6_OUTPUT, - SESSION_QUEUE_NEXT_IP6_LOOKUP, - SESSION_QUEUE_N_NEXT, -} session_queue_next_t; - typedef struct { void *fp; @@ -129,18 +119,14 @@ struct _session_manager_main /** Per worker thread session pools */ stream_session_t **sessions; - /** Per worker-thread count of threads peeking into the session pool */ - u32 *session_peekers; - - /** Per worker-thread rw peekers locks */ - clib_spinlock_t *peekers_readers_locks; - clib_spinlock_t *peekers_write_locks; + /** Per worker-thread session pool peekers rw locks */ + clib_rwlock_t *peekers_rw_locks; /** Pool of listen sessions. Same type as stream sessions to ease lookups */ - stream_session_t *listen_sessions[SESSION_N_TYPES]; + stream_session_t **listen_sessions; /** Per-proto, per-worker enqueue epoch counters */ - u8 *current_enqueue_epoch[TRANSPORT_N_PROTO]; + u32 *current_enqueue_epoch[TRANSPORT_N_PROTO]; /** Per-proto, per-worker thread vector of sessions to enqueue */ u32 **session_to_enqueue[TRANSPORT_N_PROTO]; @@ -158,12 +144,39 @@ struct _session_manager_main session_fifo_event_t **pending_disconnects; /** vpp fifo event queue */ - unix_shared_memory_queue_t **vpp_event_queues; + svm_queue_t **vpp_event_queues; + + /** Event queues memfd segment initialized only if so configured */ + ssvm_private_t evt_qs_segment; + + /** Unique segment name counter */ + u32 unique_segment_name_counter; + + /** Per transport rx function that can either dequeue or peek */ + session_fifo_rx_fn **session_tx_fns; + + /** Per session type output nodes. Could optimize to group nodes by + * fib but lookup would then require session type parsing in session node. + * Trade memory for speed, for now */ + u32 *session_type_to_next; + + /** Session manager is enabled */ + u8 is_enabled; /** vpp fifo event queue configured length */ u32 configured_event_queue_length; - /** session table size parameters */ + /* + * Config parameters + */ + + /** Session ssvm segment configs*/ + uword session_baseva; + uword session_va_space_size; + u32 evt_qs_segment_size; + u8 evt_qs_use_memfd_seg; + + /** Session table size parameters */ u32 configured_v4_session_table_buckets; u32 configured_v4_session_table_memory; u32 configured_v4_halfopen_table_buckets; @@ -173,14 +186,9 @@ struct _session_manager_main u32 configured_v6_halfopen_table_buckets; u32 configured_v6_halfopen_table_memory; - /** Unique segment name counter */ - u32 unique_segment_name_counter; - - /** Per transport rx function that can either dequeue or peek */ - session_fifo_rx_fn *session_tx_fns[SESSION_N_TYPES]; - - /** Session manager is enabled */ - u8 is_enabled; + /** Transport table (preallocation) size parameters */ + u32 local_endpoints_table_memory; + u32 local_endpoints_table_buckets; /** Preallocate session config parameter */ u32 preallocated_sessions; @@ -277,6 +285,18 @@ session_get_from_handle (u64 handle) session_index_from_handle (handle)); } +always_inline transport_proto_t +session_get_transport_proto (stream_session_t * s) +{ + return (s->session_type >> 1); +} + +always_inline session_type_t +session_type_from_proto_and_ip (transport_proto_t proto, u8 is_ip4) +{ + return (proto << 1 | is_ip4); +} + /** * Acquires a lock that blocks a session pool from expanding. * @@ -293,11 +313,7 @@ session_pool_add_peeker (u32 thread_index) session_manager_main_t *smm = &session_manager_main; if (thread_index == vlib_get_thread_index ()) return; - clib_spinlock_lock_if_init (&smm->peekers_readers_locks[thread_index]); - smm->session_peekers[thread_index] += 1; - if (smm->session_peekers[thread_index] == 1) - clib_spinlock_lock_if_init (&smm->peekers_write_locks[thread_index]); - clib_spinlock_unlock_if_init (&smm->peekers_readers_locks[thread_index]); + clib_rwlock_reader_lock (&smm->peekers_rw_locks[thread_index]); } always_inline void @@ -306,12 +322,7 @@ session_pool_remove_peeker (u32 thread_index) session_manager_main_t *smm = &session_manager_main; if (thread_index == vlib_get_thread_index ()) return; - ASSERT (session_manager_main.session_peekers[thread_index] > 0); - clib_spinlock_lock_if_init (&smm->peekers_readers_locks[thread_index]); - smm->session_peekers[thread_index] -= 1; - if (smm->session_peekers[thread_index] == 0) - clib_spinlock_unlock_if_init (&smm->peekers_write_locks[thread_index]); - clib_spinlock_unlock_if_init (&smm->peekers_readers_locks[thread_index]); + clib_rwlock_reader_unlock (&smm->peekers_rw_locks[thread_index]); } /** @@ -425,24 +436,25 @@ 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); void session_send_session_evt_to_thread (u64 session_handle, fifo_event_type_t evt_type, u32 thread_index); +ssvm_private_t *session_manager_get_evt_q_segment (void); u8 *format_stream_session (u8 * s, va_list * args); uword unformat_stream_session (unformat_input_t * input, va_list * args); uword unformat_transport_connection (unformat_input_t * input, va_list * args); -int -send_session_connected_callback (u32 app_index, u32 api_context, - stream_session_t * s, u8 is_fail); - +void session_register_transport (transport_proto_t transport_proto, + const transport_proto_vft_t * vft, u8 is_ip4, + u32 output_node); clib_error_t *vnet_session_enable_disable (vlib_main_t * vm, u8 is_en); -always_inline unix_shared_memory_queue_t * +always_inline svm_queue_t * session_manager_get_vpp_event_queue (u32 thread_index) { return session_manager_main.vpp_event_queues[thread_index]; @@ -509,23 +521,25 @@ listen_session_get_local_session_endpoint (stream_session_t * listener, session_endpoint_t * sep); always_inline stream_session_t * -session_manager_get_listener (u8 type, u32 index) +session_manager_get_listener (u8 session_type, u32 index) { - return pool_elt_at_index (session_manager_main.listen_sessions[type], - index); + return + pool_elt_at_index (session_manager_main.listen_sessions[session_type], + index); } +/** + * Set peek or dequeue function for given session type + * + * Reliable transport protocols will probably want to use a peek function + */ always_inline void -session_manager_set_transport_rx_fn (u8 type, u8 is_peek) +session_manager_set_transport_rx_fn (session_type_t type, u8 is_peek) { - /* If an offset function is provided, then peek instead of dequeue */ session_manager_main.session_tx_fns[type] = (is_peek) ? session_tx_fifo_peek_and_snd : session_tx_fifo_dequeue_and_snd; } -session_type_t -session_type_from_proto_and_ip (transport_proto_t proto, u8 is_ip4); - always_inline u8 session_manager_is_enabled () { @@ -538,6 +552,8 @@ do { \ return clib_error_return(0, "session layer is not enabled"); \ } while (0) +void session_node_enable_disable (u8 is_en); + #endif /* __included_session_h__ */ /*