X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession.c;h=de3cbc57d66d0631333f7a496d6d72b0f4408e1b;hb=a332c46a51f9b4e13963340dfee1318e7513c124;hp=d995eeb04a54afec22d92e3349c78f27f88c402b;hpb=29ca16f582d7ca3613a01b91cf209776183ccdae;p=vpp.git diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index d995eeb04a5..de3cbc57d66 100644 --- a/src/vnet/session/session.c +++ b/src/vnet/session/session.c @@ -23,7 +23,6 @@ #include #include #include -#include session_manager_main_t session_manager_main; extern transport_proto_vft_t *tp_vfts; @@ -34,7 +33,7 @@ session_send_evt_to_thread (u64 session_handle, fifo_event_type_t evt_type, { u32 tries = 0; session_fifo_event_t evt = { {0}, }; - unix_shared_memory_queue_t *q; + svm_queue_t *q; evt.event_type = evt_type; if (evt_type == FIFO_EVENT_RPC) @@ -46,7 +45,7 @@ session_send_evt_to_thread (u64 session_handle, fifo_event_type_t evt_type, evt.session_handle = session_handle; q = session_manager_get_vpp_event_queue (thread_index); - while (unix_shared_memory_queue_add (q, (u8 *) & evt, 1)) + while (svm_queue_add (q, (u8 *) & evt, 1)) { if (tries++ == 3) { @@ -86,12 +85,12 @@ session_alloc (u32 thread_index) pool_get_aligned_will_expand (smm->sessions[thread_index], will_expand, CLIB_CACHE_LINE_BYTES); /* If we have peekers, let them finish */ - if (PREDICT_FALSE (will_expand)) + if (PREDICT_FALSE (will_expand && vlib_num_workers ())) { - clib_spinlock_lock_if_init (&smm->peekers_write_locks[thread_index]); + clib_rwlock_writer_lock (&smm->peekers_rw_locks[thread_index]); pool_get_aligned (session_manager_main.sessions[thread_index], s, CLIB_CACHE_LINE_BYTES); - clib_spinlock_unlock_if_init (&smm->peekers_write_locks[thread_index]); + clib_rwlock_writer_unlock (&smm->peekers_rw_locks[thread_index]); } else { @@ -147,6 +146,7 @@ session_alloc_for_connection (transport_connection_t * tc) s = session_alloc (thread_index); s->session_type = session_type_from_proto_and_ip (tc->proto, tc->is_ip4); s->session_state = SESSION_STATE_CONNECTING; + s->enqueue_epoch = ~0; /* Attach transport to session and vice versa */ s->connection_index = tc->c_index; @@ -443,7 +443,7 @@ session_enqueue_notify (stream_session_t * s, u8 block) { application_t *app; session_fifo_event_t evt; - unix_shared_memory_queue_t *q; + svm_queue_t *q; if (PREDICT_FALSE (s->session_state == SESSION_STATE_CLOSED)) { @@ -479,8 +479,8 @@ session_enqueue_notify (stream_session_t * s, u8 block) /* Based on request block (or not) for lack of space */ if (block || PREDICT_TRUE (q->cursize < q->maxsize)) - unix_shared_memory_queue_add (app->event_queue, (u8 *) & evt, - 0 /* do wait for mutex */ ); + svm_queue_add (app->event_queue, (u8 *) & evt, + 0 /* do wait for mutex */ ); else { clib_warning ("fifo full"); @@ -599,7 +599,7 @@ session_stream_connect_notify (transport_connection_t * tc, u8 is_fail) { SESSION_DBG ("failed to notify app"); if (!is_fail) - stream_session_disconnect (new_s); + stream_session_disconnect_transport (new_s); } else { @@ -622,12 +622,14 @@ static void session_switch_pool (void *cb_args) { session_switch_pool_args_t *args = (session_switch_pool_args_t *) cb_args; + transport_proto_t tp; stream_session_t *s; ASSERT (args->thread_index == vlib_get_thread_index ()); s = session_get (args->session_index, args->thread_index); s->server_tx_fifo->master_session_index = args->new_session_index; s->server_tx_fifo->master_thread_index = args->new_thread_index; - tp_vfts[s->session_type].cleanup (s->connection_index, s->thread_index); + tp = session_get_transport_proto (s); + tp_vfts[tp].cleanup (s->connection_index, s->thread_index); session_free (s); clib_mem_free (cb_args); } @@ -805,22 +807,22 @@ int session_open (u32 app_index, session_endpoint_t * rmt, u32 opaque) { transport_connection_t *tc; - session_type_t sst; + transport_endpoint_t *tep; segment_manager_t *sm; stream_session_t *s; application_t *app; int rv; u64 handle; - sst = session_type_from_proto_and_ip (rmt->transport_proto, rmt->is_ip4); - rv = tp_vfts[sst].open (session_endpoint_to_transport (rmt)); + tep = session_endpoint_to_transport (rmt); + rv = tp_vfts[rmt->transport_proto].open (tep); if (rv < 0) { SESSION_DBG ("Transport failed to open connection."); return VNET_API_ERROR_SESSION_CONNECT; } - tc = tp_vfts[sst].get_half_open ((u32) rv); + tc = tp_vfts[rmt->transport_proto].get_half_open ((u32) rv); /* If transport offers a stream service, only allocate session once the * connection has been established. @@ -873,15 +875,16 @@ stream_session_listen (stream_session_t * s, session_endpoint_t * sep) u32 tci; /* Transport bind/listen */ - tci = tp_vfts[s->session_type].bind (s->session_index, - session_endpoint_to_transport (sep)); + tci = tp_vfts[sep->transport_proto].bind (s->session_index, + session_endpoint_to_transport + (sep)); if (tci == (u32) ~ 0) return -1; /* Attach transport to session */ s->connection_index = tci; - tc = tp_vfts[s->session_type].get_listener (tci); + tc = tp_vfts[sep->transport_proto].get_listener (tci); /* Weird but handle it ... */ if (tc == 0) @@ -900,15 +903,15 @@ stream_session_listen (stream_session_t * s, session_endpoint_t * sep) int stream_session_stop_listen (stream_session_t * s) { + transport_proto_t tp = session_get_transport_proto (s); transport_connection_t *tc; - if (s->session_state != SESSION_STATE_LISTENING) { clib_warning ("not a listening session"); return -1; } - tc = tp_vfts[s->session_type].get_listener (s->connection_index); + tc = tp_vfts[tp].get_listener (s->connection_index); if (!tc) { clib_warning ("no transport"); @@ -916,22 +919,39 @@ stream_session_stop_listen (stream_session_t * s) } session_lookup_del_connection (tc); - tp_vfts[s->session_type].unbind (s->connection_index); + tp_vfts[tp].unbind (s->connection_index); return 0; } /** - * Disconnect session and propagate to transport. This should eventually + * Initialize session disconnect. + * + * Request is always sent to session node to ensure that all outstanding + * requests are served before transport is notified. + */ +void +stream_session_disconnect (stream_session_t * s) +{ + if (!s || s->session_state == SESSION_STATE_CLOSED) + return; + s->session_state = SESSION_STATE_CLOSED; + session_send_session_evt_to_thread (session_handle (s), + FIFO_EVENT_DISCONNECT, s->thread_index); +} + +/** + * Notify transport the session can be disconnected. This should eventually * result in a delete notification that allows us to cleanup session state. * Called for both active/passive disconnects. * - * Should be called from the session's thread. + * Must be called from the session's thread. */ void -stream_session_disconnect (stream_session_t * s) +stream_session_disconnect_transport (stream_session_t * s) { s->session_state = SESSION_STATE_CLOSED; - tp_vfts[s->session_type].close (s->connection_index, s->thread_index); + tp_vfts[session_get_transport_proto (s)].close (s->connection_index, + s->thread_index); } /** @@ -952,81 +972,133 @@ stream_session_cleanup (stream_session_t * s) if (rv) clib_warning ("hash delete error, rv %d", rv); - tp_vfts[s->session_type].cleanup (s->connection_index, s->thread_index); + tp_vfts[session_get_transport_proto (s)].cleanup (s->connection_index, + s->thread_index); } /** - * Allocate vpp event queue (once) per worker thread + * Allocate event queues in the shared-memory segment + * + * That can either be a newly created memfd segment, that will need to be + * mapped by all stack users, or the binary api's svm region. The latter is + * assumed to be already mapped. NOTE that this assumption DOES NOT hold if + * api clients bootstrap shm api over sockets (i.e. use memfd segments) and + * vpp uses api svm region for event queues. */ void -session_vpp_event_queue_allocate (session_manager_main_t * smm, - u32 thread_index) +session_vpp_event_queues_allocate (session_manager_main_t * smm) { + u32 evt_q_length = 2048, evt_size = sizeof (session_fifo_event_t); + ssvm_private_t *eqs = &smm->evt_qs_segment; api_main_t *am = &api_main; + u64 eqs_size = 64 << 20; + pid_t vpp_pid = getpid (); void *oldheap; - u32 event_queue_length = 2048; + int i; - if (smm->vpp_event_queues[thread_index] == 0) - { - /* Allocate event fifo in the /vpe-api shared-memory segment */ - oldheap = svm_push_data_heap (am->vlib_rp); + if (smm->configured_event_queue_length) + evt_q_length = smm->configured_event_queue_length; - if (smm->configured_event_queue_length) - event_queue_length = smm->configured_event_queue_length; + if (smm->evt_qs_use_memfd_seg) + { + if (smm->evt_qs_segment_size) + eqs_size = smm->evt_qs_segment_size; - smm->vpp_event_queues[thread_index] = - unix_shared_memory_queue_init - (event_queue_length, - sizeof (session_fifo_event_t), 0 /* consumer pid */ , - 0 /* (do not) send signal when queue non-empty */ ); + eqs->ssvm_size = eqs_size; + eqs->i_am_master = 1; + eqs->my_pid = vpp_pid; + eqs->name = format (0, "%s%c", "evt-qs-segment", 0); + eqs->requested_va = smm->session_baseva; - svm_pop_heap (oldheap); + ssvm_master_init (eqs, SSVM_SEGMENT_MEMFD); } -} -session_type_t -session_type_from_proto_and_ip (transport_proto_t proto, u8 is_ip4) -{ - if (proto == TRANSPORT_PROTO_TCP) - { - if (is_ip4) - return SESSION_TYPE_IP4_TCP; - else - return SESSION_TYPE_IP6_TCP; - } + if (smm->evt_qs_use_memfd_seg) + oldheap = ssvm_push_heap (eqs->sh); else + oldheap = svm_push_data_heap (am->vlib_rp); + + for (i = 0; i < vec_len (smm->vpp_event_queues); i++) { - if (is_ip4) - return SESSION_TYPE_IP4_UDP; - else - return SESSION_TYPE_IP6_UDP; + smm->vpp_event_queues[i] = svm_queue_init (evt_q_length, evt_size, + vpp_pid, 0); } - return SESSION_N_TYPES; + if (smm->evt_qs_use_memfd_seg) + ssvm_pop_heap (oldheap); + else + svm_pop_heap (oldheap); +} + +ssvm_private_t * +session_manager_get_evt_q_segment (void) +{ + session_manager_main_t *smm = &session_manager_main; + if (smm->evt_qs_use_memfd_seg) + return &smm->evt_qs_segment; + return 0; +} + +/** + * 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. + */ +void +session_register_transport (transport_proto_t transport_proto, + const transport_proto_vft_t * vft, u8 is_ip4, + u32 output_node) +{ + session_manager_main_t *smm = &session_manager_main; + session_type_t session_type; + u32 next_index = ~0; + + session_type = session_type_from_proto_and_ip (transport_proto, is_ip4); + + vec_validate (smm->session_type_to_next, session_type); + vec_validate (smm->listen_sessions, session_type); + vec_validate (smm->session_tx_fns, session_type); + + /* *INDENT-OFF* */ + foreach_vlib_main (({ + next_index = vlib_node_add_next (this_vlib_main, session_queue_node.index, + output_node); + })); + /* *INDENT-ON* */ + + smm->session_type_to_next[session_type] = next_index; + session_manager_set_transport_rx_fn (session_type, + vft->tx_fifo_offset != 0); } transport_connection_t * session_get_transport (stream_session_t * s) { + transport_proto_t tp; if (s->session_state != SESSION_STATE_LISTENING) - return tp_vfts[s->session_type].get_connection (s->connection_index, - s->thread_index); + { + tp = session_get_transport_proto (s); + return tp_vfts[tp].get_connection (s->connection_index, + s->thread_index); + } return 0; } transport_connection_t * listen_session_get_transport (stream_session_t * s) { - return tp_vfts[s->session_type].get_listener (s->connection_index); + transport_proto_t tp = session_get_transport_proto (s); + return tp_vfts[tp].get_listener (s->connection_index); } int listen_session_get_local_session_endpoint (stream_session_t * listener, session_endpoint_t * sep) { + transport_proto_t tp = session_get_transport_proto (listener); transport_connection_t *tc; - tc = - tp_vfts[listener->session_type].get_listener (listener->connection_index); + tc = tp_vfts[tp].get_listener (listener->connection_index); if (!tc) { clib_warning ("no transport"); @@ -1043,6 +1115,7 @@ listen_session_get_local_session_endpoint (stream_session_t * listener, static clib_error_t * session_manager_main_enable (vlib_main_t * vm) { + segment_manager_main_init_args_t _sm_args = { 0 }, *sm_args = &_sm_args; session_manager_main_t *smm = &session_manager_main; vlib_thread_main_t *vtm = vlib_get_thread_main (); u32 num_threads; @@ -1054,10 +1127,6 @@ session_manager_main_enable (vlib_main_t * vm) if (num_threads < 1) return clib_error_return (0, "n_thread_stacks not set"); - /* $$$ config parameters */ - svm_fifo_segment_init (0x200000000ULL /* first segment base VA */ , - 20 /* timeout in seconds */ ); - /* configure per-thread ** vectors */ vec_validate (smm->sessions, num_threads - 1); vec_validate (smm->tx_buffers, num_threads - 1); @@ -1065,9 +1134,7 @@ session_manager_main_enable (vlib_main_t * vm) vec_validate (smm->pending_disconnects, num_threads - 1); vec_validate (smm->free_event_vector, num_threads - 1); vec_validate (smm->vpp_event_queues, num_threads - 1); - vec_validate (smm->session_peekers, num_threads - 1); - vec_validate (smm->peekers_readers_locks, num_threads - 1); - vec_validate (smm->peekers_write_locks, num_threads - 1); + vec_validate (smm->peekers_rw_locks, num_threads - 1); for (i = 0; i < TRANSPORT_N_PROTO; i++) for (j = 0; j < num_threads; j++) @@ -1085,19 +1152,20 @@ session_manager_main_enable (vlib_main_t * vm) vec_validate (smm->pending_disconnects[i], 0); _vec_len (smm->pending_disconnects[i]) = 0; if (num_threads > 1) - { - clib_spinlock_init (&smm->peekers_readers_locks[i]); - clib_spinlock_init (&smm->peekers_write_locks[i]); - } + clib_rwlock_init (&smm->peekers_rw_locks[i]); } #if SESSION_DBG vec_validate (smm->last_event_poll_by_thread, num_threads - 1); #endif - /* Allocate vpp event queues */ - for (i = 0; i < vec_len (smm->vpp_event_queues); i++) - session_vpp_event_queue_allocate (smm, i); + /* Allocate vpp event queues segment and queue */ + session_vpp_event_queues_allocate (smm); + + /* Initialize fifo segment main baseva and timeout */ + sm_args->baseva = smm->session_baseva + smm->evt_qs_segment_size; + sm_args->size = smm->session_va_space_size; + segment_manager_main_init (sm_args); /* Preallocate sessions */ if (smm->preallocated_sessions) @@ -1127,8 +1195,8 @@ session_manager_main_enable (vlib_main_t * vm) smm->is_enabled = 1; - /* Enable TCP transport */ - vnet_tcp_enable_disable (vm, 1); + /* Enable transports */ + transport_enable_disable (vm, 1); return 0; } @@ -1170,6 +1238,9 @@ clib_error_t * session_manager_main_init (vlib_main_t * vm) { session_manager_main_t *smm = &session_manager_main; + smm->session_baseva = 0x200000000ULL; + smm->session_va_space_size = (u64) 128 << 30; + smm->evt_qs_segment_size = 64 << 20; smm->is_enabled = 0; return 0; } @@ -1239,6 +1310,19 @@ session_config_fn (vlib_main_t * vm, unformat_input_t * input) tmp, tmp); smm->configured_v6_halfopen_table_memory = tmp; } + else if (unformat (input, "local-endpoints-table-memory %U", + unformat_memory_size, &tmp)) + { + if (tmp >= 0x100000000) + return clib_error_return (0, "memory size %llx (%lld) too large", + tmp, tmp); + smm->local_endpoints_table_memory = tmp; + } + else if (unformat (input, "local-endpoints-table-buckets %d", + &smm->local_endpoints_table_buckets)) + ; + else if (unformat (input, "evt_qs_memfd_seg")) + smm->evt_qs_use_memfd_seg = 1; else return clib_error_return (0, "unknown input `%U'", format_unformat_error, input);