X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession.c;h=adcbb2924d8f4d1d52bf4f43ba4bff7364507ac6;hb=e86a8edd3c14fb41ace2a12efd17bc7772bf623f;hp=7f28a3992ed5d038141857bb97474014b84ac69e;hpb=3cbc04bea02fc60471dfe0c671ede3ca42c118c3;p=vpp.git diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index 7f28a3992ed..adcbb2924d8 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) { @@ -147,7 +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->thread_index = thread_index; + s->enqueue_epoch = ~0; /* Attach transport to session and vice versa */ s->connection_index = tc->c_index; @@ -166,6 +165,7 @@ session_alloc_and_init (segment_manager_t * sm, transport_connection_t * tc, if (alloc_fifos && (rv = session_alloc_fifos (sm, s))) { session_free (s); + *ret_s = 0; return rv; } @@ -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"); @@ -490,7 +490,7 @@ session_enqueue_notify (stream_session_t * s, u8 block) /* *INDENT-OFF* */ SESSION_EVT_DBG(SESSION_EVT_ENQ, s, ({ - ed->data[0] = evt.event_id; + ed->data[0] = evt.event_type; ed->data[1] = svm_fifo_max_dequeue (s->server_rx_fifo); })); /* *INDENT-ON* */ @@ -581,7 +581,7 @@ session_stream_connect_notify (transport_connection_t * tc, u8 is_fail) if (!is_fail) { sm = application_get_connect_segment_manager (app); - alloc_fifos = application_is_proxy (app); + alloc_fifos = !application_is_builtin_proxy (app); if (session_alloc_and_init (sm, tc, alloc_fifos, &new_s)) { is_fail = 1; @@ -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,7 +919,7 @@ 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; } @@ -931,7 +934,8 @@ void stream_session_disconnect (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,7 +956,8 @@ 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); } /** @@ -975,7 +980,7 @@ session_vpp_event_queue_allocate (session_manager_main_t * smm, event_queue_length = smm->configured_event_queue_length; smm->vpp_event_queues[thread_index] = - unix_shared_memory_queue_init + svm_queue_init (event_queue_length, sizeof (session_fifo_event_t), 0 /* consumer pid */ , 0 /* (do not) send signal when queue non-empty */ ); @@ -984,49 +989,66 @@ session_vpp_event_queue_allocate (session_manager_main_t * smm, } } -session_type_t -session_type_from_proto_and_ip (transport_proto_t proto, u8 is_ip4) +/** + * 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) { - if (proto == TRANSPORT_PROTO_TCP) - { - if (is_ip4) - return SESSION_TYPE_IP4_TCP; - else - return SESSION_TYPE_IP6_TCP; - } - else - { - if (is_ip4) - return SESSION_TYPE_IP4_UDP; - else - return SESSION_TYPE_IP6_UDP; - } + 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); - return SESSION_N_TYPES; + /* *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) { - if (s->session_state >= SESSION_STATE_READY) - return tp_vfts[s->session_type].get_connection (s->connection_index, - s->thread_index); + transport_proto_t tp; + if (s->session_state != SESSION_STATE_LISTENING) + { + 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"); @@ -1084,6 +1106,11 @@ session_manager_main_enable (vlib_main_t * vm) _vec_len (smm->pending_event_vector[i]) = 0; 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]); + } } #if SESSION_DBG @@ -1122,8 +1149,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; } @@ -1234,6 +1261,17 @@ 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 return clib_error_return (0, "unknown input `%U'", format_unformat_error, input);