X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession.h;h=a6118d127664959bd52902f7f74a1f203d18e6ff;hb=371ca50a74a9c4f1b74c4c1b65c6fdec610fcfc3;hp=d7bb18e4127b07028dabe04dd94641cea5d4b71b;hpb=93e658058033e251b98d18a1f0717a07a85adfc2;p=vpp.git diff --git a/src/vnet/session/session.h b/src/vnet/session/session.h index d7bb18e4127..a6118d12766 100644 --- a/src/vnet/session/session.h +++ b/src/vnet/session/session.h @@ -18,13 +18,14 @@ #include #include #include -#include #include #include +#include #define HALF_OPEN_LOOKUP_INVALID_VALUE ((u64)~0) #define INVALID_INDEX ((u32)~0) #define SESSION_PROXY_LISTENER_INDEX ((u32)~0 - 1) +#define SESSION_LOCAL_HANDLE_PREFIX 0x7FFFFFFF /* TODO decide how much since we have pre-data as well */ #define MAX_HDRS_LEN 100 /* Max number of bytes for headers */ @@ -70,7 +71,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,29 +82,20 @@ 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; void *arg; } rpc_args_t; +typedef u64 session_handle_t; + /* *INDENT-OFF* */ typedef CLIB_PACKED (struct { union { svm_fifo_t * fifo; - u64 session_handle; + session_handle_t session_handle; rpc_args_t rpc_args; }; u8 event_type; @@ -121,6 +114,7 @@ typedef int 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; u8 session_node_lookup_fifo_event (svm_fifo_t * f, session_fifo_event_t * e); @@ -129,15 +123,11 @@ 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 */ u32 *current_enqueue_epoch[TRANSPORT_N_PROTO]; @@ -158,13 +148,21 @@ 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[SESSION_N_TYPES]; + 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; @@ -176,7 +174,13 @@ struct _session_manager_main * Config parameters */ - /** session table size 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; @@ -230,6 +234,8 @@ 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); always_inline stream_session_t * session_get (u32 si, u32 thread_index) @@ -251,38 +257,92 @@ session_get_if_valid (u64 si, u32 thread_index) return pool_elt_at_index (session_manager_main.sessions[thread_index], si); } -always_inline u64 +always_inline session_handle_t session_handle (stream_session_t * s) { return ((u64) s->thread_index << 32) | (u64) s->session_index; } always_inline u32 -session_index_from_handle (u64 handle) +session_index_from_handle (session_handle_t handle) { return handle & 0xFFFFFFFF; } always_inline u32 -session_thread_from_handle (u64 handle) +session_thread_from_handle (session_handle_t handle) { return handle >> 32; } always_inline void -session_parse_handle (u64 handle, u32 * index, u32 * thread_index) +session_parse_handle (session_handle_t handle, u32 * index, + u32 * thread_index) { *index = session_index_from_handle (handle); *thread_index = session_thread_from_handle (handle); } always_inline stream_session_t * -session_get_from_handle (u64 handle) +session_get_from_handle (session_handle_t handle) { session_manager_main_t *smm = &session_manager_main; - return - pool_elt_at_index (smm->sessions[session_thread_from_handle (handle)], - session_index_from_handle (handle)); + u32 session_index, thread_index; + session_parse_handle (handle, &session_index, &thread_index); + return pool_elt_at_index (smm->sessions[thread_index], session_index); +} + +always_inline stream_session_t * +session_get_from_handle_if_valid (session_handle_t handle) +{ + u32 session_index, thread_index; + session_parse_handle (handle, &session_index, &thread_index); + return session_get_if_valid (session_index, thread_index); +} + +always_inline u8 +session_handle_is_local (session_handle_t handle) +{ + if ((handle >> 32) == SESSION_LOCAL_HANDLE_PREFIX) + return 1; + return 0; +} + +always_inline transport_proto_t +session_type_transport_proto (session_type_t st) +{ + return (st >> 1); +} + +always_inline u8 +session_type_is_ip4 (session_type_t st) +{ + return (st & 1); +} + +always_inline transport_proto_t +session_get_transport_proto (stream_session_t * s) +{ + return (s->session_type >> 1); +} + +always_inline fib_protocol_t +session_get_fib_proto (stream_session_t * s) +{ + u8 is_ip4 = s->session_type & 1; + return (is_ip4 ? FIB_PROTOCOL_IP4 : FIB_PROTOCOL_IP6); +} + +always_inline session_type_t +session_type_from_proto_and_ip (transport_proto_t proto, u8 is_ip4) +{ + return (proto << 1 | is_ip4); +} + +always_inline u8 +session_has_transport (stream_session_t * s) +{ + return (session_get_transport_proto (s) != TRANSPORT_PROTO_NONE); } /** @@ -301,11 +361,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 @@ -314,12 +370,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]); } /** @@ -405,7 +456,6 @@ transport_connection_t *session_get_transport (stream_session_t * s); u32 stream_session_tx_fifo_max_dequeue (transport_connection_t * tc); -stream_session_t *session_alloc (u32 thread_index); int session_enqueue_stream_connection (transport_connection_t * tc, vlib_buffer_t * b, u32 offset, @@ -433,24 +483,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]; @@ -466,7 +517,7 @@ listen_session_get_handle (stream_session_t * s) } always_inline stream_session_t * -listen_session_get_from_handle (u64 handle) +listen_session_get_from_handle (session_handle_t handle) { session_manager_main_t *smm = &session_manager_main; stream_session_t *s; @@ -482,6 +533,13 @@ listen_session_get_from_handle (u64 handle) return s; } +always_inline void +listen_session_parse_handle (session_handle_t handle, u32 * type, u32 * index) +{ + *type = handle >> 32; + *index = handle & 0xFFFFFFFF; +} + always_inline stream_session_t * listen_session_new (session_type_t type) { @@ -517,23 +575,13 @@ 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); -} - -always_inline void -session_manager_set_transport_rx_fn (u8 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; + return + pool_elt_at_index (session_manager_main.listen_sessions[session_type], + index); } -session_type_t -session_type_from_proto_and_ip (transport_proto_t proto, u8 is_ip4); - always_inline u8 session_manager_is_enabled () {