X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession.c;h=f14e83fe9762b1daf32941d67c8ceda25d269f30;hb=309f7aac170767028a2e6e7e9424ec3d13304aff;hp=472b38baae17c9bdfbe62e8cf0f9e838919408cb;hpb=2179513b71963a0b42ca6f1f2b641e79ce89447b;p=vpp.git diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index 472b38baae1..eaba80f24e2 100644 --- a/src/vnet/session/session.c +++ b/src/vnet/session/session.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 Cisco and/or its affiliates. + * Copyright (c) 2017-2019 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: @@ -18,98 +18,106 @@ */ #include -#include #include -#include #include #include +#include +#include -session_manager_main_t session_manager_main; -extern transport_proto_vft_t *tp_vfts; +session_main_t session_main; static inline int session_send_evt_to_thread (void *data, void *args, u32 thread_index, session_evt_type_t evt_type) { + session_worker_t *wrk = session_main_get_worker (thread_index); session_event_t *evt; svm_msg_q_msg_t msg; svm_msg_q_t *mq; - u32 tries = 0, max_tries; - mq = session_manager_get_vpp_event_queue (thread_index); - while (svm_msg_q_try_lock (mq)) - { - max_tries = vlib_get_current_process (vlib_get_main ())? 1e6 : 3; - if (tries++ == max_tries) - { - SESSION_DBG ("failed to enqueue evt"); - return -1; - } - } - if (PREDICT_FALSE (svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING))) - { - svm_msg_q_unlock (mq); - return -2; - } - msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); - if (PREDICT_FALSE (svm_msg_q_msg_is_invalid (&msg))) + mq = wrk->vpp_event_queue; + if (PREDICT_FALSE (svm_msg_q_lock (mq))) + return -1; + if (PREDICT_FALSE (svm_msg_q_or_ring_is_full (mq, SESSION_MQ_IO_EVT_RING))) { svm_msg_q_unlock (mq); return -2; } - evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg); - evt->event_type = evt_type; switch (evt_type) { - case FIFO_EVENT_RPC: + case SESSION_CTRL_EVT_RPC: + msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); + evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg); evt->rpc_args.fp = data; evt->rpc_args.arg = args; break; - case FIFO_EVENT_APP_TX: - case FIFO_EVENT_BUILTIN_RX: - evt->fifo = data; + case SESSION_IO_EVT_RX: + case SESSION_IO_EVT_TX: + case SESSION_IO_EVT_TX_FLUSH: + case SESSION_IO_EVT_BUILTIN_RX: + msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); + evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg); + evt->session_index = *(u32 *) data; break; - case FIFO_EVENT_DISCONNECT: - evt->session_handle = session_handle ((stream_session_t *) data); + case SESSION_IO_EVT_BUILTIN_TX: + case SESSION_CTRL_EVT_CLOSE: + case SESSION_CTRL_EVT_RESET: + msg = svm_msg_q_alloc_msg_w_ring (mq, SESSION_MQ_IO_EVT_RING); + evt = (session_event_t *) svm_msg_q_msg_data (mq, &msg); + evt->session_handle = session_handle ((session_t *) data); break; default: clib_warning ("evt unhandled!"); svm_msg_q_unlock (mq); return -1; } + evt->event_type = evt_type; svm_msg_q_add_and_unlock (mq, &msg); + + if (PREDICT_FALSE (wrk->state == SESSION_WRK_INTERRUPT)) + vlib_node_set_interrupt_pending (wrk->vm, session_queue_node.index); + return 0; } int session_send_io_evt_to_thread (svm_fifo_t * f, session_evt_type_t evt_type) { - return session_send_evt_to_thread (f, 0, f->master_thread_index, evt_type); + return session_send_evt_to_thread (&f->shr->master_session_index, 0, + f->master_thread_index, evt_type); } int -session_send_io_evt_to_thread_custom (svm_fifo_t * f, u32 thread_index, +session_send_io_evt_to_thread_custom (void *data, u32 thread_index, session_evt_type_t evt_type) { - return session_send_evt_to_thread (f, 0, thread_index, evt_type); + return session_send_evt_to_thread (data, 0, thread_index, evt_type); } int -session_send_ctrl_evt_to_thread (stream_session_t * s, - session_evt_type_t evt_type) +session_send_ctrl_evt_to_thread (session_t * s, session_evt_type_t evt_type) { - /* only event supported for now is disconnect */ - ASSERT (evt_type == FIFO_EVENT_DISCONNECT); - return session_send_evt_to_thread (s, 0, s->thread_index, - FIFO_EVENT_DISCONNECT); + /* only events supported are disconnect, shutdown and reset */ + ASSERT (evt_type == SESSION_CTRL_EVT_CLOSE || + evt_type == SESSION_CTRL_EVT_HALF_CLOSE || + evt_type == SESSION_CTRL_EVT_RESET); + return session_send_evt_to_thread (s, 0, s->thread_index, evt_type); +} + +void +session_send_rpc_evt_to_thread_force (u32 thread_index, void *fp, + void *rpc_args) +{ + session_send_evt_to_thread (fp, rpc_args, thread_index, + SESSION_CTRL_EVT_RPC); } void session_send_rpc_evt_to_thread (u32 thread_index, void *fp, void *rpc_args) { if (thread_index != vlib_get_thread_index ()) - session_send_evt_to_thread (fp, rpc_args, thread_index, FIFO_EVENT_RPC); + session_send_rpc_evt_to_thread_force (thread_index, fp, rpc_args); else { void (*fnp) (void *) = fp; @@ -117,69 +125,260 @@ session_send_rpc_evt_to_thread (u32 thread_index, void *fp, void *rpc_args) } } -stream_session_t * -session_alloc (u32 thread_index) +void +session_add_self_custom_tx_evt (transport_connection_t * tc, u8 has_prio) { - session_manager_main_t *smm = &session_manager_main; - stream_session_t *s; - u8 will_expand = 0; - 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 && vlib_num_workers ())) + session_t *s = session_get (tc->s_index, tc->thread_index); + + ASSERT (s->thread_index == vlib_get_thread_index ()); + ASSERT (s->session_state != SESSION_STATE_TRANSPORT_DELETED); + + if (!(s->flags & SESSION_F_CUSTOM_TX)) { - 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_rwlock_writer_unlock (&smm->peekers_rw_locks[thread_index]); + s->flags |= SESSION_F_CUSTOM_TX; + if (svm_fifo_set_event (s->tx_fifo) + || transport_connection_is_descheduled (tc)) + { + session_evt_elt_t *elt; + session_worker_t *wrk; + + wrk = session_main_get_worker (tc->thread_index); + if (has_prio) + elt = session_evt_alloc_new (wrk); + else + elt = session_evt_alloc_old (wrk); + elt->evt.session_index = tc->s_index; + elt->evt.event_type = SESSION_IO_EVT_TX; + tc->flags &= ~TRANSPORT_CONNECTION_F_DESCHED; + + if (PREDICT_FALSE (wrk->state == SESSION_WRK_INTERRUPT)) + vlib_node_set_interrupt_pending (wrk->vm, + session_queue_node.index); + } } - else +} + +void +sesssion_reschedule_tx (transport_connection_t * tc) +{ + session_worker_t *wrk = session_main_get_worker (tc->thread_index); + session_evt_elt_t *elt; + + ASSERT (tc->thread_index == vlib_get_thread_index ()); + + elt = session_evt_alloc_new (wrk); + elt->evt.session_index = tc->s_index; + elt->evt.event_type = SESSION_IO_EVT_TX; + + if (PREDICT_FALSE (wrk->state == SESSION_WRK_INTERRUPT)) + vlib_node_set_interrupt_pending (wrk->vm, session_queue_node.index); +} + +static void +session_program_transport_ctrl_evt (session_t * s, session_evt_type_t evt) +{ + u32 thread_index = vlib_get_thread_index (); + session_evt_elt_t *elt; + session_worker_t *wrk; + + /* If we are in the handler thread, or being called with the worker barrier + * held, just append a new event to pending disconnects vector. */ + if (vlib_thread_is_main_w_barrier () || thread_index == s->thread_index) { - pool_get_aligned (session_manager_main.sessions[thread_index], s, - CLIB_CACHE_LINE_BYTES); + wrk = session_main_get_worker (s->thread_index); + elt = session_evt_alloc_ctrl (wrk); + clib_memset (&elt->evt, 0, sizeof (session_event_t)); + elt->evt.session_handle = session_handle (s); + elt->evt.event_type = evt; + + if (PREDICT_FALSE (wrk->state == SESSION_WRK_INTERRUPT)) + vlib_node_set_interrupt_pending (wrk->vm, session_queue_node.index); } - memset (s, 0, sizeof (*s)); - s->session_index = s - session_manager_main.sessions[thread_index]; + else + session_send_ctrl_evt_to_thread (s, evt); +} + +session_t * +session_alloc (u32 thread_index) +{ + session_worker_t *wrk = &session_main.wrk[thread_index]; + session_t *s; + + pool_get_aligned_safe (wrk->sessions, s, CLIB_CACHE_LINE_BYTES); + clib_memset (s, 0, sizeof (*s)); + s->session_index = s - wrk->sessions; s->thread_index = thread_index; + s->app_index = APP_INVALID_INDEX; + return s; } void -session_free (stream_session_t * s) +session_free (session_t * s) { - pool_put (session_manager_main.sessions[s->thread_index], s); + session_worker_t *wrk = &session_main.wrk[s->thread_index]; + + SESSION_EVT (SESSION_EVT_FREE, s); if (CLIB_DEBUG) - memset (s, 0xFA, sizeof (*s)); + clib_memset (s, 0xFA, sizeof (*s)); + pool_put (wrk->sessions, s); } -int -session_alloc_fifos (segment_manager_t * sm, stream_session_t * s) +u8 +session_is_valid (u32 si, u8 thread_index) +{ + session_t *s; + transport_connection_t *tc; + + s = pool_elt_at_index (session_main.wrk[thread_index].sessions, si); + + if (s->thread_index != thread_index || s->session_index != si) + return 0; + + if (s->session_state == SESSION_STATE_TRANSPORT_DELETED + || s->session_state <= SESSION_STATE_LISTENING) + return 1; + + if (s->session_state == SESSION_STATE_CONNECTING && + (s->flags & SESSION_F_HALF_OPEN)) + return 1; + + tc = session_get_transport (s); + if (s->connection_index != tc->c_index + || s->thread_index != tc->thread_index || tc->s_index != si) + return 0; + + return 1; +} + +static void +session_cleanup_notify (session_t * s, session_cleanup_ntf_t ntf) +{ + app_worker_t *app_wrk; + + app_wrk = app_worker_get_if_valid (s->app_wrk_index); + if (!app_wrk) + return; + app_worker_cleanup_notify (app_wrk, s, ntf); +} + +void +session_free_w_fifos (session_t * s) +{ + session_cleanup_notify (s, SESSION_CLEANUP_SESSION); + segment_manager_dealloc_fifos (s->rx_fifo, s->tx_fifo); + session_free (s); +} + +/** + * Cleans up session and lookup table. + * + * Transport connection must still be valid. + */ +static void +session_delete (session_t * s) { - svm_fifo_t *server_rx_fifo = 0, *server_tx_fifo = 0; - u32 fifo_segment_index; int rv; - if ((rv = segment_manager_alloc_session_fifos (sm, &server_rx_fifo, - &server_tx_fifo, - &fifo_segment_index))) - return rv; - /* Initialize backpointers */ - server_rx_fifo->master_session_index = s->session_index; - server_rx_fifo->master_thread_index = s->thread_index; + /* Delete from the main lookup table. */ + if ((rv = session_lookup_del_session (s))) + clib_warning ("session %u hash delete rv %d", s->session_index, rv); + + session_free_w_fifos (s); +} + +void +session_cleanup_half_open (session_handle_t ho_handle) +{ + session_t *ho = session_get_from_handle (ho_handle); + + /* App transports can migrate their half-opens */ + if (ho->flags & SESSION_F_IS_MIGRATING) + { + /* Session still migrating, move to closed state to signal that the + * session should be removed. */ + if (ho->connection_index == ~0) + { + session_set_state (ho, SESSION_STATE_CLOSED); + return; + } + /* Migrated transports are no longer half-opens */ + transport_cleanup (session_get_transport_proto (ho), + ho->connection_index, ho->app_index /* overloaded */); + } + else + transport_cleanup_half_open (session_get_transport_proto (ho), + ho->connection_index); + session_free (ho); +} + +static void +session_half_open_free (session_t *ho) +{ + app_worker_t *app_wrk; - server_tx_fifo->master_session_index = s->session_index; - server_tx_fifo->master_thread_index = s->thread_index; + ASSERT (vlib_get_thread_index () <= 1); + app_wrk = app_worker_get (ho->app_wrk_index); + app_worker_del_half_open (app_wrk, ho); + session_free (ho); +} - s->server_rx_fifo = server_rx_fifo; - s->server_tx_fifo = server_tx_fifo; - s->svm_segment_index = fifo_segment_index; +static void +session_half_open_free_rpc (void *args) +{ + session_t *ho = ho_session_get (pointer_to_uword (args)); + session_half_open_free (ho); +} + +void +session_half_open_delete_notify (transport_connection_t *tc) +{ + /* Notification from ctrl thread accepted without rpc */ + if (tc->thread_index == transport_cl_thread ()) + { + session_half_open_free (ho_session_get (tc->s_index)); + } + else + { + void *args = uword_to_pointer ((uword) tc->s_index, void *); + session_send_rpc_evt_to_thread_force (transport_cl_thread (), + session_half_open_free_rpc, args); + } +} + +void +session_half_open_migrate_notify (transport_connection_t *tc) +{ + session_t *ho; + + ho = ho_session_get (tc->s_index); + ho->flags |= SESSION_F_IS_MIGRATING; + ho->connection_index = ~0; +} + +int +session_half_open_migrated_notify (transport_connection_t *tc) +{ + session_t *ho; + + ho = ho_session_get (tc->s_index); + + /* App probably detached so the half-open must be cleaned up */ + if (ho->session_state == SESSION_STATE_CLOSED) + { + session_half_open_delete_notify (tc); + return -1; + } + ho->connection_index = tc->c_index; + /* Overload app index for half-open with new thread */ + ho->app_index = tc->thread_index; return 0; } -static stream_session_t * +session_t * session_alloc_for_connection (transport_connection_t * tc) { - stream_session_t *s; + session_t *s; u32 thread_index = tc->thread_index; ASSERT (thread_index == vlib_get_thread_index () @@ -187,8 +386,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; + session_set_state (s, SESSION_STATE_CLOSED); /* Attach transport to session and vice versa */ s->connection_index = tc->c_index; @@ -196,26 +394,16 @@ session_alloc_for_connection (transport_connection_t * tc) return s; } -static int -session_alloc_and_init (segment_manager_t * sm, transport_connection_t * tc, - u8 alloc_fifos, stream_session_t ** ret_s) +session_t * +session_alloc_for_half_open (transport_connection_t *tc) { - stream_session_t *s; - int rv; + session_t *s; - s = session_alloc_for_connection (tc); - if (alloc_fifos && (rv = session_alloc_fifos (sm, s))) - { - session_free (s); - *ret_s = 0; - return rv; - } - - /* Add to the main lookup table */ - session_lookup_add_connection (tc, session_handle (s)); - - *ret_s = s; - return 0; + s = ho_session_alloc (); + s->session_type = session_type_from_proto_and_ip (tc->proto, tc->is_ip4); + s->connection_index = tc->c_index; + tc->s_index = s->session_index; + return s; } /** @@ -255,7 +443,7 @@ session_enqueue_discard_chain_bytes (vlib_main_t * vm, vlib_buffer_t * b, * Enqueue buffer chain tail */ always_inline int -session_enqueue_chain_tail (stream_session_t * s, vlib_buffer_t * b, +session_enqueue_chain_tail (session_t * s, vlib_buffer_t * b, u32 offset, u8 is_in_order) { vlib_buffer_t *chain_b; @@ -286,7 +474,7 @@ session_enqueue_chain_tail (stream_session_t * s, vlib_buffer_t * b, continue; if (is_in_order) { - rv = svm_fifo_enqueue_nowait (s->server_rx_fifo, len, data); + rv = svm_fifo_enqueue (s->rx_fifo, len, data); if (rv == len) { written += rv; @@ -309,8 +497,7 @@ session_enqueue_chain_tail (stream_session_t * s, vlib_buffer_t * b, } else { - rv = svm_fifo_enqueue_with_offset (s->server_rx_fifo, offset, len, - data); + rv = svm_fifo_enqueue_with_offset (s->rx_fifo, offset, len, data); if (rv) { clib_warning ("failed to enqueue multi-buffer seg"); @@ -328,6 +515,24 @@ session_enqueue_chain_tail (stream_session_t * s, vlib_buffer_t * b, return 0; } +void +session_fifo_tuning (session_t * s, svm_fifo_t * f, + session_ft_action_t act, u32 len) +{ + if (s->flags & SESSION_F_CUSTOM_FIFO_TUNING) + { + app_worker_t *app_wrk = app_worker_get (s->app_wrk_index); + app_worker_session_fifo_tuning (app_wrk, s, f, act, len); + if (CLIB_ASSERT_ENABLE) + { + segment_manager_t *sm; + sm = segment_manager_get (f->segment_manager); + ASSERT (f->shr->size >= 4096); + ASSERT (f->shr->size <= sm->max_fifo_size); + } + } +} + /* * Enqueue data for delivery to session peer. Does not notify peer of enqueue * event but on request can queue notification events for later delivery by @@ -347,16 +552,16 @@ session_enqueue_stream_connection (transport_connection_t * tc, vlib_buffer_t * b, u32 offset, u8 queue_event, u8 is_in_order) { - stream_session_t *s; + session_t *s; int enqueued = 0, rv, in_order_off; s = session_get (tc->s_index, tc->thread_index); if (is_in_order) { - enqueued = svm_fifo_enqueue_nowait (s->server_rx_fifo, - b->current_length, - vlib_buffer_get_current (b)); + enqueued = svm_fifo_enqueue (s->rx_fifo, + b->current_length, + vlib_buffer_get_current (b)); if (PREDICT_FALSE ((b->flags & VLIB_BUFFER_NEXT_PRESENT) && enqueued >= 0)) { @@ -368,7 +573,7 @@ session_enqueue_stream_connection (transport_connection_t * tc, } else { - rv = svm_fifo_enqueue_with_offset (s->server_rx_fifo, offset, + rv = svm_fifo_enqueue_with_offset (s->rx_fifo, offset, b->current_length, vlib_buffer_get_current (b)); if (PREDICT_FALSE ((b->flags & VLIB_BUFFER_NEXT_PRESENT) && !rv)) @@ -382,99 +587,131 @@ session_enqueue_stream_connection (transport_connection_t * tc, { /* Queue RX event on this fifo. Eventually these will need to be flushed * by calling stream_server_flush_enqueue_events () */ - session_manager_main_t *smm = vnet_get_session_manager_main (); - u32 thread_index = s->thread_index; - u32 enqueue_epoch = smm->current_enqueue_epoch[tc->proto][thread_index]; + session_worker_t *wrk; - if (s->enqueue_epoch != enqueue_epoch) + wrk = session_main_get_worker (s->thread_index); + if (!(s->flags & SESSION_F_RX_EVT)) { - s->enqueue_epoch = enqueue_epoch; - vec_add1 (smm->session_to_enqueue[tc->proto][thread_index], - s - smm->sessions[thread_index]); + s->flags |= SESSION_F_RX_EVT; + vec_add1 (wrk->session_to_enqueue[tc->proto], s->session_index); } + + session_fifo_tuning (s, s->rx_fifo, SESSION_FT_ACTION_ENQUEUED, 0); } return enqueued; } - int -session_enqueue_dgram_connection (stream_session_t * s, +session_enqueue_dgram_connection (session_t * s, session_dgram_hdr_t * hdr, vlib_buffer_t * b, u8 proto, u8 queue_event) { - int enqueued = 0, rv, in_order_off; + int rv; - ASSERT (svm_fifo_max_enqueue (s->server_rx_fifo) + ASSERT (svm_fifo_max_enqueue_prod (s->rx_fifo) >= b->current_length + sizeof (*hdr)); - svm_fifo_enqueue_nowait (s->server_rx_fifo, sizeof (session_dgram_hdr_t), - (u8 *) hdr); - enqueued = svm_fifo_enqueue_nowait (s->server_rx_fifo, b->current_length, - vlib_buffer_get_current (b)); - if (PREDICT_FALSE ((b->flags & VLIB_BUFFER_NEXT_PRESENT) && enqueued >= 0)) + if (PREDICT_TRUE (!(b->flags & VLIB_BUFFER_NEXT_PRESENT))) { - in_order_off = enqueued > b->current_length ? enqueued : 0; - rv = session_enqueue_chain_tail (s, b, in_order_off, 1); - if (rv > 0) - enqueued += rv; + /* *INDENT-OFF* */ + svm_fifo_seg_t segs[2] = { + { (u8 *) hdr, sizeof (*hdr) }, + { vlib_buffer_get_current (b), b->current_length } + }; + /* *INDENT-ON* */ + + rv = svm_fifo_enqueue_segments (s->rx_fifo, segs, 2, + 0 /* allow_partial */ ); } - if (queue_event) + else + { + vlib_main_t *vm = vlib_get_main (); + svm_fifo_seg_t *segs = 0, *seg; + vlib_buffer_t *it = b; + u32 n_segs = 1; + + vec_add2 (segs, seg, 1); + seg->data = (u8 *) hdr; + seg->len = sizeof (*hdr); + while (it) + { + vec_add2 (segs, seg, 1); + seg->data = vlib_buffer_get_current (it); + seg->len = it->current_length; + n_segs++; + if (!(it->flags & VLIB_BUFFER_NEXT_PRESENT)) + break; + it = vlib_get_buffer (vm, it->next_buffer); + } + rv = svm_fifo_enqueue_segments (s->rx_fifo, segs, n_segs, + 0 /* allow partial */ ); + vec_free (segs); + } + + if (queue_event && rv > 0) { /* Queue RX event on this fifo. Eventually these will need to be flushed * by calling stream_server_flush_enqueue_events () */ - session_manager_main_t *smm = vnet_get_session_manager_main (); - u32 thread_index = s->thread_index; - u32 enqueue_epoch = smm->current_enqueue_epoch[proto][thread_index]; + session_worker_t *wrk; - if (s->enqueue_epoch != enqueue_epoch) + wrk = session_main_get_worker (s->thread_index); + if (!(s->flags & SESSION_F_RX_EVT)) { - s->enqueue_epoch = enqueue_epoch; - vec_add1 (smm->session_to_enqueue[proto][thread_index], - s - smm->sessions[thread_index]); + s->flags |= SESSION_F_RX_EVT; + vec_add1 (wrk->session_to_enqueue[proto], s->session_index); } + + session_fifo_tuning (s, s->rx_fifo, SESSION_FT_ACTION_ENQUEUED, 0); } - return enqueued; + return rv > 0 ? rv : 0; } -/** Check if we have space in rx fifo to push more bytes */ -u8 -stream_session_no_space (transport_connection_t * tc, u32 thread_index, - u16 data_len) +int +session_tx_fifo_peek_bytes (transport_connection_t * tc, u8 * buffer, + u32 offset, u32 max_bytes) { - stream_session_t *s = session_get (tc->s_index, thread_index); - - if (PREDICT_FALSE (s->session_state != SESSION_STATE_READY)) - return 1; - - if (data_len > svm_fifo_max_enqueue (s->server_rx_fifo)) - return 1; - - return 0; + session_t *s = session_get (tc->s_index, tc->thread_index); + return svm_fifo_peek (s->tx_fifo, offset, max_bytes, buffer); } u32 -session_tx_fifo_max_dequeue (transport_connection_t * tc) +session_tx_fifo_dequeue_drop (transport_connection_t * tc, u32 max_bytes) { - stream_session_t *s = session_get (tc->s_index, tc->thread_index); - if (!s->server_tx_fifo) - return 0; - return svm_fifo_max_dequeue (s->server_tx_fifo); -} + session_t *s = session_get (tc->s_index, tc->thread_index); + u32 rv; -int -stream_session_peek_bytes (transport_connection_t * tc, u8 * buffer, - u32 offset, u32 max_bytes) -{ - stream_session_t *s = session_get (tc->s_index, tc->thread_index); - return svm_fifo_peek (s->server_tx_fifo, offset, max_bytes, buffer); + rv = svm_fifo_dequeue_drop (s->tx_fifo, max_bytes); + session_fifo_tuning (s, s->tx_fifo, SESSION_FT_ACTION_DEQUEUED, rv); + + if (svm_fifo_needs_deq_ntf (s->tx_fifo, max_bytes)) + session_dequeue_notify (s); + + return rv; } -u32 -stream_session_dequeue_drop (transport_connection_t * tc, u32 max_bytes) +static inline int +session_notify_subscribers (u32 app_index, session_t * s, + svm_fifo_t * f, session_evt_type_t evt_type) { - stream_session_t *s = session_get (tc->s_index, tc->thread_index); - return svm_fifo_dequeue_drop (s->server_tx_fifo, max_bytes); + app_worker_t *app_wrk; + application_t *app; + int i; + + app = application_get (app_index); + if (!app) + return -1; + + for (i = 0; i < f->shr->n_subscribers; i++) + { + app_wrk = application_get_worker (app, f->shr->subscribers[i]); + if (!app_wrk) + continue; + if (app_worker_lock_and_send_event (app_wrk, s, evt_type)) + return -1; + } + + return 0; } /** @@ -486,37 +723,102 @@ stream_session_dequeue_drop (transport_connection_t * tc, u32 max_bytes) * @return 0 on success or negative number if failed to send notification. */ static inline int -session_enqueue_notify (stream_session_t * s) +session_enqueue_notify_inline (session_t * s) { - app_worker_t *app; + app_worker_t *app_wrk; + u32 session_index; + u8 n_subscribers; - app = app_worker_get_if_valid (s->app_wrk_index); - if (PREDICT_FALSE (!app)) + session_index = s->session_index; + n_subscribers = svm_fifo_n_subscribers (s->rx_fifo); + + app_wrk = app_worker_get_if_valid (s->app_wrk_index); + if (PREDICT_FALSE (!app_wrk)) { SESSION_DBG ("invalid s->app_index = %d", s->app_wrk_index); return 0; } - /* *INDENT-OFF* */ - SESSION_EVT_DBG(SESSION_EVT_ENQ, s, ({ - ed->data[0] = FIFO_EVENT_APP_RX; - ed->data[1] = svm_fifo_max_dequeue (s->server_rx_fifo); - })); - /* *INDENT-ON* */ + SESSION_EVT (SESSION_EVT_ENQ, s, svm_fifo_max_dequeue_prod (s->rx_fifo)); + + s->flags &= ~SESSION_F_RX_EVT; + + /* Application didn't confirm accept yet */ + if (PREDICT_FALSE (s->session_state == SESSION_STATE_ACCEPTING)) + return 0; + + if (PREDICT_FALSE (app_worker_lock_and_send_event (app_wrk, s, + SESSION_IO_EVT_RX))) + return -1; + + if (PREDICT_FALSE (n_subscribers)) + { + s = session_get (session_index, vlib_get_thread_index ()); + return session_notify_subscribers (app_wrk->app_index, s, + s->rx_fifo, SESSION_IO_EVT_RX); + } + + return 0; +} + +int +session_enqueue_notify (session_t * s) +{ + return session_enqueue_notify_inline (s); +} + +static void +session_enqueue_notify_rpc (void *arg) +{ + u32 session_index = pointer_to_uword (arg); + session_t *s; + + s = session_get_if_valid (session_index, vlib_get_thread_index ()); + if (!s) + return; + + session_enqueue_notify (s); +} + +/** + * Like session_enqueue_notify, but can be called from a thread that does not + * own the session. + */ +void +session_enqueue_notify_thread (session_handle_t sh) +{ + u32 thread_index = session_thread_from_handle (sh); + u32 session_index = session_index_from_handle (sh); - return app_worker_lock_and_send_event (app, s, FIFO_EVENT_APP_RX); + /* + * Pass session index (u32) as opposed to handle (u64) in case pointers + * are not 64-bit. + */ + session_send_rpc_evt_to_thread (thread_index, + session_enqueue_notify_rpc, + uword_to_pointer (session_index, void *)); } int -session_dequeue_notify (stream_session_t * s) +session_dequeue_notify (session_t * s) { - app_worker_t *app; + app_worker_t *app_wrk; + + svm_fifo_clear_deq_ntf (s->tx_fifo); + + app_wrk = app_worker_get_if_valid (s->app_wrk_index); + if (PREDICT_FALSE (!app_wrk)) + return -1; - app = app_worker_get_if_valid (s->app_wrk_index); - if (PREDICT_FALSE (!app)) + if (PREDICT_FALSE (app_worker_lock_and_send_event (app_wrk, s, + SESSION_IO_EVT_TX))) return -1; - return app_worker_lock_and_send_event (app, s, FIFO_EVENT_APP_TX); + if (PREDICT_FALSE (s->tx_fifo->shr->n_subscribers)) + return session_notify_subscribers (app_wrk->app_index, s, + s->tx_fifo, SESSION_IO_EVT_TX); + + return 0; } /** @@ -528,14 +830,14 @@ session_dequeue_notify (stream_session_t * s) * failures due to API queue being full. */ int -session_manager_flush_enqueue_events (u8 transport_proto, u32 thread_index) +session_main_flush_enqueue_events (u8 transport_proto, u32 thread_index) { - session_manager_main_t *smm = &session_manager_main; - stream_session_t *s; + session_worker_t *wrk = session_main_get_worker (thread_index); + session_t *s; int i, errors = 0; u32 *indices; - indices = smm->session_to_enqueue[transport_proto][thread_index]; + indices = wrk->session_to_enqueue[transport_proto]; for (i = 0; i < vec_len (indices); i++) { @@ -545,117 +847,119 @@ session_manager_flush_enqueue_events (u8 transport_proto, u32 thread_index) errors++; continue; } - if (PREDICT_FALSE (session_enqueue_notify (s))) + + session_fifo_tuning (s, s->rx_fifo, SESSION_FT_ACTION_ENQUEUED, + 0 /* TODO/not needed */ ); + + if (PREDICT_FALSE (session_enqueue_notify_inline (s))) errors++; } vec_reset_length (indices); - smm->session_to_enqueue[transport_proto][thread_index] = indices; - smm->current_enqueue_epoch[transport_proto][thread_index]++; + wrk->session_to_enqueue[transport_proto] = indices; return errors; } int -session_manager_flush_all_enqueue_events (u8 transport_proto) +session_main_flush_all_enqueue_events (u8 transport_proto) { vlib_thread_main_t *vtm = vlib_get_thread_main (); int i, errors = 0; for (i = 0; i < 1 + vtm->n_threads; i++) - errors += session_manager_flush_enqueue_events (transport_proto, i); + errors += session_main_flush_enqueue_events (transport_proto, i); return errors; } -/** - * Init fifo tail and head pointers - * - * Useful if transport uses absolute offsets for tracking ooo segments. - */ -void -stream_session_init_fifos_pointers (transport_connection_t * tc, - u32 rx_pointer, u32 tx_pointer) -{ - stream_session_t *s; - s = session_get (tc->s_index, tc->thread_index); - svm_fifo_init_pointers (s->server_rx_fifo, rx_pointer); - svm_fifo_init_pointers (s->server_tx_fifo, tx_pointer); -} - int -session_stream_connect_notify (transport_connection_t * tc, u8 is_fail) +session_stream_connect_notify (transport_connection_t * tc, + session_error_t err) { u32 opaque = 0, new_ti, new_si; - stream_session_t *new_s = 0; - segment_manager_t *sm; app_worker_t *app_wrk; - application_t *app; - u8 alloc_fifos; - int error = 0; - u64 handle; + session_t *s = 0, *ho; /* - * Find connection handle and cleanup half-open table + * Cleanup half-open table */ - handle = session_lookup_half_open_handle (tc); - if (handle == HALF_OPEN_LOOKUP_INVALID_VALUE) - { - SESSION_DBG ("half-open was removed!"); - return -1; - } session_lookup_del_half_open (tc); - /* Get the app's index from the handle we stored when opening connection - * and the opaque (api_context for external apps) from transport session - * index */ - app_wrk = app_worker_get_if_valid (handle >> 32); + ho = ho_session_get (tc->s_index); + opaque = ho->opaque; + app_wrk = app_worker_get_if_valid (ho->app_wrk_index); if (!app_wrk) return -1; - opaque = tc->s_index; - app = application_get (app_wrk->app_index); - /* - * Allocate new session with fifos (svm segments are allocated if needed) - */ - if (!is_fail) + if (err) + return app_worker_connect_notify (app_wrk, s, err, opaque); + + s = session_alloc_for_connection (tc); + session_set_state (s, SESSION_STATE_CONNECTING); + s->app_wrk_index = app_wrk->wrk_index; + new_si = s->session_index; + new_ti = s->thread_index; + + if ((err = app_worker_init_connected (app_wrk, s))) { - sm = app_worker_get_connect_segment_manager (app_wrk); - alloc_fifos = !application_is_builtin_proxy (app); - if (session_alloc_and_init (sm, tc, alloc_fifos, &new_s)) - { - is_fail = 1; - error = -1; - } - else - { - new_s->app_wrk_index = app_wrk->wrk_index; - new_si = new_s->session_index; - new_ti = new_s->thread_index; - } + session_free (s); + app_worker_connect_notify (app_wrk, 0, err, opaque); + return -1; } - /* - * Notify client application - */ - if (app->cb_fns.session_connected_callback (app_wrk->wrk_index, opaque, - new_s, is_fail)) + s = session_get (new_si, new_ti); + session_set_state (s, SESSION_STATE_READY); + session_lookup_add_connection (tc, session_handle (s)); + + if (app_worker_connect_notify (app_wrk, s, SESSION_E_NONE, opaque)) { - SESSION_DBG ("failed to notify app"); - if (!is_fail) - { - new_s = session_get (new_si, new_ti); - stream_session_disconnect_transport (new_s); - } + session_lookup_del_connection (tc); + /* Avoid notifying app about rejected session cleanup */ + s = session_get (new_si, new_ti); + segment_manager_dealloc_fifos (s->rx_fifo, s->tx_fifo); + session_free (s); + return -1; } - else + + return 0; +} + +typedef union session_switch_pool_reply_args_ +{ + struct + { + u32 session_index; + u16 thread_index; + u8 is_closed; + }; + u64 as_u64; +} session_switch_pool_reply_args_t; + +STATIC_ASSERT (sizeof (session_switch_pool_reply_args_t) <= sizeof (uword), + "switch pool reply args size"); + +static void +session_switch_pool_reply (void *arg) +{ + session_switch_pool_reply_args_t rargs; + session_t *s; + + rargs.as_u64 = pointer_to_uword (arg); + s = session_get_if_valid (rargs.session_index, rargs.thread_index); + if (!s) + return; + + /* Session closed during migration. Clean everything up */ + if (rargs.is_closed) { - if (!is_fail) - { - new_s = session_get (new_si, new_ti); - new_s->session_state = SESSION_STATE_READY; - } + transport_cleanup (session_get_transport_proto (s), s->connection_index, + s->thread_index); + segment_manager_dealloc_fifos (s->rx_fifo, s->tx_fifo); + session_free (s); + return; } - return error; + /* Notify app that it has data on the new session */ + session_enqueue_notify (s); } typedef struct _session_switch_pool_args @@ -666,18 +970,52 @@ typedef struct _session_switch_pool_args u32 new_session_index; } session_switch_pool_args_t; +/** + * Notify old thread of the session pool switch + */ 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; + session_switch_pool_reply_args_t rargs; + session_handle_t new_sh; + segment_manager_t *sm; + app_worker_t *app_wrk; + 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 = session_get_transport_proto (s); - tp_vfts[tp].cleanup (s->connection_index, s->thread_index); + + /* Check if session closed during migration */ + rargs.is_closed = s->session_state >= SESSION_STATE_TRANSPORT_CLOSING; + + transport_cleanup (session_get_transport_proto (s), s->connection_index, + s->thread_index); + + app_wrk = app_worker_get_if_valid (s->app_wrk_index); + if (app_wrk) + { + /* Cleanup fifo segment slice state for fifos */ + sm = app_worker_get_connect_segment_manager (app_wrk); + segment_manager_detach_fifo (sm, &s->rx_fifo); + segment_manager_detach_fifo (sm, &s->tx_fifo); + + /* Notify app, using old session, about the migration event */ + if (!rargs.is_closed) + { + new_sh = session_make_handle (args->new_session_index, + args->new_thread_index); + app_worker_migrate_notify (app_wrk, s, new_sh); + } + } + + /* Trigger app read and fifo updates on the new thread */ + rargs.session_index = args->new_session_index; + rargs.thread_index = args->new_thread_index; + session_send_rpc_evt_to_thread (args->new_thread_index, + session_switch_pool_reply, + uword_to_pointer (rargs.as_u64, void *)); + session_free (s); clib_mem_free (cb_args); } @@ -687,21 +1025,32 @@ session_switch_pool (void *cb_args) */ int session_dgram_connect_notify (transport_connection_t * tc, - u32 old_thread_index, - stream_session_t ** new_session) + u32 old_thread_index, session_t ** new_session) { - stream_session_t *new_s; + session_t *new_s; session_switch_pool_args_t *rpc_args; + segment_manager_t *sm; + app_worker_t *app_wrk; /* * Clone half-open session to the right thread. */ new_s = session_clone_safe (tc->s_index, old_thread_index); new_s->connection_index = tc->c_index; - new_s->server_rx_fifo->master_session_index = new_s->session_index; - new_s->server_rx_fifo->master_thread_index = new_s->thread_index; - new_s->session_state = SESSION_STATE_READY; - session_lookup_add_connection (tc, session_handle (new_s)); + session_set_state (new_s, SESSION_STATE_READY); + new_s->flags |= SESSION_F_IS_MIGRATING; + + if (!(tc->flags & TRANSPORT_CONNECTION_F_NO_LOOKUP)) + session_lookup_add_connection (tc, session_handle (new_s)); + + app_wrk = app_worker_get_if_valid (new_s->app_wrk_index); + if (app_wrk) + { + /* New set of fifos attached to the same shared memory */ + sm = app_worker_get_connect_segment_manager (app_wrk); + segment_manager_attach_fifo (sm, &new_s->rx_fifo, new_s); + segment_manager_attach_fifo (sm, &new_s->tx_fifo, new_s); + } /* * Ask thread owning the old session to clean it up and make us the tx @@ -721,21 +1070,6 @@ session_dgram_connect_notify (transport_connection_t * tc, return 0; } -void -stream_session_accept_notify (transport_connection_t * tc) -{ - app_worker_t *app_wrk; - application_t *app; - stream_session_t *s; - - s = session_get (tc->s_index, tc->thread_index); - app_wrk = app_worker_get_if_valid (s->app_wrk_index); - if (!app_wrk) - return; - app = application_get (app_wrk->app_index); - app->cb_fns.session_accept_callback (s); -} - /** * Notification from transport that connection is being closed. * @@ -744,195 +1078,341 @@ stream_session_accept_notify (transport_connection_t * tc) * Ultimately this leads to close being called on transport (passive close). */ void -stream_session_disconnect_notify (transport_connection_t * tc) +session_transport_closing_notify (transport_connection_t * tc) { app_worker_t *app_wrk; - application_t *app; - stream_session_t *s; + session_t *s; s = session_get (tc->s_index, tc->thread_index); - s->session_state = SESSION_STATE_CLOSING; - app_wrk = app_worker_get_if_valid (s->app_wrk_index); - if (!app_wrk) + if (s->session_state >= SESSION_STATE_TRANSPORT_CLOSING) return; - app = application_get (app_wrk->app_index); - app->cb_fns.session_disconnect_callback (s); + + /* Wait for reply from app before sending notification as the + * accept might be rejected */ + if (s->session_state == SESSION_STATE_ACCEPTING) + { + session_set_state (s, SESSION_STATE_TRANSPORT_CLOSING); + return; + } + + session_set_state (s, SESSION_STATE_TRANSPORT_CLOSING); + app_wrk = app_worker_get (s->app_wrk_index); + app_worker_close_notify (app_wrk, s); } /** - * Cleans up session and lookup table. + * Notification from transport that connection is being deleted * - * Transport connection must still be valid. + * This removes the session if it is still valid. It should be called only on + * previously fully established sessions. For instance failed connects should + * call stream_session_connect_notify and indicate that the connect has + * failed. */ void -stream_session_delete (stream_session_t * s) +session_transport_delete_notify (transport_connection_t * tc) { - int rv; + session_t *s; - /* Delete from the main lookup table. */ - if ((rv = session_lookup_del_session (s))) - clib_warning ("hash delete error, rv %d", rv); + /* App might've been removed already */ + if (!(s = session_get_if_valid (tc->s_index, tc->thread_index))) + return; - /* Cleanup fifo segments */ - segment_manager_dealloc_fifos (s->svm_segment_index, s->server_rx_fifo, - s->server_tx_fifo); - session_free (s); + switch (s->session_state) + { + case SESSION_STATE_CREATED: + /* Session was created but accept notification was not yet sent to the + * app. Cleanup everything. */ + session_lookup_del_session (s); + segment_manager_dealloc_fifos (s->rx_fifo, s->tx_fifo); + session_free (s); + break; + case SESSION_STATE_ACCEPTING: + case SESSION_STATE_TRANSPORT_CLOSING: + case SESSION_STATE_CLOSING: + case SESSION_STATE_TRANSPORT_CLOSED: + /* If transport finishes or times out before we get a reply + * from the app, mark transport as closed and wait for reply + * before removing the session. Cleanup session table in advance + * because transport will soon be closed and closed sessions + * are assumed to have been removed from the lookup table */ + session_lookup_del_session (s); + session_set_state (s, SESSION_STATE_TRANSPORT_DELETED); + session_cleanup_notify (s, SESSION_CLEANUP_TRANSPORT); + svm_fifo_dequeue_drop_all (s->tx_fifo); + break; + case SESSION_STATE_APP_CLOSED: + /* Cleanup lookup table as transport needs to still be valid. + * Program transport close to ensure that all session events + * have been cleaned up. Once transport close is called, the + * session is just removed because both transport and app have + * confirmed the close*/ + session_lookup_del_session (s); + session_set_state (s, SESSION_STATE_TRANSPORT_DELETED); + session_cleanup_notify (s, SESSION_CLEANUP_TRANSPORT); + svm_fifo_dequeue_drop_all (s->tx_fifo); + session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_CLOSE); + break; + case SESSION_STATE_TRANSPORT_DELETED: + break; + case SESSION_STATE_CLOSED: + session_cleanup_notify (s, SESSION_CLEANUP_TRANSPORT); + session_delete (s); + break; + default: + clib_warning ("session state %u", s->session_state); + session_cleanup_notify (s, SESSION_CLEANUP_TRANSPORT); + session_delete (s); + break; + } } /** - * Notification from transport that connection is being deleted + * Notification from transport that it is closed * - * This removes the session if it is still valid. It should be called only on - * previously fully established sessions. For instance failed connects should - * call stream_session_connect_notify and indicate that the connect has - * failed. + * Should be called by transport, prior to calling delete notify, once it + * knows that no more data will be exchanged. This could serve as an + * early acknowledgment of an active close especially if transport delete + * can be delayed a long time, e.g., tcp time-wait. */ void -stream_session_delete_notify (transport_connection_t * tc) +session_transport_closed_notify (transport_connection_t * tc) { - stream_session_t *s; + app_worker_t *app_wrk; + session_t *s; - /* App might've been removed already */ - s = session_get_if_valid (tc->s_index, tc->thread_index); - if (!s) + if (!(s = session_get_if_valid (tc->s_index, tc->thread_index))) return; - stream_session_delete (s); + + /* Transport thinks that app requested close but it actually didn't. + * Can happen for tcp: + * 1)if fin and rst are received in close succession. + * 2)if app shutdown the connection. */ + if (s->session_state == SESSION_STATE_READY) + { + session_transport_closing_notify (tc); + svm_fifo_dequeue_drop_all (s->tx_fifo); + session_set_state (s, SESSION_STATE_TRANSPORT_CLOSED); + } + /* If app close has not been received or has not yet resulted in + * a transport close, only mark the session transport as closed */ + else if (s->session_state <= SESSION_STATE_CLOSING) + session_set_state (s, SESSION_STATE_TRANSPORT_CLOSED); + /* If app also closed, switch to closed */ + else if (s->session_state == SESSION_STATE_APP_CLOSED) + session_set_state (s, SESSION_STATE_CLOSED); + + app_wrk = app_worker_get_if_valid (s->app_wrk_index); + if (app_wrk) + app_worker_transport_closed_notify (app_wrk, s); } /** * Notify application that connection has been reset. */ void -stream_session_reset_notify (transport_connection_t * tc) +session_transport_reset_notify (transport_connection_t * tc) { - stream_session_t *s; app_worker_t *app_wrk; - application_t *app; + session_t *s; + s = session_get (tc->s_index, tc->thread_index); - s->session_state = SESSION_STATE_CLOSED; + svm_fifo_dequeue_drop_all (s->tx_fifo); + if (s->session_state >= SESSION_STATE_TRANSPORT_CLOSING) + return; + if (s->session_state == SESSION_STATE_ACCEPTING) + { + session_set_state (s, SESSION_STATE_TRANSPORT_CLOSING); + return; + } + session_set_state (s, SESSION_STATE_TRANSPORT_CLOSING); app_wrk = app_worker_get (s->app_wrk_index); - app = application_get (app_wrk->app_index); - app->cb_fns.session_reset_callback (s); + app_worker_reset_notify (app_wrk, s); +} + +int +session_stream_accept_notify (transport_connection_t * tc) +{ + app_worker_t *app_wrk; + session_t *s; + + s = session_get (tc->s_index, tc->thread_index); + app_wrk = app_worker_get_if_valid (s->app_wrk_index); + if (!app_wrk) + return -1; + if (s->session_state != SESSION_STATE_CREATED) + return 0; + session_set_state (s, SESSION_STATE_ACCEPTING); + if (app_worker_accept_notify (app_wrk, s)) + { + /* On transport delete, no notifications should be sent. Unless, the + * accept is retried and successful. */ + session_set_state (s, SESSION_STATE_CREATED); + return -1; + } + return 0; +} + +/** + * Accept a stream session. Optionally ping the server by callback. + */ +int +session_stream_accept (transport_connection_t * tc, u32 listener_index, + u32 thread_index, u8 notify) +{ + session_t *s; + int rv; + + s = session_alloc_for_connection (tc); + s->listener_handle = ((u64) thread_index << 32) | (u64) listener_index; + session_set_state (s, SESSION_STATE_CREATED); + + if ((rv = app_worker_init_accepted (s))) + { + session_free (s); + return rv; + } + + session_lookup_add_connection (tc, session_handle (s)); + + /* Shoulder-tap the server */ + if (notify) + { + app_worker_t *app_wrk = app_worker_get (s->app_wrk_index); + if ((rv = app_worker_accept_notify (app_wrk, s))) + { + session_lookup_del_session (s); + segment_manager_dealloc_fifos (s->rx_fifo, s->tx_fifo); + session_free (s); + return rv; + } + } + + return 0; } -/** - * Accept a stream session. Optionally ping the server by callback. - */ int -stream_session_accept (transport_connection_t * tc, u32 listener_index, - u8 notify) +session_dgram_accept (transport_connection_t * tc, u32 listener_index, + u32 thread_index) { - stream_session_t *s, *listener; app_worker_t *app_wrk; - segment_manager_t *sm; + session_t *s; int rv; - /* Find the server */ - listener = listen_session_get (listener_index); - app_wrk = application_listener_select_worker (listener, 0); + s = session_alloc_for_connection (tc); + s->listener_handle = ((u64) thread_index << 32) | (u64) listener_index; - sm = app_worker_get_listen_segment_manager (app_wrk, listener); - if ((rv = session_alloc_and_init (sm, tc, 1, &s))) - return rv; + if ((rv = app_worker_init_accepted (s))) + { + session_free (s); + return rv; + } - s->app_wrk_index = app_wrk->wrk_index; - s->listener_index = listener_index; - s->session_state = SESSION_STATE_ACCEPTING; + session_lookup_add_connection (tc, session_handle (s)); + session_set_state (s, SESSION_STATE_ACCEPTING); - /* Shoulder-tap the server */ - if (notify) + app_wrk = app_worker_get (s->app_wrk_index); + if ((rv = app_worker_accept_notify (app_wrk, s))) { - application_t *app = application_get (app_wrk->app_index); - app->cb_fns.session_accept_callback (s); + session_lookup_del_session (s); + segment_manager_dealloc_fifos (s->rx_fifo, s->tx_fifo); + session_free (s); + return rv; } return 0; } int -session_open_cl (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque) +session_open_cl (session_endpoint_cfg_t *rmt, session_handle_t *rsh) { transport_connection_t *tc; - transport_endpoint_t *tep; - segment_manager_t *sm; + transport_endpoint_cfg_t *tep; app_worker_t *app_wrk; - stream_session_t *s; - application_t *app; + session_handle_t sh; + session_t *s; int rv; - tep = session_endpoint_to_transport (rmt); - rv = tp_vfts[rmt->transport_proto].open (tep); + tep = session_endpoint_to_transport_cfg (rmt); + rv = transport_connect (rmt->transport_proto, tep); if (rv < 0) { SESSION_DBG ("Transport failed to open connection."); - return VNET_API_ERROR_SESSION_CONNECT; + return rv; } - tc = tp_vfts[rmt->transport_proto].get_half_open ((u32) rv); - - /* For dgram type of service, allocate session and fifos now. - */ - app_wrk = app_worker_get (app_wrk_index); - sm = app_worker_get_connect_segment_manager (app_wrk); + tc = transport_get_half_open (rmt->transport_proto, (u32) rv); - if (session_alloc_and_init (sm, tc, 1, &s)) - return -1; + /* For dgram type of service, allocate session and fifos now */ + app_wrk = app_worker_get (rmt->app_wrk_index); + s = session_alloc_for_connection (tc); s->app_wrk_index = app_wrk->wrk_index; - s->session_state = SESSION_STATE_OPENED; + session_set_state (s, SESSION_STATE_OPENED); + if (app_worker_init_connected (app_wrk, s)) + { + session_free (s); + return -1; + } - /* Tell the app about the new event fifo for this session */ - app = application_get (app_wrk->app_index); - app->cb_fns.session_connected_callback (app_wrk->wrk_index, opaque, s, 0); + sh = session_handle (s); + *rsh = sh; - return 0; + session_lookup_add_connection (tc, sh); + return app_worker_connect_notify (app_wrk, s, SESSION_E_NONE, rmt->opaque); } int -session_open_vc (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque) +session_open_vc (session_endpoint_cfg_t *rmt, session_handle_t *rsh) { transport_connection_t *tc; - transport_endpoint_t *tep; - u64 handle; + transport_endpoint_cfg_t *tep; + app_worker_t *app_wrk; + session_t *ho; int rv; - tep = session_endpoint_to_transport (rmt); - rv = tp_vfts[rmt->transport_proto].open (tep); + tep = session_endpoint_to_transport_cfg (rmt); + rv = transport_connect (rmt->transport_proto, tep); if (rv < 0) { SESSION_DBG ("Transport failed to open connection."); - return VNET_API_ERROR_SESSION_CONNECT; + return rv; } - tc = tp_vfts[rmt->transport_proto].get_half_open ((u32) rv); + tc = transport_get_half_open (rmt->transport_proto, (u32) rv); - /* If transport offers a stream service, only allocate session once the - * connection has been established. - * Add connection to half-open table and save app and tc index. The - * latter is needed to help establish the connection while the former - * is needed when the connect notify comes and we have to notify the - * external app - */ - handle = (((u64) app_wrk_index) << 32) | (u64) tc->c_index; - session_lookup_add_half_open (tc, handle); + app_wrk = app_worker_get (rmt->app_wrk_index); - /* Store api_context (opaque) for when the reply comes. Not the nicest - * thing but better than allocating a separate half-open pool. + /* If transport offers a vc service, only allocate established + * session once the connection has been established. + * In the meantime allocate half-open session for tracking purposes + * associate half-open connection to it and add session to app-worker + * half-open table. These are needed to allocate the established + * session on transport notification, and to cleanup the half-open + * session if the app detaches before connection establishment. */ - tc->s_index = opaque; + ho = session_alloc_for_half_open (tc); + ho->app_wrk_index = app_wrk->wrk_index; + ho->ho_index = app_worker_add_half_open (app_wrk, session_handle (ho)); + ho->opaque = rmt->opaque; + *rsh = session_handle (ho); + + if (!(tc->flags & TRANSPORT_CONNECTION_F_NO_LOOKUP)) + session_lookup_add_half_open (tc, tc->c_index); + return 0; } int -session_open_app (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque) +session_open_app (session_endpoint_cfg_t *rmt, session_handle_t *rsh) { - session_endpoint_extended_t *sep = (session_endpoint_extended_t *) rmt; - sep->app_wrk_index = app_wrk_index; - sep->opaque = opaque; + transport_endpoint_cfg_t *tep_cfg = session_endpoint_to_transport_cfg (rmt); - return tp_vfts[rmt->transport_proto].open ((transport_endpoint_t *) sep); + /* Not supported for now */ + *rsh = SESSION_INVALID_HANDLE; + return transport_connect (rmt->transport_proto, tep_cfg); } -typedef int (*session_open_service_fn) (u32, session_endpoint_t *, u32); +typedef int (*session_open_service_fn) (session_endpoint_cfg_t *, + session_handle_t *); /* *INDENT-OFF* */ static session_open_service_fn session_open_srv_fns[TRANSPORT_N_SERVICES] = { @@ -956,10 +1436,11 @@ static session_open_service_fn session_open_srv_fns[TRANSPORT_N_SERVICES] = { * on open completion. */ int -session_open (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque) +session_open (session_endpoint_cfg_t *rmt, session_handle_t *rsh) { - transport_service_type_t tst = tp_vfts[rmt->transport_proto].service_type; - return session_open_srv_fns[tst] (app_wrk_index, rmt, opaque); + transport_service_type_t tst; + tst = transport_protocol_service_type (rmt->transport_proto); + return session_open_srv_fns[tst](rmt, rsh); } /** @@ -971,27 +1452,27 @@ session_open (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque) * @param sep Local endpoint to be listened on. */ int -session_listen (stream_session_t * ls, session_endpoint_extended_t * sep) +session_listen (session_t * ls, session_endpoint_cfg_t * sep) { - transport_connection_t *tc; - transport_endpoint_t *tep; - u32 tc_index, s_index; + transport_endpoint_cfg_t *tep; + int tc_index; + u32 s_index; /* Transport bind/listen */ - tep = session_endpoint_to_transport (sep); + tep = session_endpoint_to_transport_cfg (sep); s_index = ls->session_index; - tc_index = tp_vfts[sep->transport_proto].bind (s_index, tep); + tc_index = transport_start_listen (session_get_transport_proto (ls), + s_index, tep); - if (tc_index == (u32) ~ 0) - return -1; + if (tc_index < 0) + return tc_index; - /* Attach transport to session */ + /* Attach transport to session. Lookup tables are populated by the app + * worker because local tables (for ct sessions) are not backed by a fib */ ls = listen_session_get (s_index); ls->connection_index = tc_index; + ls->opaque = sep->opaque; - /* Add to the main lookup table after transport was initialized */ - tc = tp_vfts[sep->transport_proto].get_listener (tc_index); - session_lookup_add_connection (tc, s_index); return 0; } @@ -1001,67 +1482,105 @@ session_listen (stream_session_t * ls, session_endpoint_extended_t * sep) * @param s Session to stop listening on. It must be in state LISTENING. */ int -session_stop_listen (stream_session_t * s) +session_stop_listen (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; - } + return SESSION_E_NOLISTEN; + + tc = transport_get_listener (tp, s->connection_index); - tc = tp_vfts[tp].get_listener (s->connection_index); + /* If no transport, assume everything was cleaned up already */ if (!tc) - { - clib_warning ("no transport"); - return VNET_API_ERROR_ADDRESS_NOT_IN_USE; - } + return SESSION_E_NONE; - session_lookup_del_connection (tc); - tp_vfts[tp].unbind (s->connection_index); + if (!(tc->flags & TRANSPORT_CONNECTION_F_NO_LOOKUP)) + session_lookup_del_connection (tc); + + transport_stop_listen (tp, s->connection_index); return 0; } /** - * Initialize session disconnect. + * Initialize session half-closing procedure. + * + * Note that half-closing will not change the state of the session. + */ +void +session_half_close (session_t *s) +{ + if (!s) + return; + + session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_HALF_CLOSE); +} + +/** + * Initialize session closing procedure. * * 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) +session_close (session_t * s) { - u32 thread_index = vlib_get_thread_index (); - session_manager_main_t *smm = &session_manager_main; - session_event_t *evt; - if (!s) return; if (s->session_state >= SESSION_STATE_CLOSING) { - /* Session already closed. Clear the tx fifo */ - if (s->session_state == SESSION_STATE_CLOSED) - svm_fifo_dequeue_drop_all (s->server_tx_fifo); + /* Session will only be removed once both app and transport + * acknowledge the close */ + if (s->session_state == SESSION_STATE_TRANSPORT_CLOSED + || s->session_state == SESSION_STATE_TRANSPORT_DELETED) + session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_CLOSE); return; } - s->session_state = SESSION_STATE_CLOSING; + /* App closed so stop propagating dequeue notifications. + * App might disconnect session before connected, in this case, + * tx_fifo may not be setup yet, so clear only it's inited. */ + if (s->tx_fifo) + svm_fifo_clear_deq_ntf (s->tx_fifo); + session_set_state (s, SESSION_STATE_CLOSING); + session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_CLOSE); +} - /* If we are in the handler thread, or being called with the worker barrier - * held (api/cli), just append a new event to pending disconnects vector. */ - if ((thread_index == 0 && !vlib_get_current_process (vlib_get_main ())) - || thread_index == s->thread_index) +/** + * Force a close without waiting for data to be flushed + */ +void +session_reset (session_t * s) +{ + if (s->session_state >= SESSION_STATE_CLOSING) + return; + /* Drop all outstanding tx data + * App might disconnect session before connected, in this case, + * tx_fifo may not be setup yet, so clear only it's inited. */ + if (s->tx_fifo) + svm_fifo_dequeue_drop_all (s->tx_fifo); + session_set_state (s, SESSION_STATE_CLOSING); + session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_RESET); +} + +/** + * Notify transport the session can be half-disconnected. + * + * Must be called from the session's thread. + */ +void +session_transport_half_close (session_t *s) +{ + /* Only READY session can be half-closed */ + if (s->session_state != SESSION_STATE_READY) { - ASSERT (s->thread_index == thread_index || thread_index == 0); - vec_add2 (smm->pending_disconnects[s->thread_index], evt, 1); - memset (evt, 0, sizeof (*evt)); - evt->session_handle = session_handle (s); - evt->event_type = FIFO_EVENT_DISCONNECT; + return; } - else - session_send_ctrl_evt_to_thread (s, FIFO_EVENT_DISCONNECT); + + transport_half_close (session_get_transport_proto (s), s->connection_index, + s->thread_index); } /** @@ -1072,11 +1591,48 @@ stream_session_disconnect (stream_session_t * s) * Must be called from the session's thread. */ void -stream_session_disconnect_transport (stream_session_t * s) +session_transport_close (session_t * s) +{ + if (s->session_state >= SESSION_STATE_APP_CLOSED) + { + if (s->session_state == SESSION_STATE_TRANSPORT_CLOSED) + session_set_state (s, SESSION_STATE_CLOSED); + /* If transport is already deleted, just free the session */ + else if (s->session_state >= SESSION_STATE_TRANSPORT_DELETED) + session_free_w_fifos (s); + return; + } + + /* If the tx queue wasn't drained, the transport can continue to try + * sending the outstanding data (in closed state it cannot). It MUST however + * at one point, either after sending everything or after a timeout, call + * delete notify. This will finally lead to the complete cleanup of the + * session. + */ + session_set_state (s, SESSION_STATE_APP_CLOSED); + + transport_close (session_get_transport_proto (s), s->connection_index, + s->thread_index); +} + +/** + * Force transport close + */ +void +session_transport_reset (session_t * s) { - s->session_state = SESSION_STATE_CLOSED; - tp_vfts[session_get_transport_proto (s)].close (s->connection_index, - s->thread_index); + if (s->session_state >= SESSION_STATE_APP_CLOSED) + { + if (s->session_state == SESSION_STATE_TRANSPORT_CLOSED) + session_set_state (s, SESSION_STATE_CLOSED); + else if (s->session_state >= SESSION_STATE_TRANSPORT_DELETED) + session_free_w_fifos (s); + return; + } + + session_set_state (s, SESSION_STATE_APP_CLOSED); + transport_reset (session_get_transport_proto (s), s->connection_index, + s->thread_index); } /** @@ -1087,123 +1643,90 @@ stream_session_disconnect_transport (stream_session_t * s) * closed. */ void -stream_session_cleanup (stream_session_t * s) +session_transport_cleanup (session_t * s) { - s->session_state = SESSION_STATE_CLOSED; - /* Delete from main lookup table before we axe the the transport */ session_lookup_del_session (s); - tp_vfts[session_get_transport_proto (s)].cleanup (s->connection_index, - s->thread_index); + if (s->session_state != SESSION_STATE_TRANSPORT_DELETED) + transport_cleanup (session_get_transport_proto (s), s->connection_index, + s->thread_index); /* Since we called cleanup, no delete notification will come. So, make * sure the session is properly freed. */ - segment_manager_dealloc_fifos (s->svm_segment_index, s->server_rx_fifo, - s->server_tx_fifo); + segment_manager_dealloc_fifos (s->rx_fifo, s->tx_fifo); session_free (s); } -transport_service_type_t -session_transport_service_type (stream_session_t * s) -{ - transport_proto_t tp; - tp = session_get_transport_proto (s); - return transport_protocol_service_type (tp); -} - -transport_tx_fn_type_t -session_transport_tx_fn_type (stream_session_t * s) -{ - transport_proto_t tp; - tp = session_get_transport_proto (s); - return transport_protocol_tx_fn_type (tp); -} - -u8 -session_tx_is_dgram (stream_session_t * s) -{ - return (session_transport_tx_fn_type (s) == TRANSPORT_TX_DGRAM); -} - /** - * Allocate event queues in the shared-memory segment + * Allocate worker mqs in share-able 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. + * That can only be a newly created memfd segment, that must be mapped + * by all apps/stack users unless private rx mqs are enabled. */ void -session_vpp_event_queues_allocate (session_manager_main_t * smm) -{ - u32 evt_q_length = 2048, evt_size = sizeof (session_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; +session_vpp_wrk_mqs_alloc (session_main_t *smm) +{ + u32 mq_q_length = 2048, evt_size = sizeof (session_event_t); + fifo_segment_t *mqs_seg = &smm->wrk_mqs_segment; + svm_msg_q_cfg_t _cfg, *cfg = &_cfg; + uword mqs_seg_size; int i; - if (smm->configured_event_queue_length) - evt_q_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; + mq_q_length = clib_max (mq_q_length, smm->configured_wrk_mq_length); - 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_msg_q_ring_cfg_t rc[SESSION_MQ_N_RINGS] = { + { mq_q_length, evt_size, 0 }, { mq_q_length >> 1, 256, 0 } + }; + cfg->consumer_pid = 0; + cfg->n_rings = 2; + cfg->q_nitems = mq_q_length; + cfg->ring_cfgs = rc; - if (ssvm_master_init (eqs, SSVM_SEGMENT_MEMFD)) - { - clib_warning ("failed to initialize queue segment"); - return; - } - } + /* + * Compute mqs segment size based on rings config and leave space + * for passing extended configuration messages, i.e., data allocated + * outside of the rings. If provided with a config value, accept it + * if larger than minimum size. + */ + mqs_seg_size = svm_msg_q_size_to_alloc (cfg) * vec_len (smm->wrk); + mqs_seg_size = mqs_seg_size + (1 << 20); + mqs_seg_size = clib_max (mqs_seg_size, smm->wrk_mqs_segment_size); - if (smm->evt_qs_use_memfd_seg) - oldheap = ssvm_push_heap (eqs->sh); - else - oldheap = svm_push_data_heap (am->vlib_rp); + mqs_seg->ssvm.ssvm_size = mqs_seg_size; + mqs_seg->ssvm.my_pid = getpid (); + mqs_seg->ssvm.name = format (0, "%s%c", "session: wrk-mqs-segment", 0); - for (i = 0; i < vec_len (smm->vpp_event_queues); i++) + if (ssvm_server_init (&mqs_seg->ssvm, SSVM_SEGMENT_MEMFD)) { - svm_msg_q_cfg_t _cfg, *cfg = &_cfg; - u32 notif_q_size = clib_max (16, evt_q_length >> 4); - svm_msg_q_ring_cfg_t rc[SESSION_MQ_N_RINGS] = { - {evt_q_length, evt_size, 0} - , - {notif_q_size, 256, 0} - }; - cfg->consumer_pid = 0; - cfg->n_rings = 2; - cfg->q_nitems = evt_q_length; - cfg->ring_cfgs = rc; - smm->vpp_event_queues[i] = svm_msg_q_alloc (cfg); - if (smm->evt_qs_use_memfd_seg) - { - if (svm_msg_q_alloc_consumer_eventfd (smm->vpp_event_queues[i])) - clib_warning ("eventfd returned"); - } + clib_warning ("failed to initialize queue segment"); + return; } - if (smm->evt_qs_use_memfd_seg) - ssvm_pop_heap (oldheap); - else - svm_pop_heap (oldheap); + fifo_segment_init (mqs_seg); + + /* Special fifo segment that's filled only with mqs */ + mqs_seg->h->n_mqs = vec_len (smm->wrk); + + for (i = 0; i < vec_len (smm->wrk); i++) + smm->wrk[i].vpp_event_queue = fifo_segment_msg_q_alloc (mqs_seg, i, cfg); } -ssvm_private_t * -session_manager_get_evt_q_segment (void) +fifo_segment_t * +session_main_get_wrk_mqs_segment (void) { - session_manager_main_t *smm = &session_manager_main; - if (smm->evt_qs_use_memfd_seg) - return &smm->evt_qs_segment; - return 0; + return &session_main.wrk_mqs_segment; +} + +u64 +session_segment_handle (session_t * s) +{ + svm_fifo_t *f; + + if (!s->rx_fifo) + return SESSION_INVALID_HANDLE; + + f = s->rx_fifo; + return segment_manager_make_segment_handle (f->segment_manager, + f->segment_index); } /* *INDENT-OFF* */ @@ -1215,18 +1738,12 @@ static session_fifo_rx_fn *session_tx_fns[TRANSPORT_TX_N_FNS] = { }; /* *INDENT-ON* */ -/** - * 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_main_t *smm = &session_main; session_type_t session_type; u32 next_index = ~0; @@ -1235,131 +1752,206 @@ session_register_transport (transport_proto_t transport_proto, vec_validate (smm->session_type_to_next, session_type); vec_validate (smm->session_tx_fns, session_type); - /* *INDENT-OFF* */ if (output_node != ~0) + next_index = vlib_node_add_next (vlib_get_main (), + session_queue_node.index, output_node); + + smm->session_type_to_next[session_type] = next_index; + smm->session_tx_fns[session_type] = + session_tx_fns[vft->transport_options.tx_type]; +} + +void +session_register_update_time_fn (session_update_time_fn fn, u8 is_add) +{ + session_main_t *smm = &session_main; + session_update_time_fn *fi; + u32 fi_pos = ~0; + u8 found = 0; + + vec_foreach (fi, smm->update_time_fns) { - foreach_vlib_main (({ - next_index = vlib_node_add_next (this_vlib_main, - session_queue_node.index, - output_node); - })); + if (*fi == fn) + { + fi_pos = fi - smm->update_time_fns; + found = 1; + break; + } } - /* *INDENT-ON* */ - smm->session_type_to_next[session_type] = next_index; - smm->session_tx_fns[session_type] = session_tx_fns[vft->tx_type]; + if (is_add) + { + if (found) + { + clib_warning ("update time fn %p already registered", fn); + return; + } + vec_add1 (smm->update_time_fns, fn); + } + else + { + vec_del1 (smm->update_time_fns, fi_pos); + } } -transport_connection_t * -session_get_transport (stream_session_t * s) +transport_proto_t +session_add_transport_proto (void) { - transport_proto_t tp; - if (s->session_state != SESSION_STATE_LISTENING) + session_main_t *smm = &session_main; + session_worker_t *wrk; + u32 thread; + + smm->last_transport_proto_type += 1; + + for (thread = 0; thread < vec_len (smm->wrk); thread++) { - tp = session_get_transport_proto (s); - return tp_vfts[tp].get_connection (s->connection_index, - s->thread_index); + wrk = session_main_get_worker (thread); + vec_validate (wrk->session_to_enqueue, smm->last_transport_proto_type); } - return 0; + + return smm->last_transport_proto_type; } transport_connection_t * -listen_session_get_transport (stream_session_t * s) +session_get_transport (session_t * s) { - transport_proto_t tp = session_get_transport_proto (s); - return tp_vfts[tp].get_listener (s->connection_index); + if (s->session_state != SESSION_STATE_LISTENING) + return transport_get_connection (session_get_transport_proto (s), + s->connection_index, s->thread_index); + else + return transport_get_listener (session_get_transport_proto (s), + s->connection_index); +} + +void +session_get_endpoint (session_t * s, transport_endpoint_t * tep, u8 is_lcl) +{ + if (s->session_state != SESSION_STATE_LISTENING) + return transport_get_endpoint (session_get_transport_proto (s), + s->connection_index, s->thread_index, tep, + is_lcl); + else + return transport_get_listener_endpoint (session_get_transport_proto (s), + s->connection_index, tep, is_lcl); } int -listen_session_get_local_session_endpoint (stream_session_t * listener, - session_endpoint_t * sep) +session_transport_attribute (session_t *s, u8 is_get, + transport_endpt_attr_t *attr) { - transport_proto_t tp = session_get_transport_proto (listener); - transport_connection_t *tc; - tc = tp_vfts[tp].get_listener (listener->connection_index); - if (!tc) - { - clib_warning ("no transport"); - return -1; - } + if (s->session_state < SESSION_STATE_READY) + return -1; - /* N.B. The ip should not be copied because this is the local endpoint */ - sep->port = tc->lcl_port; - sep->transport_proto = tc->proto; - sep->is_ip4 = tc->is_ip4; - return 0; + return transport_connection_attribute (session_get_transport_proto (s), + s->connection_index, s->thread_index, + is_get, attr); +} + +transport_connection_t * +listen_session_get_transport (session_t * s) +{ + return transport_get_listener (session_get_transport_proto (s), + s->connection_index); } void -session_flush_frames_main_thread (vlib_main_t * vm) +session_queue_run_on_main_thread (vlib_main_t * vm) { ASSERT (vlib_get_thread_index () == 0); - vlib_process_signal_event_mt (vm, session_queue_process_node.index, - SESSION_Q_PROCESS_FLUSH_FRAMES, 0); + vlib_node_set_interrupt_pending (vm, session_queue_node.index); +} + +static void +session_stats_collector_fn (vlib_stats_collector_data_t *d) +{ + u32 i, n_workers, n_wrk_sessions, n_sessions = 0; + session_main_t *smm = &session_main; + session_worker_t *wrk; + counter_t **counters; + counter_t *cb; + + n_workers = vec_len (smm->wrk); + vlib_stats_validate (d->entry_index, 0, n_workers - 1); + counters = d->entry->data; + cb = counters[0]; + + for (i = 0; i < vec_len (smm->wrk); i++) + { + wrk = session_main_get_worker (i); + n_wrk_sessions = pool_elts (wrk->sessions); + cb[i] = n_wrk_sessions; + n_sessions += n_wrk_sessions; + } + + vlib_stats_set_gauge (d->private_data, n_sessions); +} + +static void +session_stats_collector_init (void) +{ + vlib_stats_collector_reg_t reg = {}; + + reg.entry_index = + vlib_stats_add_counter_vector ("/sys/session/sessions_per_worker"); + reg.private_data = vlib_stats_add_gauge ("/sys/session/sessions_total"); + reg.collect_fn = session_stats_collector_fn; + vlib_stats_register_collector_fn (®); + vlib_stats_validate (reg.entry_index, 0, vlib_get_n_threads ()); } 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; + session_main_t *smm = &session_main; vlib_thread_main_t *vtm = vlib_get_thread_main (); u32 num_threads, preallocated_sessions_per_worker; - int i, j; + session_worker_t *wrk; + int i; + + /* We only initialize once and do not de-initialized on disable */ + if (smm->is_initialized) + goto done; num_threads = 1 /* main thread */ + vtm->n_threads; if (num_threads < 1) return clib_error_return (0, "n_thread_stacks not set"); - /* configure per-thread ** vectors */ - vec_validate (smm->sessions, num_threads - 1); - vec_validate (smm->tx_buffers, num_threads - 1); - vec_validate (smm->pending_event_vector, num_threads - 1); - 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->peekers_rw_locks, num_threads - 1); - vec_validate_aligned (smm->ctx, num_threads - 1, CLIB_CACHE_LINE_BYTES); - - for (i = 0; i < TRANSPORT_N_PROTO; i++) - { - vec_validate (smm->current_enqueue_epoch[i], num_threads - 1); - vec_validate (smm->session_to_enqueue[i], num_threads - 1); - for (j = 0; j < num_threads; j++) - smm->current_enqueue_epoch[i][j] = 1; - } + /* Allocate cache line aligned worker contexts */ + vec_validate_aligned (smm->wrk, num_threads - 1, CLIB_CACHE_LINE_BYTES); + clib_spinlock_init (&session_main.pool_realloc_lock); for (i = 0; i < num_threads; i++) { - vec_validate (smm->free_event_vector[i], 0); - _vec_len (smm->free_event_vector[i]) = 0; - vec_validate (smm->pending_event_vector[i], 0); - _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_rwlock_init (&smm->peekers_rw_locks[i]); + wrk = &smm->wrk[i]; + wrk->ctrl_head = clib_llist_make_head (wrk->event_elts, evt_list); + wrk->new_head = clib_llist_make_head (wrk->event_elts, evt_list); + wrk->old_head = clib_llist_make_head (wrk->event_elts, evt_list); + wrk->pending_connects = clib_llist_make_head (wrk->event_elts, evt_list); + wrk->evts_pending_main = + clib_llist_make_head (wrk->event_elts, evt_list); + wrk->vm = vlib_get_main_by_index (i); + wrk->last_vlib_time = vlib_time_now (vm); + wrk->last_vlib_us_time = wrk->last_vlib_time * CLIB_US_TIME_FREQ; + wrk->timerfd = -1; + vec_validate (wrk->session_to_enqueue, smm->last_transport_proto_type); + + if (!smm->no_adaptive && smm->use_private_rx_mqs) + session_wrk_enable_adaptive_mode (wrk); } -#if SESSION_DEBUG - vec_validate (smm->last_event_poll_by_thread, num_threads - 1); -#endif - /* Allocate vpp event queues segment and queue */ - session_vpp_event_queues_allocate (smm); + session_vpp_wrk_mqs_alloc (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); + /* Initialize segment manager properties */ + segment_manager_main_init (); /* Preallocate sessions */ if (smm->preallocated_sessions) { if (num_threads == 1) { - pool_init_fixed (smm->sessions[0], smm->preallocated_sessions); + pool_init_fixed (smm->wrk[0].sessions, smm->preallocated_sessions); } else { @@ -1370,7 +1962,7 @@ session_manager_main_enable (vlib_main_t * vm) for (j = 1; j < num_threads; j++) { - pool_init_fixed (smm->sessions[j], + pool_init_fixed (smm->wrk[j].sessions, preallocated_sessions_per_worker); } } @@ -1379,47 +1971,149 @@ session_manager_main_enable (vlib_main_t * vm) session_lookup_init (); app_namespaces_init (); transport_init (); + session_stats_collector_init (); + smm->is_initialized = 1; + +done: smm->is_enabled = 1; /* Enable transports */ transport_enable_disable (vm, 1); + session_debug_init (); return 0; } +static void +session_manager_main_disable (vlib_main_t * vm) +{ + transport_enable_disable (vm, 0 /* is_en */ ); +} + +/* in this new callback, cookie hint the index */ +void +session_dma_completion_cb (vlib_main_t *vm, struct vlib_dma_batch *batch) +{ + session_worker_t *wrk; + wrk = session_main_get_worker (vm->thread_index); + session_dma_transfer *dma_transfer; + + dma_transfer = &wrk->dma_trans[wrk->trans_head]; + vec_add (wrk->pending_tx_buffers, dma_transfer->pending_tx_buffers, + vec_len (dma_transfer->pending_tx_buffers)); + vec_add (wrk->pending_tx_nexts, dma_transfer->pending_tx_nexts, + vec_len (dma_transfer->pending_tx_nexts)); + vec_reset_length (dma_transfer->pending_tx_buffers); + vec_reset_length (dma_transfer->pending_tx_nexts); + wrk->trans_head++; + if (wrk->trans_head == wrk->trans_size) + wrk->trans_head = 0; + return; +} + +static void +session_prepare_dma_args (vlib_dma_config_t *args) +{ + args->max_transfers = DMA_TRANS_SIZE; + args->max_transfer_size = 65536; + args->features = 0; + args->sw_fallback = 1; + args->barrier_before_last = 1; + args->callback_fn = session_dma_completion_cb; +} + +static void +session_node_enable_dma (u8 is_en, int n_vlibs) +{ + vlib_dma_config_t args; + session_prepare_dma_args (&args); + session_worker_t *wrk; + vlib_main_t *vm; + + int config_index = -1; + + if (is_en) + { + vm = vlib_get_main_by_index (0); + config_index = vlib_dma_config_add (vm, &args); + } + else + { + vm = vlib_get_main_by_index (0); + wrk = session_main_get_worker (0); + if (wrk->config_index >= 0) + vlib_dma_config_del (vm, wrk->config_index); + } + int i; + for (i = 0; i < n_vlibs; i++) + { + vm = vlib_get_main_by_index (i); + wrk = session_main_get_worker (vm->thread_index); + wrk->config_index = config_index; + if (is_en) + { + if (config_index >= 0) + wrk->dma_enabled = true; + wrk->dma_trans = (session_dma_transfer *) clib_mem_alloc ( + sizeof (session_dma_transfer) * DMA_TRANS_SIZE); + bzero (wrk->dma_trans, + sizeof (session_dma_transfer) * DMA_TRANS_SIZE); + } + else + { + if (wrk->dma_trans) + clib_mem_free (wrk->dma_trans); + } + wrk->trans_head = 0; + wrk->trans_tail = 0; + wrk->trans_size = DMA_TRANS_SIZE; + } +} + void session_node_enable_disable (u8 is_en) { + u8 mstate = is_en ? VLIB_NODE_STATE_INTERRUPT : VLIB_NODE_STATE_DISABLED; u8 state = is_en ? VLIB_NODE_STATE_POLLING : VLIB_NODE_STATE_DISABLED; - vlib_thread_main_t *vtm = vlib_get_thread_main (); - u8 have_workers = vtm->n_threads != 0; - - /* *INDENT-OFF* */ - foreach_vlib_main (({ - if (have_workers && ii == 0) - { - vlib_node_set_state (this_vlib_main, session_queue_process_node.index, - state); - if (is_en) - { - vlib_node_t *n = vlib_get_node (this_vlib_main, - session_queue_process_node.index); - vlib_start_process (this_vlib_main, n->runtime_index); - } - else - { - vlib_process_signal_event_mt (this_vlib_main, - session_queue_process_node.index, - SESSION_Q_PROCESS_STOP, 0); - } + session_main_t *sm = &session_main; + vlib_main_t *vm; + vlib_node_t *n; + int n_vlibs, i; - continue; - } - vlib_node_set_state (this_vlib_main, session_queue_node.index, - state); - })); - /* *INDENT-ON* */ + n_vlibs = vlib_get_n_threads (); + for (i = 0; i < n_vlibs; i++) + { + vm = vlib_get_main_by_index (i); + /* main thread with workers and not polling */ + if (i == 0 && n_vlibs > 1) + { + vlib_node_set_state (vm, session_queue_node.index, mstate); + if (is_en) + { + session_main_get_worker (0)->state = SESSION_WRK_INTERRUPT; + vlib_node_set_state (vm, session_queue_process_node.index, + state); + n = vlib_get_node (vm, session_queue_process_node.index); + vlib_start_process (vm, n->runtime_index); + } + else + { + vlib_process_signal_event_mt (vm, + session_queue_process_node.index, + SESSION_Q_PROCESS_STOP, 0); + } + if (!sm->poll_main) + continue; + } + vlib_node_set_state (vm, session_queue_node.index, state); + } + + if (sm->use_private_rx_mqs) + application_enable_rx_mqs_nodes (is_en); + + if (sm->dma_enabled) + session_node_enable_dma (is_en, n_vlibs); } clib_error_t * @@ -1428,15 +2122,16 @@ vnet_session_enable_disable (vlib_main_t * vm, u8 is_en) clib_error_t *error = 0; if (is_en) { - if (session_manager_main.is_enabled) + if (session_main.is_enabled) return 0; - session_node_enable_disable (is_en); error = session_manager_main_enable (vm); + session_node_enable_disable (is_en); } else { - session_manager_main.is_enabled = 0; + session_main.is_enabled = 0; + session_manager_main_disable (vm); session_node_enable_disable (is_en); } @@ -1444,34 +2139,55 @@ vnet_session_enable_disable (vlib_main_t * vm, u8 is_en) } clib_error_t * -session_manager_main_init (vlib_main_t * vm) +session_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; + session_main_t *smm = &session_main; + smm->is_enabled = 0; + smm->session_enable_asap = 0; + smm->poll_main = 0; + smm->use_private_rx_mqs = 0; + smm->no_adaptive = 0; + smm->last_transport_proto_type = TRANSPORT_PROTO_HTTP; + return 0; } -VLIB_INIT_FUNCTION (session_manager_main_init); +static clib_error_t * +session_main_loop_init (vlib_main_t * vm) +{ + session_main_t *smm = &session_main; + if (smm->session_enable_asap) + { + vlib_worker_thread_barrier_sync (vm); + vnet_session_enable_disable (vm, 1 /* is_en */ ); + vlib_worker_thread_barrier_release (vm); + } + return 0; +} + +VLIB_INIT_FUNCTION (session_main_init); +VLIB_MAIN_LOOP_ENTER_FUNCTION (session_main_loop_init); static clib_error_t * session_config_fn (vlib_main_t * vm, unformat_input_t * input) { - session_manager_main_t *smm = &session_manager_main; + session_main_t *smm = &session_main; u32 nitems; uword tmp; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) { - if (unformat (input, "event-queue-length %d", &nitems)) + if (unformat (input, "wrk-mq-length %d", &nitems)) { if (nitems >= 2048) - smm->configured_event_queue_length = nitems; + smm->configured_wrk_mq_length = nitems; else clib_warning ("event queue length %d too small, ignored", nitems); } + else if (unformat (input, "wrk-mqs-segment-size %U", + unformat_memory_size, &smm->wrk_mqs_segment_size)) + ; else if (unformat (input, "preallocated-sessions %d", &smm->preallocated_sessions)) ; @@ -1530,8 +2246,35 @@ session_config_fn (vlib_main_t * vm, unformat_input_t * input) else if (unformat (input, "local-endpoints-table-buckets %d", &smm->local_endpoints_table_buckets)) ; + else if (unformat (input, "enable")) + smm->session_enable_asap = 1; + else if (unformat (input, "use-app-socket-api")) + (void) appns_sapi_enable_disable (1 /* is_enable */); + else if (unformat (input, "poll-main")) + smm->poll_main = 1; + else if (unformat (input, "use-private-rx-mqs")) + smm->use_private_rx_mqs = 1; + else if (unformat (input, "no-adaptive")) + smm->no_adaptive = 1; + else if (unformat (input, "use-dma")) + smm->dma_enabled = 1; + /* + * Deprecated but maintained for compatibility + */ else if (unformat (input, "evt_qs_memfd_seg")) - smm->evt_qs_use_memfd_seg = 1; + ; + else if (unformat (input, "segment-baseva 0x%lx", &tmp)) + ; + else if (unformat (input, "evt_qs_seg_size %U", unformat_memory_size, + &smm->wrk_mqs_segment_size)) + ; + else if (unformat (input, "event-queue-length %d", &nitems)) + { + if (nitems >= 2048) + smm->configured_wrk_mq_length = nitems; + else + clib_warning ("event queue length %d too small, ignored", nitems); + } else return clib_error_return (0, "unknown input `%U'", format_unformat_error, input);