X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession.c;h=069818ef1beceda200c5f1e926626f51284df8d7;hb=61ae056bd;hp=d17c93f8f69d132d71e7280c323f7d19b6f6d287;hpb=a5464817522c7a7dc760af4612f1d6a68ed0afc8;p=vpp.git diff --git a/src/vnet/session/session.c b/src/vnet/session/session.c index d17c93f8f69..d27d1bbab23 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,552 +18,687 @@ */ #include -#include +#include #include #include -#include -#include -#include - -/** - * Per-type vector of transport protocol virtual function tables - */ -static transport_proto_vft_t *tp_vfts; -session_manager_main_t session_manager_main; +session_main_t session_main; -/* - * Session lookup key; (src-ip, dst-ip, src-port, dst-port, session-type) - * Value: (owner thread index << 32 | session_index); - */ -void -stream_session_table_add_for_tc (transport_connection_t * tc, u64 value) +static inline int +session_send_evt_to_thread (void *data, void *args, u32 thread_index, + session_evt_type_t evt_type) { - session_manager_main_t *smm = &session_manager_main; - session_kv4_t kv4; - session_kv6_t kv6; + session_event_t *evt; + svm_msg_q_msg_t msg; + svm_msg_q_t *mq; - switch (tc->proto) + mq = session_main_get_vpp_event_queue (thread_index); + if (PREDICT_FALSE (svm_msg_q_lock (mq))) + return -1; + if (PREDICT_FALSE (svm_msg_q_is_full (mq) + || svm_msg_q_ring_is_full (mq, SESSION_MQ_IO_EVT_RING))) + { + svm_msg_q_unlock (mq); + return -2; + } + switch (evt_type) { - case SESSION_TYPE_IP4_UDP: - case SESSION_TYPE_IP4_TCP: - make_v4_ss_kv_from_tc (&kv4, tc); - kv4.value = value; - clib_bihash_add_del_16_8 (&smm->v4_session_hash, &kv4, 1 /* is_add */ ); + 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 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 SESSION_TYPE_IP6_UDP: - case SESSION_TYPE_IP6_TCP: - make_v6_ss_kv_from_tc (&kv6, tc); - kv6.value = value; - clib_bihash_add_del_48_8 (&smm->v6_session_hash, &kv6, 1 /* is_add */ ); + 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 ("Session type not supported"); - ASSERT (0); + clib_warning ("evt unhandled!"); + svm_msg_q_unlock (mq); + return -1; } + evt->event_type = evt_type; + + svm_msg_q_add_and_unlock (mq, &msg); + return 0; } -void -stream_session_table_add (session_manager_main_t * smm, stream_session_t * s, - u64 value) +int +session_send_io_evt_to_thread (svm_fifo_t * f, session_evt_type_t evt_type) { - transport_connection_t *tc; - - tc = tp_vfts[s->session_type].get_connection (s->connection_index, - s->thread_index); - stream_session_table_add_for_tc (tc, value); + return session_send_evt_to_thread (&f->master_session_index, 0, + f->master_thread_index, evt_type); } -static void -stream_session_half_open_table_add (session_type_t sst, - transport_connection_t * tc, u64 value) +int +session_send_io_evt_to_thread_custom (void *data, u32 thread_index, + session_evt_type_t evt_type) { - session_manager_main_t *smm = &session_manager_main; - session_kv4_t kv4; - session_kv6_t kv6; - - switch (sst) - { - case SESSION_TYPE_IP4_UDP: - case SESSION_TYPE_IP4_TCP: - make_v4_ss_kv_from_tc (&kv4, tc); - kv4.value = value; - clib_bihash_add_del_16_8 (&smm->v4_half_open_hash, &kv4, - 1 /* is_add */ ); - break; - case SESSION_TYPE_IP6_UDP: - case SESSION_TYPE_IP6_TCP: - make_v6_ss_kv_from_tc (&kv6, tc); - kv6.value = value; - clib_bihash_add_del_48_8 (&smm->v6_half_open_hash, &kv6, - 1 /* is_add */ ); - break; - default: - clib_warning ("Session type not supported"); - ASSERT (0); - } + return session_send_evt_to_thread (data, 0, thread_index, evt_type); } int -stream_session_table_del_for_tc (transport_connection_t * tc) +session_send_ctrl_evt_to_thread (session_t * s, session_evt_type_t evt_type) { - session_manager_main_t *smm = &session_manager_main; - session_kv4_t kv4; - session_kv6_t kv6; - switch (tc->proto) - { - case SESSION_TYPE_IP4_UDP: - case SESSION_TYPE_IP4_TCP: - make_v4_ss_kv_from_tc (&kv4, tc); - return clib_bihash_add_del_16_8 (&smm->v4_session_hash, &kv4, - 0 /* is_add */ ); - break; - case SESSION_TYPE_IP6_UDP: - case SESSION_TYPE_IP6_TCP: - make_v6_ss_kv_from_tc (&kv6, tc); - return clib_bihash_add_del_48_8 (&smm->v6_session_hash, &kv6, - 0 /* is_add */ ); - break; - default: - clib_warning ("Session type not supported"); - ASSERT (0); - } - - return 0; + /* only events supported are disconnect and reset */ + ASSERT (evt_type == SESSION_CTRL_EVT_CLOSE + || evt_type == SESSION_CTRL_EVT_RESET); + return session_send_evt_to_thread (s, 0, s->thread_index, evt_type); } -static int -stream_session_table_del (session_manager_main_t * smm, stream_session_t * s) +void +session_send_rpc_evt_to_thread_force (u32 thread_index, void *fp, + void *rpc_args) { - transport_connection_t *ts; - - ts = tp_vfts[s->session_type].get_connection (s->connection_index, - s->thread_index); - return stream_session_table_del_for_tc (ts); + session_send_evt_to_thread (fp, rpc_args, thread_index, + SESSION_CTRL_EVT_RPC); } -static void -stream_session_half_open_table_del (session_manager_main_t * smm, u8 sst, - transport_connection_t * tc) +void +session_send_rpc_evt_to_thread (u32 thread_index, void *fp, void *rpc_args) { - session_kv4_t kv4; - session_kv6_t kv6; - - switch (sst) + if (thread_index != vlib_get_thread_index ()) + session_send_rpc_evt_to_thread_force (thread_index, fp, rpc_args); + else { - case SESSION_TYPE_IP4_UDP: - case SESSION_TYPE_IP4_TCP: - make_v4_ss_kv_from_tc (&kv4, tc); - clib_bihash_add_del_16_8 (&smm->v4_half_open_hash, &kv4, - 0 /* is_add */ ); - break; - case SESSION_TYPE_IP6_UDP: - case SESSION_TYPE_IP6_TCP: - make_v6_ss_kv_from_tc (&kv6, tc); - clib_bihash_add_del_48_8 (&smm->v6_half_open_hash, &kv6, - 0 /* is_add */ ); - break; - default: - clib_warning ("Session type not supported"); - ASSERT (0); + void (*fnp) (void *) = fp; + fnp (rpc_args); } } -stream_session_t * -stream_session_lookup_listener4 (ip4_address_t * lcl, u16 lcl_port, u8 proto) +void +session_add_self_custom_tx_evt (transport_connection_t * tc, u8 has_prio) { - session_manager_main_t *smm = &session_manager_main; - session_kv4_t kv4; - int rv; + session_t *s; - make_v4_listener_kv (&kv4, lcl, lcl_port, proto); - rv = clib_bihash_search_inline_16_8 (&smm->v4_session_hash, &kv4); - if (rv == 0) - return pool_elt_at_index (smm->listen_sessions[proto], (u32) kv4.value); - - /* Zero out the lcl ip */ - kv4.key[0] = 0; - rv = clib_bihash_search_inline_16_8 (&smm->v4_session_hash, &kv4); - if (rv == 0) - return pool_elt_at_index (smm->listen_sessions[proto], kv4.value); - - return 0; + 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)) + { + s->flags |= SESSION_F_CUSTOM_TX; + if (svm_fifo_set_event (s->tx_fifo) + || transport_connection_is_descheduled (tc)) + { + session_worker_t *wrk; + session_evt_elt_t *elt; + 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; + } + } } -/** Looks up a session based on the 5-tuple passed as argument. - * - * First it tries to find an established session, if this fails, it tries - * finding a listener session if this fails, it tries a lookup with a - * wildcarded local source (listener bound to all interfaces) - */ -stream_session_t * -stream_session_lookup4 (ip4_address_t * lcl, ip4_address_t * rmt, - u16 lcl_port, u16 rmt_port, u8 proto, - u32 my_thread_index) +void +sesssion_reschedule_tx (transport_connection_t * tc) { - session_manager_main_t *smm = &session_manager_main; - session_kv4_t kv4; - int rv; + session_worker_t *wrk = session_main_get_worker (tc->thread_index); + session_evt_elt_t *elt; - /* Lookup session amongst established ones */ - make_v4_ss_kv (&kv4, lcl, rmt, lcl_port, rmt_port, proto); - rv = clib_bihash_search_inline_16_8 (&smm->v4_session_hash, &kv4); - if (rv == 0) - return stream_session_get_tsi (kv4.value, my_thread_index); + ASSERT (tc->thread_index == vlib_get_thread_index ()); - /* If nothing is found, check if any listener is available */ - return stream_session_lookup_listener4 (lcl, lcl_port, proto); + elt = session_evt_alloc_new (wrk); + elt->evt.session_index = tc->s_index; + elt->evt.event_type = SESSION_IO_EVT_TX; } -stream_session_t * -stream_session_lookup_listener6 (ip6_address_t * lcl, u16 lcl_port, u8 proto) +static void +session_program_transport_ctrl_evt (session_t * s, session_evt_type_t evt) { - session_manager_main_t *smm = &session_manager_main; - session_kv6_t kv6; - int rv; - - make_v6_listener_kv (&kv6, lcl, lcl_port, proto); - rv = clib_bihash_search_inline_48_8 (&smm->v6_session_hash, &kv6); - if (rv == 0) - return pool_elt_at_index (smm->listen_sessions[proto], kv6.value); - - /* Zero out the lcl ip */ - kv6.key[0] = kv6.key[1] = 0; - rv = clib_bihash_search_inline_48_8 (&smm->v6_session_hash, &kv6); - if (rv == 0) - return pool_elt_at_index (smm->listen_sessions[proto], kv6.value); + u32 thread_index = vlib_get_thread_index (); + session_evt_elt_t *elt; + session_worker_t *wrk; - return 0; + /* 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) + { + 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; + } + else + session_send_ctrl_evt_to_thread (s, evt); } -/* Looks up a session based on the 5-tuple passed as argument. - * First it tries to find an established session, if this fails, it tries - * finding a listener session if this fails, it tries a lookup with a - * wildcarded local source (listener bound to all interfaces) */ -stream_session_t * -stream_session_lookup6 (ip6_address_t * lcl, ip6_address_t * rmt, - u16 lcl_port, u16 rmt_port, u8 proto, - u32 my_thread_index) +session_t * +session_alloc (u32 thread_index) { - session_manager_main_t *smm = vnet_get_session_manager_main (); - session_kv6_t kv6; - int rv; - - make_v6_ss_kv (&kv6, lcl, rmt, lcl_port, rmt_port, proto); - rv = clib_bihash_search_inline_48_8 (&smm->v6_session_hash, &kv6); - if (rv == 0) - return stream_session_get_tsi (kv6.value, my_thread_index); - - /* If nothing is found, check if any listener is available */ - return stream_session_lookup_listener6 (lcl, lcl_port, proto); + session_worker_t *wrk = &session_main.wrk[thread_index]; + session_t *s; + u8 will_expand = 0; + pool_get_aligned_will_expand (wrk->sessions, will_expand, + CLIB_CACHE_LINE_BYTES); + /* If we have peekers, let them finish */ + if (PREDICT_FALSE (will_expand && vlib_num_workers ())) + { + clib_rwlock_writer_lock (&wrk->peekers_rw_locks); + pool_get_aligned (wrk->sessions, s, CLIB_CACHE_LINE_BYTES); + clib_rwlock_writer_unlock (&wrk->peekers_rw_locks); + } + else + { + pool_get_aligned (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; } -stream_session_t * -stream_session_lookup_listener (ip46_address_t * lcl, u16 lcl_port, u8 proto) +void +session_free (session_t * s) { - switch (proto) + if (CLIB_DEBUG) { - case SESSION_TYPE_IP4_UDP: - case SESSION_TYPE_IP4_TCP: - return stream_session_lookup_listener4 (&lcl->ip4, lcl_port, proto); - break; - case SESSION_TYPE_IP6_UDP: - case SESSION_TYPE_IP6_TCP: - return stream_session_lookup_listener6 (&lcl->ip6, lcl_port, proto); - break; + u8 thread_index = s->thread_index; + clib_memset (s, 0xFA, sizeof (*s)); + pool_put (session_main.wrk[thread_index].sessions, s); + return; } - return 0; + SESSION_EVT (SESSION_EVT_FREE, s); + pool_put (session_main.wrk[s->thread_index].sessions, s); } -static u64 -stream_session_half_open_lookup (session_manager_main_t * smm, - ip46_address_t * lcl, ip46_address_t * rmt, - u16 lcl_port, u16 rmt_port, u8 proto) +u8 +session_is_valid (u32 si, u8 thread_index) { - session_kv4_t kv4; - session_kv6_t kv6; - int rv; + session_t *s; + transport_connection_t *tc; - switch (proto) - { - case SESSION_TYPE_IP4_UDP: - case SESSION_TYPE_IP4_TCP: - make_v4_ss_kv (&kv4, &lcl->ip4, &rmt->ip4, lcl_port, rmt_port, proto); - rv = clib_bihash_search_inline_16_8 (&smm->v4_half_open_hash, &kv4); + s = pool_elt_at_index (session_main.wrk[thread_index].sessions, si); - if (rv == 0) - return kv4.value; + if (!s) + return 1; - return (u64) ~ 0; - break; - case SESSION_TYPE_IP6_UDP: - case SESSION_TYPE_IP6_TCP: - make_v6_ss_kv (&kv6, &lcl->ip6, &rmt->ip6, lcl_port, rmt_port, proto); - rv = clib_bihash_search_inline_48_8 (&smm->v6_half_open_hash, &kv6); + if (s->thread_index != thread_index || s->session_index != si) + return 0; - if (rv == 0) - return kv6.value; + if (s->session_state == SESSION_STATE_TRANSPORT_DELETED + || s->session_state <= SESSION_STATE_LISTENING) + return 1; - return (u64) ~ 0; - break; - } - return 0; + 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; } -transport_connection_t * -stream_session_lookup_transport4 (ip4_address_t * lcl, ip4_address_t * rmt, - u16 lcl_port, u16 rmt_port, u8 proto, - u32 my_thread_index) +static void +session_cleanup_notify (session_t * s, session_cleanup_ntf_t ntf) { - session_manager_main_t *smm = &session_manager_main; - session_kv4_t kv4; - stream_session_t *s; - int rv; - - /* Lookup session amongst established ones */ - make_v4_ss_kv (&kv4, lcl, rmt, lcl_port, rmt_port, proto); - rv = clib_bihash_search_inline_16_8 (&smm->v4_session_hash, &kv4); - if (rv == 0) - { - s = stream_session_get_tsi (kv4.value, my_thread_index); - - return tp_vfts[s->session_type].get_connection (s->connection_index, - my_thread_index); - } + app_worker_t *app_wrk; - /* If nothing is found, check if any listener is available */ - s = stream_session_lookup_listener4 (lcl, lcl_port, proto); - if (s) - return tp_vfts[s->session_type].get_listener (s->connection_index); - - /* Finally, try half-open connections */ - rv = clib_bihash_search_inline_16_8 (&smm->v4_half_open_hash, &kv4); - if (rv == 0) - return tp_vfts[proto].get_half_open (kv4.value & 0xFFFFFFFF); + app_wrk = app_worker_get_if_valid (s->app_wrk_index); + if (!app_wrk) + return; + app_worker_cleanup_notify (app_wrk, s, ntf); +} - return 0; +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); } -transport_connection_t * -stream_session_lookup_transport6 (ip6_address_t * lcl, ip6_address_t * rmt, - u16 lcl_port, u16 rmt_port, u8 proto, - u32 my_thread_index) +/** + * Cleans up session and lookup table. + * + * Transport connection must still be valid. + */ +static void +session_delete (session_t * s) { - session_manager_main_t *smm = &session_manager_main; - stream_session_t *s; - session_kv6_t kv6; int rv; - make_v6_ss_kv (&kv6, lcl, rmt, lcl_port, rmt_port, proto); - rv = clib_bihash_search_inline_48_8 (&smm->v6_session_hash, &kv6); - if (rv == 0) - { - s = stream_session_get_tsi (kv6.value, my_thread_index); - - return tp_vfts[s->session_type].get_connection (s->connection_index, - my_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); - /* If nothing is found, check if any listener is available */ - s = stream_session_lookup_listener6 (lcl, lcl_port, proto); - if (s) - return tp_vfts[s->session_type].get_listener (s->connection_index); + session_free_w_fifos (s); +} - /* Finally, try half-open connections */ - rv = clib_bihash_search_inline_48_8 (&smm->v6_half_open_hash, &kv6); - if (rv == 0) - return tp_vfts[proto].get_half_open (kv6.value & 0xFFFFFFFF); +void +session_cleanup_half_open (transport_proto_t tp, session_handle_t ho_handle) +{ + transport_cleanup_half_open (tp, session_handle_index (ho_handle)); +} - return 0; +void +session_half_open_delete_notify (transport_proto_t tp, + session_handle_t ho_handle) +{ + app_worker_t *app_wrk = app_worker_get (session_handle_data (ho_handle)); + app_worker_del_half_open (app_wrk, tp, ho_handle); } -int -stream_session_create_i (segment_manager_t * sm, transport_connection_t * tc, - stream_session_t ** ret_s) -{ - session_manager_main_t *smm = &session_manager_main; - svm_fifo_t *server_rx_fifo = 0, *server_tx_fifo = 0; - u32 fifo_segment_index; - u32 pool_index; - stream_session_t *s; - u64 value; +session_t * +session_alloc_for_connection (transport_connection_t * tc) +{ + session_t *s; u32 thread_index = tc->thread_index; - int rv; - if ((rv = segment_manager_alloc_session_fifos (sm, &server_rx_fifo, - &server_tx_fifo, - &fifo_segment_index))) - return rv; + ASSERT (thread_index == vlib_get_thread_index () + || transport_protocol_is_cl (tc->proto)); - /* Create the session */ - pool_get (smm->sessions[thread_index], s); - memset (s, 0, sizeof (*s)); - - /* Initialize backpointers */ - pool_index = s - smm->sessions[thread_index]; - server_rx_fifo->master_session_index = pool_index; - server_rx_fifo->master_thread_index = thread_index; - - server_tx_fifo->master_session_index = pool_index; - server_tx_fifo->master_thread_index = thread_index; + s = session_alloc (thread_index); + s->session_type = session_type_from_proto_and_ip (tc->proto, tc->is_ip4); + s->session_state = SESSION_STATE_CLOSED; - s->server_rx_fifo = server_rx_fifo; - s->server_tx_fifo = server_tx_fifo; + /* Attach transport to session and vice versa */ + s->connection_index = tc->c_index; + tc->s_index = s->session_index; + return s; +} - /* Initialize state machine, such as it is... */ - s->session_type = tc->proto; - s->session_state = SESSION_STATE_CONNECTING; - s->svm_segment_index = fifo_segment_index; - s->thread_index = thread_index; - s->session_index = pool_index; +/** + * Discards bytes from buffer chain + * + * It discards n_bytes_to_drop starting at first buffer after chain_b + */ +always_inline void +session_enqueue_discard_chain_bytes (vlib_main_t * vm, vlib_buffer_t * b, + vlib_buffer_t ** chain_b, + u32 n_bytes_to_drop) +{ + vlib_buffer_t *next = *chain_b; + u32 to_drop = n_bytes_to_drop; + ASSERT (b->flags & VLIB_BUFFER_NEXT_PRESENT); + while (to_drop && (next->flags & VLIB_BUFFER_NEXT_PRESENT)) + { + next = vlib_get_buffer (vm, next->next_buffer); + if (next->current_length > to_drop) + { + vlib_buffer_advance (next, to_drop); + to_drop = 0; + } + else + { + to_drop -= next->current_length; + next->current_length = 0; + } + } + *chain_b = next; - /* Attach transport to session */ - s->connection_index = tc->c_index; + if (to_drop == 0) + b->total_length_not_including_first_buffer -= n_bytes_to_drop; +} - /* Attach session to transport */ - tc->s_index = s->session_index; +/** + * Enqueue buffer chain tail + */ +always_inline int +session_enqueue_chain_tail (session_t * s, vlib_buffer_t * b, + u32 offset, u8 is_in_order) +{ + vlib_buffer_t *chain_b; + u32 chain_bi, len, diff; + vlib_main_t *vm = vlib_get_main (); + u8 *data; + u32 written = 0; + int rv = 0; + + if (is_in_order && offset) + { + diff = offset - b->current_length; + if (diff > b->total_length_not_including_first_buffer) + return 0; + chain_b = b; + session_enqueue_discard_chain_bytes (vm, b, &chain_b, diff); + chain_bi = vlib_get_buffer_index (vm, chain_b); + } + else + chain_bi = b->next_buffer; - /* Add to the main lookup table */ - value = (((u64) thread_index) << 32) | (u64) s->session_index; - stream_session_table_add_for_tc (tc, value); + do + { + chain_b = vlib_get_buffer (vm, chain_bi); + data = vlib_buffer_get_current (chain_b); + len = chain_b->current_length; + if (!len) + continue; + if (is_in_order) + { + rv = svm_fifo_enqueue (s->rx_fifo, len, data); + if (rv == len) + { + written += rv; + } + else if (rv < len) + { + return (rv > 0) ? (written + rv) : written; + } + else if (rv > len) + { + written += rv; + + /* written more than what was left in chain */ + if (written > b->total_length_not_including_first_buffer) + return written; + + /* drop the bytes that have already been delivered */ + session_enqueue_discard_chain_bytes (vm, b, &chain_b, rv - len); + } + } + else + { + rv = svm_fifo_enqueue_with_offset (s->rx_fifo, offset, len, data); + if (rv) + { + clib_warning ("failed to enqueue multi-buffer seg"); + return -1; + } + offset += len; + } + } + while ((chain_bi = (chain_b->flags & VLIB_BUFFER_NEXT_PRESENT) + ? chain_b->next_buffer : 0)); - *ret_s = s; + if (is_in_order) + return written; 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->size >= 4096); + ASSERT (f->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 * calling stream_server_flush_enqueue_events(). * * @param tc Transport connection which is to be enqueued data - * @param data Data to be enqueued - * @param len Length of data to be enqueued + * @param b Buffer to be enqueued + * @param offset Offset at which to start enqueueing if out-of-order * @param queue_event Flag to indicate if peer is to be notified or if event * is to be queued. The former is useful when more data is * enqueued and only one event is to be generated. + * @param is_in_order Flag to indicate if data is in order * @return Number of bytes enqueued or a negative value if enqueueing failed. */ int -stream_session_enqueue_data (transport_connection_t * tc, u8 * data, u16 len, - u8 queue_event) +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; - int enqueued; + session_t *s; + int enqueued = 0, rv, in_order_off; - s = stream_session_get (tc->s_index, tc->thread_index); + s = session_get (tc->s_index, tc->thread_index); - /* Make sure there's enough space left. We might've filled the pipes */ - if (PREDICT_FALSE (len > svm_fifo_max_enqueue (s->server_rx_fifo))) - return -1; - - enqueued = svm_fifo_enqueue_nowait (s->server_rx_fifo, len, data); + if (is_in_order) + { + 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)) + { + 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; + } + } + else + { + 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)) + session_enqueue_chain_tail (s, b, offset + b->current_length, 0); + /* if something was enqueued, report even this as success for ooo + * segment handling */ + return rv; + } if (queue_event) { /* 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 my_enqueue_epoch = smm->current_enqueue_epoch[thread_index]; + session_worker_t *wrk; - if (s->enqueue_epoch != my_enqueue_epoch) + wrk = session_main_get_worker (s->thread_index); + if (!(s->flags & SESSION_F_RX_EVT)) { - s->enqueue_epoch = my_enqueue_epoch; - vec_add1 (smm->session_indices_to_enqueue_by_thread[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; } -/** 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_enqueue_dgram_connection (session_t * s, + session_dgram_hdr_t * hdr, + vlib_buffer_t * b, u8 proto, u8 queue_event) { - stream_session_t *s = stream_session_get (tc->c_index, thread_index); + int enqueued = 0, rv, in_order_off; - if (PREDICT_FALSE (s->session_state != SESSION_STATE_READY)) - return 1; + ASSERT (svm_fifo_max_enqueue_prod (s->rx_fifo) + >= b->current_length + sizeof (*hdr)); - if (data_len > svm_fifo_max_enqueue (s->server_rx_fifo)) - return 1; + svm_fifo_enqueue (s->rx_fifo, sizeof (session_dgram_hdr_t), (u8 *) hdr); + 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)) + { + 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; + } + if (queue_event) + { + /* Queue RX event on this fifo. Eventually these will need to be flushed + * by calling stream_server_flush_enqueue_events () */ + session_worker_t *wrk; - return 0; + wrk = session_main_get_worker (s->thread_index); + if (!(s->flags & SESSION_F_RX_EVT)) + { + 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; } -u32 -stream_session_peek_bytes (transport_connection_t * tc, u8 * buffer, - u32 offset, u32 max_bytes) +int +session_tx_fifo_peek_bytes (transport_connection_t * tc, u8 * buffer, + u32 offset, u32 max_bytes) { - stream_session_t *s = stream_session_get (tc->s_index, tc->thread_index); - return svm_fifo_peek (s->server_tx_fifo, offset, max_bytes, buffer); + session_t *s = session_get (tc->s_index, tc->thread_index); + return svm_fifo_peek (s->tx_fifo, offset, max_bytes, buffer); } u32 -stream_session_dequeue_drop (transport_connection_t * tc, u32 max_bytes) +session_tx_fifo_dequeue_drop (transport_connection_t * tc, u32 max_bytes) +{ + session_t *s = session_get (tc->s_index, tc->thread_index); + u32 rv; + + 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; +} + +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 = stream_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->n_subscribers; i++) + { + app_wrk = application_get_worker (app, f->subscribers[i]); + if (!app_wrk) + continue; + if (app_worker_lock_and_send_event (app_wrk, s, evt_type)) + return -1; + } + + return 0; } /** * Notify session peer that new data has been enqueued. * - * @param s Stream session for which the event is to be generated. - * @param block Flag to indicate if call should block if event queue is full. + * @param s Stream session for which the event is to be generated. + * @param lock Flag to indicate if call should lock message queue. * - * @return 0 on succes or negative number if failed to send notification. + * @return 0 on success or negative number if failed to send notification. */ -static int -stream_session_enqueue_notify (stream_session_t * s, u8 block) +static inline int +session_enqueue_notify_inline (session_t * s) { - application_t *app; - session_fifo_event_t evt; - unix_shared_memory_queue_t *q; - static u32 serial_number; + app_worker_t *app_wrk; + u32 session_index; + u8 n_subscribers; - if (PREDICT_FALSE (s->session_state == SESSION_STATE_CLOSED)) - return 0; + session_index = s->session_index; + n_subscribers = svm_fifo_n_subscribers (s->rx_fifo); - /* Get session's server */ - app = application_get (s->app_index); + 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; + } - /* Built-in server? Hand event to the callback... */ - if (app->cb_fns.builtin_server_rx_callback) - return app->cb_fns.builtin_server_rx_callback (s); + SESSION_EVT (SESSION_EVT_ENQ, s, svm_fifo_max_dequeue_prod (s->rx_fifo)); - /* If no event, send one */ - if (svm_fifo_set_event (s->server_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)) { - /* Fabricate event */ - evt.fifo = s->server_rx_fifo; - evt.event_type = FIFO_EVENT_APP_RX; - evt.event_id = serial_number++; - - /* Add event to server's event queue */ - q = app->event_queue; - - /* 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 */ ); - else - { - clib_warning ("fifo full"); - return -1; - } + 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); } - /* *INDENT-OFF* */ - SESSION_EVT_DBG(SESSION_EVT_ENQ, s, ({ - ed->data[0] = evt.event_id; - ed->data[1] = svm_fifo_max_dequeue (s->server_rx_fifo); - })); - /* *INDENT-ON* */ + 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); + + /* + * 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 (session_t * s) +{ + 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; + + if (PREDICT_FALSE (app_worker_lock_and_send_event (app_wrk, s, + SESSION_IO_EVT_TX))) + return -1; + + if (PREDICT_FALSE (s->tx_fifo->n_subscribers)) + return session_notify_subscribers (app_wrk->app_index, s, + s->tx_fifo, SESSION_IO_EVT_TX); return 0; } @@ -577,90 +712,229 @@ stream_session_enqueue_notify (stream_session_t * s, u8 block) * failures due to API queue being full. */ int -session_manager_flush_enqueue_events (u32 thread_index) +session_main_flush_enqueue_events (u8 transport_proto, u32 thread_index) { - session_manager_main_t *smm = &session_manager_main; - u32 *session_indices_to_enqueue; + session_worker_t *wrk = session_main_get_worker (thread_index); + session_t *s; int i, errors = 0; + u32 *indices; - session_indices_to_enqueue = - smm->session_indices_to_enqueue_by_thread[thread_index]; + indices = wrk->session_to_enqueue[transport_proto]; - for (i = 0; i < vec_len (session_indices_to_enqueue); i++) + for (i = 0; i < vec_len (indices); i++) { - stream_session_t *s0; - - /* Get session */ - s0 = stream_session_get (session_indices_to_enqueue[i], thread_index); - if (stream_session_enqueue_notify (s0, 0 /* don't block */ )) + s = session_get_if_valid (indices[i], thread_index); + if (PREDICT_FALSE (!s)) { errors++; + continue; } - } - vec_reset_length (session_indices_to_enqueue); + session_fifo_tuning (s, s->rx_fifo, SESSION_FT_ACTION_ENQUEUED, + 0 /* TODO/not needed */ ); - smm->session_indices_to_enqueue_by_thread[thread_index] = - session_indices_to_enqueue; + if (PREDICT_FALSE (session_enqueue_notify_inline (s))) + errors++; + } - /* Increment enqueue epoch for next round */ - smm->current_enqueue_epoch[thread_index]++; + vec_reset_length (indices); + wrk->session_to_enqueue[transport_proto] = indices; return errors; } -void -stream_session_connect_notify (transport_connection_t * tc, u8 sst, - u8 is_fail) +int +session_main_flush_all_enqueue_events (u8 transport_proto) { - session_manager_main_t *smm = &session_manager_main; - application_t *app; - stream_session_t *new_s = 0; - u64 handle; - u32 api_context = 0; - - handle = stream_session_half_open_lookup (smm, &tc->lcl_ip, &tc->rmt_ip, - tc->lcl_port, tc->rmt_port, - tc->proto); - if (handle == HALF_OPEN_LOOKUP_INVALID_VALUE) + vlib_thread_main_t *vtm = vlib_get_thread_main (); + int i, errors = 0; + for (i = 0; i < 1 + vtm->n_threads; i++) + errors += session_main_flush_enqueue_events (transport_proto, i); + return errors; +} + +int +session_stream_connect_notify (transport_connection_t * tc, + session_error_t err) +{ + session_handle_t ho_handle, wrk_handle; + u32 opaque = 0, new_ti, new_si; + app_worker_t *app_wrk; + session_t *s = 0; + + /* + * Find connection handle and cleanup half-open table + */ + ho_handle = session_lookup_half_open_handle (tc); + if (ho_handle == HALF_OPEN_LOOKUP_INVALID_VALUE) { - clib_warning ("This can't be good!"); - return; + 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 (session_handle_data (ho_handle)); + if (!app_wrk) + return -1; + + wrk_handle = app_worker_lookup_half_open (app_wrk, tc->proto, ho_handle); + if (wrk_handle == SESSION_INVALID_HANDLE) + return -1; + + /* Make sure this is the same half-open index */ + if (session_handle_index (wrk_handle) != session_handle_index (ho_handle)) + return -1; - /* Get the app's index from the handle we stored when opening connection */ - app = application_get (handle >> 32); - api_context = tc->s_index; + opaque = session_handle_data (wrk_handle); - if (!is_fail) + if (err) + return app_worker_connect_notify (app_wrk, s, err, opaque); + + s = session_alloc_for_connection (tc); + s->session_state = 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))) { - segment_manager_t *sm; - sm = application_get_connect_segment_manager (app); + session_free (s); + app_worker_connect_notify (app_wrk, 0, err, opaque); + return -1; + } - /* Create new session (svm segments are allocated if needed) */ - if (stream_session_create_i (sm, tc, &new_s)) - return; + s = session_get (new_si, new_ti); + s->session_state = SESSION_STATE_READY; + session_lookup_add_connection (tc, session_handle (s)); - new_s->app_index = app->index; + if (app_worker_connect_notify (app_wrk, s, SESSION_E_NONE, opaque)) + { + 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; } - /* Notify client */ - app->cb_fns.session_connected_callback (app->index, api_context, new_s, - is_fail); + return 0; +} + +static void +session_switch_pool_reply (void *arg) +{ + u32 session_index = pointer_to_uword (arg); + segment_manager_t *sm; + app_worker_t *app_wrk; + session_t *s; + + s = session_get_if_valid (session_index, vlib_get_thread_index ()); + if (!s) + return; - /* Cleanup session lookup */ - stream_session_half_open_table_del (smm, sst, tc); + app_wrk = app_worker_get_if_valid (s->app_wrk_index); + if (!app_wrk) + return; + + /* Attach fifos to the right session and segment slice */ + sm = app_worker_get_connect_segment_manager (app_wrk); + segment_manager_attach_fifo (sm, s->rx_fifo, s); + segment_manager_attach_fifo (sm, s->tx_fifo, s); + + /* Notify app that it has data on the new session */ + session_enqueue_notify (s); } -void -stream_session_accept_notify (transport_connection_t * tc) +typedef struct _session_switch_pool_args { - application_t *server; - stream_session_t *s; + u32 session_index; + u32 thread_index; + u32 new_thread_index; + u32 new_session_index; +} session_switch_pool_args_t; - s = stream_session_get (tc->s_index, tc->thread_index); - server = application_get (s->app_index); - server->cb_fns.session_accept_callback (s); +/** + * 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; + session_handle_t new_sh; + segment_manager_t *sm; + app_worker_t *app_wrk; + session_t *s; + void *rargs; + + ASSERT (args->thread_index == vlib_get_thread_index ()); + s = session_get (args->session_index, args->thread_index); + + transport_cleanup (session_get_transport_proto (s), s->connection_index, + s->thread_index); + + new_sh = session_make_handle (args->new_session_index, + args->new_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 */ + app_worker_migrate_notify (app_wrk, s, new_sh); + } + + /* Trigger app read and fifo updates on the new thread */ + rargs = uword_to_pointer (args->new_session_index, void *); + session_send_rpc_evt_to_thread (args->new_thread_index, + session_switch_pool_reply, rargs); + + session_free (s); + clib_mem_free (cb_args); +} + +/** + * Move dgram session to the right thread + */ +int +session_dgram_connect_notify (transport_connection_t * tc, + u32 old_thread_index, session_t ** new_session) +{ + session_t *new_s; + session_switch_pool_args_t *rpc_args; + + /* + * 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->session_state = SESSION_STATE_READY; + new_s->flags |= SESSION_F_IS_MIGRATING; + + session_lookup_add_connection (tc, session_handle (new_s)); + + /* + * Ask thread owning the old session to clean it up and make us the tx + * fifo owner + */ + rpc_args = clib_mem_alloc (sizeof (*rpc_args)); + rpc_args->new_session_index = new_s->session_index; + rpc_args->new_thread_index = new_s->thread_index; + rpc_args->session_index = tc->s_index; + rpc_args->thread_index = old_thread_index; + session_send_rpc_evt_to_thread (rpc_args->thread_index, session_switch_pool, + rpc_args); + + tc->s_index = new_s->session_index; + new_s->connection_index = tc->c_index; + *new_session = new_s; + return 0; } /** @@ -671,175 +945,383 @@ 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) { - application_t *server; - stream_session_t *s; - - s = stream_session_get (tc->s_index, tc->thread_index); - server = application_get (s->app_index); - server->cb_fns.session_disconnect_callback (s); + app_worker_t *app_wrk; + session_t *s; + + s = session_get (tc->s_index, tc->thread_index); + if (s->session_state >= SESSION_STATE_TRANSPORT_CLOSING) + return; + s->session_state = SESSION_STATE_TRANSPORT_CLOSING; + app_wrk = app_worker_get (s->app_wrk_index); + app_worker_close_notify (app_wrk, s); } /** - * Cleans up session and associated app if needed. + * Notification from transport that connection is being deleted + * + * 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) { - session_manager_main_t *smm = vnet_get_session_manager_main (); - - /* Delete from the main lookup table. */ - stream_session_table_del (smm, s); + session_t *s; - /* Cleanup fifo segments */ - segment_manager_dealloc_fifos (s->svm_segment_index, s->server_rx_fifo, - s->server_tx_fifo); + /* App might've been removed already */ + if (!(s = session_get_if_valid (tc->s_index, tc->thread_index))) + return; - pool_put (smm->sessions[s->thread_index], 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); + s->session_state = 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); + s->session_state = 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 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 = stream_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; + + /* Transport thinks that app requested close but it actually didn't. + * Can happen for tcp if fin and rst are received in close succession. */ + if (s->session_state == SESSION_STATE_READY) { - return; + session_transport_closing_notify (tc); + svm_fifo_dequeue_drop_all (s->tx_fifo); + s->session_state = SESSION_STATE_TRANSPORT_CLOSED; } - stream_session_delete (s); + /* 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) + { + s->session_state = SESSION_STATE_TRANSPORT_CLOSED; + } + /* If app also closed, switch to closed */ + else if (s->session_state == SESSION_STATE_APP_CLOSED) + s->session_state = 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; - application_t *app; - s = stream_session_get (tc->s_index, tc->thread_index); + app_worker_t *app_wrk; + session_t *s; + + s = session_get (tc->s_index, tc->thread_index); + svm_fifo_dequeue_drop_all (s->tx_fifo); + if (s->session_state >= SESSION_STATE_TRANSPORT_CLOSING) + return; + s->session_state = SESSION_STATE_TRANSPORT_CLOSING; + app_wrk = app_worker_get (s->app_wrk_index); + app_worker_reset_notify (app_wrk, s); +} + +int +session_stream_accept_notify (transport_connection_t * tc) +{ + app_worker_t *app_wrk; + session_t *s; - app = application_get (s->app_index); - app->cb_fns.session_reset_callback (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; + s->session_state = 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. */ + s->session_state = SESSION_STATE_CREATED; + return -1; + } + return 0; } /** * Accept a stream session. Optionally ping the server by callback. */ int -stream_session_accept (transport_connection_t * tc, u32 listener_index, - u8 sst, u8 notify) +session_stream_accept (transport_connection_t * tc, u32 listener_index, + u32 thread_index, u8 notify) { - application_t *server; - stream_session_t *s, *listener; - segment_manager_t *sm; - + session_t *s; int rv; - /* Find the server */ - listener = listen_session_get (sst, listener_index); - server = application_get (listener->app_index); + s = session_alloc_for_connection (tc); + s->listener_handle = ((u64) thread_index << 32) | (u64) listener_index; + s->session_state = SESSION_STATE_CREATED; - sm = application_get_listen_segment_manager (server, listener); - if ((rv = stream_session_create_i (sm, tc, &s))) - return rv; + if ((rv = app_worker_init_accepted (s))) + { + session_free (s); + return rv; + } - s->app_index = server->index; - s->listener_index = listener_index; + session_lookup_add_connection (tc, session_handle (s)); /* Shoulder-tap the server */ if (notify) { - server->cb_fns.session_accept_callback (s); + 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; } -/** - * Ask transport to open connection to remote transport endpoint. - * - * Stores handle for matching request with reply since the call can be - * asynchronous. For instance, for TCP the 3-way handshake must complete - * before reply comes. Session is only created once connection is established. - * - * @param app_index Index of the application requesting the connect - * @param st Session type requested. - * @param tep Remote transport endpoint - * @param res Resulting transport connection . - */ int -stream_session_open (u32 app_index, session_type_t st, - transport_endpoint_t * tep, - transport_connection_t ** res) +session_dgram_accept (transport_connection_t * tc, u32 listener_index, + u32 thread_index) +{ + app_worker_t *app_wrk; + session_t *s; + int rv; + + s = session_alloc_for_connection (tc); + s->listener_handle = ((u64) thread_index << 32) | (u64) listener_index; + + if ((rv = app_worker_init_accepted (s))) + { + session_free (s); + return rv; + } + + app_wrk = app_worker_get (s->app_wrk_index); + if ((rv = app_worker_accept_notify (app_wrk, s))) + { + segment_manager_dealloc_fifos (s->rx_fifo, s->tx_fifo); + session_free (s); + return rv; + } + + s->session_state = SESSION_STATE_READY; + session_lookup_add_connection (tc, session_handle (s)); + + return 0; +} + +int +session_open_cl (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque) { transport_connection_t *tc; + transport_endpoint_cfg_t *tep; + app_worker_t *app_wrk; + session_handle_t sh; + session_t *s; int rv; - u64 handle; - rv = tp_vfts[st].open (&tep->ip, tep->port); + tep = session_endpoint_to_transport_cfg (rmt); + rv = transport_connect (rmt->transport_proto, tep); if (rv < 0) { - clib_warning ("Transport failed to open connection."); - return VNET_API_ERROR_SESSION_CONNECT_FAIL; + SESSION_DBG ("Transport failed to open connection."); + return rv; + } + + tc = transport_get_half_open (rmt->transport_proto, (u32) rv); + + /* For dgram type of service, allocate session and fifos now */ + app_wrk = app_worker_get (app_wrk_index); + s = session_alloc_for_connection (tc); + s->app_wrk_index = app_wrk->wrk_index; + s->session_state = SESSION_STATE_OPENED; + if (app_worker_init_connected (app_wrk, s)) + { + session_free (s); + return -1; } - tc = tp_vfts[st].get_half_open ((u32) rv); + sh = session_handle (s); + session_lookup_add_connection (tc, sh); + return app_worker_connect_notify (app_wrk, s, SESSION_E_NONE, opaque); +} - /* 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_index) << 32) | (u64) tc->c_index; +int +session_open_vc (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque) +{ + transport_connection_t *tc; + transport_endpoint_cfg_t *tep; + u64 handle, wrk_handle; + int rv; - /* Add to the half-open lookup table */ - stream_session_half_open_table_add (st, tc, handle); + 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 rv; + } - *res = tc; + 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 = session_make_handle (tc->c_index, app_wrk_index); + session_lookup_add_half_open (tc, handle); + + /* Store the half-open handle in the connection. Transport will use it + * when cleaning up @ref session_half_open_delete_notify + */ + tc->s_ho_handle = handle; + + /* Track the half-open connections in case we want to forcefully + * clean them up @ref session_cleanup_half_open + */ + wrk_handle = session_make_handle (tc->c_index, opaque); + app_worker_add_half_open (app_worker_get (app_wrk_index), + rmt->transport_proto, handle, wrk_handle); return 0; } +int +session_open_app (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque) +{ + session_endpoint_cfg_t *sep = (session_endpoint_cfg_t *) rmt; + transport_endpoint_cfg_t *tep_cfg = session_endpoint_to_transport_cfg (sep); + + sep->app_wrk_index = app_wrk_index; + sep->opaque = opaque; + + return transport_connect (rmt->transport_proto, tep_cfg); +} + +typedef int (*session_open_service_fn) (u32, session_endpoint_t *, u32); + +/* *INDENT-OFF* */ +static session_open_service_fn session_open_srv_fns[TRANSPORT_N_SERVICES] = { + session_open_vc, + session_open_cl, + session_open_app, +}; +/* *INDENT-ON* */ + +/** + * Ask transport to open connection to remote transport endpoint. + * + * Stores handle for matching request with reply since the call can be + * asynchronous. For instance, for TCP the 3-way handshake must complete + * before reply comes. Session is only created once connection is established. + * + * @param app_index Index of the application requesting the connect + * @param st Session type requested. + * @param tep Remote transport endpoint + * @param opaque Opaque data (typically, api_context) the application expects + * on open completion. + */ +int +session_open (u32 app_wrk_index, session_endpoint_t * rmt, u32 opaque) +{ + transport_service_type_t tst; + tst = transport_protocol_service_type (rmt->transport_proto); + return session_open_srv_fns[tst] (app_wrk_index, rmt, opaque); +} + /** - * Ask transport to listen on local transport endpoint. + * Ask transport to listen on session endpoint. * * @param s Session for which listen will be called. Note that unlike * established sessions, listen sessions are not associated to a * thread. - * @param tep Local endpoint to be listened on. + * @param sep Local endpoint to be listened on. */ int -stream_session_listen (stream_session_t * s, transport_endpoint_t * tep) +session_listen (session_t * ls, session_endpoint_cfg_t * sep) { - transport_connection_t *tc; - u32 tci; - - /* Transport bind/listen */ - tci = tp_vfts[s->session_type].bind (s->session_index, &tep->ip, tep->port); - - if (tci == (u32) ~ 0) - return -1; + transport_endpoint_t *tep; + int tc_index; + u32 s_index; - /* Attach transport to session */ - s->connection_index = tci; - tc = tp_vfts[s->session_type].get_listener (tci); + /* Transport bind/listen */ + tep = session_endpoint_to_transport (sep); + s_index = ls->session_index; + tc_index = transport_start_listen (session_get_transport_proto (ls), + s_index, tep); - /* Weird but handle it ... */ - if (tc == 0) - return -1; + if (tc_index < 0) + return tc_index; - /* Add to the main lookup table */ - stream_session_table_add_for_tc (tc, s->session_index); + /* 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; return 0; } @@ -850,146 +1332,336 @@ stream_session_listen (stream_session_t * s, transport_endpoint_t * tep) * @param s Session to stop listening on. It must be in state LISTENING. */ int -stream_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[s->session_type].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; - stream_session_table_del_for_tc (tc); - tp_vfts[s->session_type].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 closing procedure. + * + * Request is always sent to session node to ensure that all outstanding + * requests are served before transport is notified. + */ void -session_send_session_evt_to_thread (u64 session_handle, - fifo_event_type_t evt_type, - u32 thread_index) +session_close (session_t * s) { - static u16 serial_number = 0; - session_fifo_event_t evt; - unix_shared_memory_queue_t *q; - - /* Fabricate event */ - evt.session_handle = session_handle; - evt.event_type = evt_type; - evt.event_id = serial_number++; - - q = session_manager_get_vpp_event_queue (thread_index); + if (!s) + return; - /* Based on request block (or not) for lack of space */ - if (PREDICT_TRUE (q->cursize < q->maxsize)) - unix_shared_memory_queue_add (q, (u8 *) & evt, - 0 /* do wait for mutex */ ); - else + if (s->session_state >= SESSION_STATE_CLOSING) { - clib_warning ("queue full"); + /* 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; + session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_CLOSE); +} + +/** + * 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 */ + svm_fifo_dequeue_drop_all (s->tx_fifo); + s->session_state = SESSION_STATE_CLOSING; + session_program_transport_ctrl_evt (s, SESSION_CTRL_EVT_RESET); } /** - * Disconnect session and propagate to transport. This should eventually + * 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) +session_transport_close (session_t * s) { - s->session_state = SESSION_STATE_CLOSED; - tp_vfts[s->session_type].close (s->connection_index, s->thread_index); + if (s->session_state >= SESSION_STATE_APP_CLOSED) + { + if (s->session_state == SESSION_STATE_TRANSPORT_CLOSED) + s->session_state = 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. + */ + s->session_state = 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) +{ + if (s->session_state >= SESSION_STATE_APP_CLOSED) + { + if (s->session_state == SESSION_STATE_TRANSPORT_CLOSED) + s->session_state = SESSION_STATE_CLOSED; + else if (s->session_state >= SESSION_STATE_TRANSPORT_DELETED) + session_free_w_fifos (s); + return; + } + + s->session_state = SESSION_STATE_APP_CLOSED; + transport_reset (session_get_transport_proto (s), s->connection_index, + s->thread_index); } /** * Cleanup transport and session state. * - * Notify transport of the cleanup, wait for a delete notify to actually - * remove the session state. + * Notify transport of the cleanup and free the session. This should + * be called only if transport reported some error and is already + * closed. */ void -stream_session_cleanup (stream_session_t * s) +session_transport_cleanup (session_t * s) { - session_manager_main_t *smm = &session_manager_main; - int rv; + /* Delete from main lookup table before we axe the the transport */ + session_lookup_del_session (s); + 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->rx_fifo, s->tx_fifo); + session_free (s); +} - s->session_state = SESSION_STATE_CLOSED; +/** + * 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_queues_allocate (session_main_t * smm) +{ + u32 evt_q_length = 2048, evt_size = sizeof (session_event_t); + ssvm_private_t *eqs = &smm->evt_qs_segment; + uword eqs_size = 64 << 20; + pid_t vpp_pid = getpid (); + void *oldheap; + 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; + + 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; + + if (ssvm_master_init (eqs, SSVM_SEGMENT_MEMFD)) + { + clib_warning ("failed to initialize queue segment"); + return; + } + } + + if (smm->evt_qs_use_memfd_seg) + oldheap = ssvm_push_heap (eqs->sh); + else + oldheap = vl_msg_push_heap (); + + for (i = 0; i < vec_len (smm->wrk); i++) + { + svm_msg_q_cfg_t _cfg, *cfg = &_cfg; + svm_msg_q_ring_cfg_t rc[SESSION_MQ_N_RINGS] = { + {evt_q_length, evt_size, 0} + , + {evt_q_length >> 1, 256, 0} + }; + cfg->consumer_pid = 0; + cfg->n_rings = 2; + cfg->q_nitems = evt_q_length; + cfg->ring_cfgs = rc; + smm->wrk[i].vpp_event_queue = svm_msg_q_alloc (cfg); + if (smm->evt_qs_use_memfd_seg) + { + if (svm_msg_q_alloc_consumer_eventfd (smm->wrk[i].vpp_event_queue)) + clib_warning ("eventfd returned"); + } + } - /* Delete from the main lookup table to avoid more enqueues */ - rv = stream_session_table_del (smm, s); - if (rv) - clib_warning ("hash delete error, rv %d", rv); + if (smm->evt_qs_use_memfd_seg) + ssvm_pop_heap (oldheap); + else + vl_msg_pop_heap (oldheap); +} - tp_vfts[s->session_type].cleanup (s->connection_index, s->thread_index); +ssvm_private_t * +session_main_get_evt_q_segment (void) +{ + session_main_t *smm = &session_main; + if (smm->evt_qs_use_memfd_seg) + return &smm->evt_qs_segment; + return 0; } -void -session_register_transport (u8 type, const transport_proto_vft_t * vft) +u64 +session_segment_handle (session_t * s) { - session_manager_main_t *smm = vnet_get_session_manager_main (); + svm_fifo_t *f; - vec_validate (tp_vfts, type); - tp_vfts[type] = *vft; + if (!s->rx_fifo) + return SESSION_INVALID_HANDLE; - /* If an offset function is provided, then peek instead of dequeue */ - smm->session_tx_fns[type] = - (vft->tx_fifo_offset) ? session_tx_fifo_peek_and_snd : - session_tx_fifo_dequeue_and_snd; + f = s->rx_fifo; + return segment_manager_make_segment_handle (f->segment_manager, + f->segment_index); } -transport_proto_vft_t * -session_get_transport_vft (u8 type) +/* *INDENT-OFF* */ +static session_fifo_rx_fn *session_tx_fns[TRANSPORT_TX_N_FNS] = { + session_tx_fifo_peek_and_snd, + session_tx_fifo_dequeue_and_snd, + session_tx_fifo_dequeue_internal, + session_tx_fifo_dequeue_and_snd +}; +/* *INDENT-ON* */ + +void +session_register_transport (transport_proto_t transport_proto, + const transport_proto_vft_t * vft, u8 is_ip4, + u32 output_node) { - if (type >= vec_len (tp_vfts)) - return 0; - return &tp_vfts[type]; + session_main_t *smm = &session_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->session_tx_fns, session_type); + + /* *INDENT-OFF* */ + if (output_node != ~0) + { + 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; + smm->session_tx_fns[session_type] = + session_tx_fns[vft->transport_options.tx_type]; } -/** - * Allocate vpp event queue (once) per worker thread - */ -void -session_vpp_event_queue_allocate (session_manager_main_t * smm, - u32 thread_index) +transport_proto_t +session_add_transport_proto (void) { - api_main_t *am = &api_main; - void *oldheap; + session_main_t *smm = &session_main; + session_worker_t *wrk; + u32 thread; - if (smm->vpp_event_queues[thread_index] == 0) + smm->last_transport_proto_type += 1; + + for (thread = 0; thread < vec_len (smm->wrk); thread++) { - /* Allocate event fifo in the /vpe-api shared-memory segment */ - oldheap = svm_push_data_heap (am->vlib_rp); - - smm->vpp_event_queues[thread_index] = - unix_shared_memory_queue_init (2048 /* nels $$$$ config */ , - sizeof (session_fifo_event_t), - 0 /* consumer pid */ , - 0 - /* (do not) send signal when queue non-empty */ - ); - - svm_pop_heap (oldheap); + wrk = session_main_get_worker (thread); + vec_validate (wrk->session_to_enqueue, smm->last_transport_proto_type); } + + return smm->last_transport_proto_type; +} + +transport_connection_t * +session_get_transport (session_t * s) +{ + 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); +} + +transport_connection_t * +listen_session_get_transport (session_t * s) +{ + return transport_get_listener (session_get_transport_proto (s), + s->connection_index); +} + +void +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_RUN_ON_MAIN, 0); } static clib_error_t * session_manager_main_enable (vlib_main_t * vm) { - session_manager_main_t *smm = &session_manager_main; + segment_manager_main_init_args_t _sm_args = { 0 }, *sm_args = &_sm_args; + session_main_t *smm = &session_main; vlib_thread_main_t *vtm = vlib_get_thread_main (); - u32 num_threads; + u32 num_threads, preallocated_sessions_per_worker; + session_worker_t *wrk; int i; num_threads = 1 /* main thread */ + vtm->n_threads; @@ -997,56 +1669,63 @@ 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->session_indices_to_enqueue_by_thread, num_threads - 1); - vec_validate (smm->tx_buffers, num_threads - 1); - vec_validate (smm->fifo_events, num_threads - 1); - vec_validate (smm->evts_partially_read, num_threads - 1); - vec_validate (smm->current_enqueue_epoch, num_threads - 1); - vec_validate (smm->vpp_event_queues, num_threads - 1); - -#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 cache line aligned worker contexts */ + vec_validate_aligned (smm->wrk, num_threads - 1, CLIB_CACHE_LINE_BYTES); - /* $$$$ preallocate hack config parameter */ - for (i = 0; i < 200000; i++) + for (i = 0; i < num_threads; i++) { - stream_session_t *ss; - pool_get (smm->sessions[0], ss); - memset (ss, 0, sizeof (*ss)); + 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->vm = vlib_mains[i]; + wrk->last_vlib_time = vlib_time_now (vm); + wrk->last_vlib_us_time = wrk->last_vlib_time * CLIB_US_TIME_FREQ; + vec_validate (wrk->session_to_enqueue, smm->last_transport_proto_type); + + if (num_threads > 1) + clib_rwlock_init (&smm->wrk[i].peekers_rw_locks); } - for (i = 0; i < 200000; i++) - pool_put_index (smm->sessions[0], i); + /* Allocate vpp event queues segment and queue */ + session_vpp_event_queues_allocate (smm); - clib_bihash_init_16_8 (&smm->v4_session_hash, "v4 session table", - 200000 /* $$$$ config parameter nbuckets */ , - (64 << 20) /*$$$ config parameter table size */ ); - clib_bihash_init_48_8 (&smm->v6_session_hash, "v6 session table", - 200000 /* $$$$ config parameter nbuckets */ , - (64 << 20) /*$$$ config parameter table size */ ); + /* 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) + { + if (num_threads == 1) + { + pool_init_fixed (smm->wrk[0].sessions, smm->preallocated_sessions); + } + else + { + int j; + preallocated_sessions_per_worker = + (1.1 * (f64) smm->preallocated_sessions / + (f64) (num_threads - 1)); + + for (j = 1; j < num_threads; j++) + { + pool_init_fixed (smm->wrk[j].sessions, + preallocated_sessions_per_worker); + } + } + } - clib_bihash_init_16_8 (&smm->v4_half_open_hash, "v4 half-open table", - 200000 /* $$$$ config parameter nbuckets */ , - (64 << 20) /*$$$ config parameter table size */ ); - clib_bihash_init_48_8 (&smm->v6_half_open_hash, "v6 half-open table", - 200000 /* $$$$ config parameter nbuckets */ , - (64 << 20) /*$$$ config parameter table size */ ); + session_lookup_init (); + app_namespaces_init (); + transport_init (); smm->is_enabled = 1; - /* Enable TCP transport */ - vnet_tcp_enable_disable (vm, 1); + /* Enable transports */ + transport_enable_disable (vm, 1); + session_debug_init (); return 0; } @@ -1055,8 +1734,30 @@ void session_node_enable_disable (u8 is_en) { 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); + } + + continue; + } vlib_node_set_state (this_vlib_main, session_queue_node.index, state); })); @@ -1066,37 +1767,154 @@ session_node_enable_disable (u8 is_en) clib_error_t * 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; + error = session_manager_main_enable (vm); session_node_enable_disable (is_en); - - return session_manager_main_enable (vm); } else { - session_manager_main.is_enabled = 0; + session_main.is_enabled = 0; session_node_enable_disable (is_en); } - return 0; + return error; } 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; + session_main_t *smm = &session_main; - smm->vlib_main = vm; - smm->vnet_main = vnet_get_main (); smm->is_enabled = 0; + smm->session_enable_asap = 0; + smm->session_baseva = HIGH_SEGMENT_BASEVA; + +#if (HIGH_SEGMENT_BASEVA > (4ULL << 30)) + smm->session_va_space_size = 128ULL << 30; + smm->evt_qs_segment_size = 64 << 20; +#else + smm->session_va_space_size = 128 << 20; + smm->evt_qs_segment_size = 1 << 20; +#endif + + smm->last_transport_proto_type = TRANSPORT_PROTO_QUIC; + + return 0; +} + +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_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 (nitems >= 2048) + smm->configured_event_queue_length = nitems; + else + clib_warning ("event queue length %d too small, ignored", nitems); + } + else if (unformat (input, "preallocated-sessions %d", + &smm->preallocated_sessions)) + ; + else if (unformat (input, "v4-session-table-buckets %d", + &smm->configured_v4_session_table_buckets)) + ; + else if (unformat (input, "v4-halfopen-table-buckets %d", + &smm->configured_v4_halfopen_table_buckets)) + ; + else if (unformat (input, "v6-session-table-buckets %d", + &smm->configured_v6_session_table_buckets)) + ; + else if (unformat (input, "v6-halfopen-table-buckets %d", + &smm->configured_v6_halfopen_table_buckets)) + ; + else if (unformat (input, "v4-session-table-memory %U", + unformat_memory_size, &tmp)) + { + if (tmp >= 0x100000000) + return clib_error_return (0, "memory size %llx (%lld) too large", + tmp, tmp); + smm->configured_v4_session_table_memory = tmp; + } + else if (unformat (input, "v4-halfopen-table-memory %U", + unformat_memory_size, &tmp)) + { + if (tmp >= 0x100000000) + return clib_error_return (0, "memory size %llx (%lld) too large", + tmp, tmp); + smm->configured_v4_halfopen_table_memory = tmp; + } + else if (unformat (input, "v6-session-table-memory %U", + unformat_memory_size, &tmp)) + { + if (tmp >= 0x100000000) + return clib_error_return (0, "memory size %llx (%lld) too large", + tmp, tmp); + smm->configured_v6_session_table_memory = tmp; + } + else if (unformat (input, "v6-halfopen-table-memory %U", + unformat_memory_size, &tmp)) + { + if (tmp >= 0x100000000) + return clib_error_return (0, "memory size %llx (%lld) too large", + 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 if (unformat (input, "evt_qs_seg_size %U", unformat_memory_size, + &smm->evt_qs_segment_size)) + ; + else if (unformat (input, "enable")) + smm->session_enable_asap = 1; + else if (unformat (input, "use-app-socket-api")) + appns_sapi_enable (); + else + return clib_error_return (0, "unknown input `%U'", + format_unformat_error, input); + } return 0; } -VLIB_INIT_FUNCTION (session_manager_main_init) +VLIB_CONFIG_FUNCTION (session_config_fn, "session"); + /* * fd.io coding-style-patch-verification: ON *