X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_node.c;h=7565b43b29bd630a63a91497ab2c634f83886f73;hb=2f09bfc8bedd7f5af3b336af43a2d515b61e6dae;hp=bd60bd7056b4bfac6a5993bfa9f66ea94410811a;hpb=af97221c6ae8f08716b3de212fa111b13282f241;p=vpp.git diff --git a/src/vnet/session/session_node.c b/src/vnet/session/session_node.c index bd60bd7056b..7565b43b29b 100644 --- a/src/vnet/session/session_node.c +++ b/src/vnet/session/session_node.c @@ -33,6 +33,43 @@ return; \ } +static void +session_wrk_timerfd_update (session_worker_t *wrk, u64 time_ns) +{ + struct itimerspec its; + + its.it_value.tv_sec = 0; + its.it_value.tv_nsec = time_ns; + its.it_interval.tv_sec = 0; + its.it_interval.tv_nsec = its.it_value.tv_nsec; + + if (timerfd_settime (wrk->timerfd, 0, &its, NULL) == -1) + clib_warning ("timerfd_settime"); +} + +always_inline u64 +session_wrk_tfd_timeout (session_wrk_state_t state, u32 thread_index) +{ + if (state == SESSION_WRK_INTERRUPT) + return thread_index ? 1e6 : vlib_num_workers () ? 5e8 : 1e6; + else if (state == SESSION_WRK_IDLE) + return thread_index ? 1e8 : vlib_num_workers () ? 5e8 : 1e8; + else + return 0; +} + +static inline void +session_wrk_set_state (session_worker_t *wrk, session_wrk_state_t state) +{ + u64 time_ns; + + wrk->state = state; + if (wrk->timerfd == -1) + return; + time_ns = session_wrk_tfd_timeout (state, wrk->vm->thread_index); + session_wrk_timerfd_update (wrk, time_ns); +} + static transport_endpt_ext_cfg_t * session_mq_get_ext_config (application_t *app, uword offset) { @@ -136,6 +173,7 @@ session_mq_connect_one (session_connect_msg_t *mp) a->sep.port = mp->port; a->sep.transport_proto = mp->proto; a->sep.peer.fib_index = mp->vrf; + a->sep.dscp = mp->dscp; clib_memcpy_fast (&a->sep.peer.ip, &mp->lcl_ip, sizeof (mp->lcl_ip)); if (mp->is_ip4) { @@ -170,17 +208,18 @@ session_mq_handle_connects_rpc (void *arg) u32 max_connects = 32, n_connects = 0; vlib_main_t *vm = vlib_get_main (); session_evt_elt_t *he, *elt, *next; - session_worker_t *fwrk; - u8 need_reschedule = 1; + session_worker_t *fwrk, *wrk; ASSERT (vlib_get_thread_index () == 0); /* Pending connects on linked list pertaining to first worker */ fwrk = session_main_get_worker (1); + if (!fwrk->n_pending_connects) + goto update_state; vlib_worker_thread_barrier_sync (vm); - he = pool_elt_at_index (fwrk->event_elts, fwrk->pending_connects); + he = clib_llist_elt (fwrk->event_elts, fwrk->pending_connects); elt = clib_llist_next (fwrk->event_elts, evt_list, he); /* Avoid holding the barrier for too long */ @@ -189,23 +228,51 @@ session_mq_handle_connects_rpc (void *arg) next = clib_llist_next (fwrk->event_elts, evt_list, elt); clib_llist_remove (fwrk->event_elts, evt_list, elt); session_mq_connect_one (session_evt_ctrl_data (fwrk, elt)); - session_evt_elt_free (fwrk, elt); + session_evt_ctrl_data_free (fwrk, elt); + clib_llist_put (fwrk->event_elts, elt); elt = next; n_connects += 1; } - if (clib_llist_is_empty (fwrk->event_elts, evt_list, he)) - { - fwrk->pending_connects_ntf = 0; - need_reschedule = 0; - } + /* Decrement with worker barrier */ + fwrk->n_pending_connects -= n_connects; vlib_worker_thread_barrier_release (vm); - if (need_reschedule) +update_state: + + /* Switch worker to poll mode if it was in interrupt mode and had work or + * back to interrupt if threshold of loops without a connect is passed. + * While in poll mode, reprogram connects rpc */ + wrk = session_main_get_worker (0); + if (wrk->state != SESSION_WRK_POLLING) + { + if (n_connects) + { + session_wrk_set_state (wrk, SESSION_WRK_POLLING); + vlib_node_set_state (vm, session_queue_node.index, + VLIB_NODE_STATE_POLLING); + wrk->no_connect_loops = 0; + } + } + else + { + if (!n_connects) + { + if (++wrk->no_connect_loops > 1e5) + { + session_wrk_set_state (wrk, SESSION_WRK_INTERRUPT); + vlib_node_set_state (vm, session_queue_node.index, + VLIB_NODE_STATE_INTERRUPT); + } + } + else + wrk->no_connect_loops = 0; + } + + if (wrk->state == SESSION_WRK_POLLING) { - vlib_node_set_interrupt_pending (vm, session_queue_node.index); - elt = session_evt_alloc_ctrl (session_main_get_worker (0)); + elt = session_evt_alloc_ctrl (wrk); elt->evt.event_type = SESSION_CTRL_EVT_RPC; elt->evt.rpc_args.fp = session_mq_handle_connects_rpc; } @@ -231,15 +298,16 @@ session_mq_connect_handler (session_worker_t *wrk, session_evt_elt_t *elt) } /* Add to pending list to be handled by main thread */ - he = pool_elt_at_index (wrk->event_elts, wrk->pending_connects); + he = clib_llist_elt (wrk->event_elts, wrk->pending_connects); clib_llist_add_tail (wrk->event_elts, evt_list, elt, he); - if (!wrk->pending_connects_ntf) + /* Decremented with worker barrier */ + wrk->n_pending_connects += 1; + if (wrk->n_pending_connects == 1) { vlib_node_set_interrupt_pending (vlib_get_main_by_index (0), session_queue_node.index); session_send_rpc_evt_to_thread (0, session_mq_handle_connects_rpc, 0); - wrk->pending_connects_ntf = 1; } } @@ -321,15 +389,18 @@ app_mq_detach_handler (void *data) } static void -session_mq_unlisten_handler (void *data) +session_mq_unlisten_rpc (session_unlisten_msg_t *mp) { - session_unlisten_msg_t *mp = (session_unlisten_msg_t *) data; + vlib_main_t *vm = vlib_get_main (); vnet_unlisten_args_t _a, *a = &_a; app_worker_t *app_wrk; + session_handle_t sh; application_t *app; + u32 context; int rv; - app_check_thread_and_barrier (session_mq_unlisten_handler, mp); + sh = mp->handle; + context = mp->context; app = application_lookup (mp->client_index); if (!app) @@ -337,16 +408,41 @@ session_mq_unlisten_handler (void *data) clib_memset (a, 0, sizeof (*a)); a->app_index = app->app_index; - a->handle = mp->handle; + a->handle = sh; a->wrk_map_index = mp->wrk_index; + + vlib_worker_thread_barrier_sync (vm); + if ((rv = vnet_unlisten (a))) clib_warning ("unlisten returned: %d", rv); + vlib_worker_thread_barrier_release (vm); + app_wrk = application_get_worker (app, a->wrk_map_index); if (!app_wrk) return; - mq_send_unlisten_reply (app_wrk, mp->handle, mp->context, rv); + mq_send_unlisten_reply (app_wrk, sh, context, rv); + clib_mem_free (mp); +} + +static void +session_mq_unlisten_handler (session_worker_t *wrk, session_evt_elt_t *elt) +{ + u32 thread_index = wrk - session_main.wrk; + session_unlisten_msg_t *mp, *arg; + + mp = session_evt_ctrl_data (wrk, elt); + arg = clib_mem_alloc (sizeof (session_unlisten_msg_t)); + clib_memcpy_fast (arg, mp, sizeof (*arg)); + + if (PREDICT_FALSE (!thread_index)) + { + session_mq_unlisten_rpc (arg); + return; + } + + session_send_rpc_evt_to_thread_force (0, session_mq_unlisten_rpc, arg); } static void @@ -391,7 +487,7 @@ session_mq_accepted_reply_handler (void *data) if (!session_has_transport (s)) { s->session_state = SESSION_STATE_READY; - if (ct_session_connect_notify (s)) + if (ct_session_connect_notify (s, SESSION_E_NONE)) return; } else @@ -700,21 +796,21 @@ format_session_queue_trace (u8 * s, va_list * args) return s; } -#define foreach_session_queue_error \ -_(TX, "Packets transmitted") \ -_(TIMER, "Timer events") \ -_(NO_BUFFER, "Out of buffers") +#define foreach_session_queue_error \ + _ (TX, tx, INFO, "Packets transmitted") \ + _ (TIMER, timer, INFO, "Timer events") \ + _ (NO_BUFFER, no_buffer, ERROR, "Out of buffers") typedef enum { -#define _(sym,str) SESSION_QUEUE_ERROR_##sym, +#define _(f, n, s, d) SESSION_QUEUE_ERROR_##f, foreach_session_queue_error #undef _ SESSION_QUEUE_N_ERROR, } session_queue_error_t; -static char *session_queue_error_strings[] = { -#define _(sym,string) string, +static vlib_error_desc_t session_error_counters[] = { +#define _(f, n, s, d) { #n, d, VL_COUNTER_SEVERITY_##s }, foreach_session_queue_error #undef _ }; @@ -756,11 +852,9 @@ session_tx_fifo_chain_tail (vlib_main_t * vm, session_tx_context_t * ctx, { vlib_buffer_t *chain_b, *prev_b; u32 chain_bi0, to_deq, left_from_seg; - session_worker_t *wrk; u16 len_to_deq, n_bytes_read; u8 *data, j; - wrk = session_main_get_worker (ctx->s->thread_index); b->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID; b->total_length_not_including_first_buffer = 0; @@ -774,7 +868,7 @@ session_tx_fifo_chain_tail (vlib_main_t * vm, session_tx_context_t * ctx, len_to_deq = clib_min (to_deq, ctx->deq_per_buf); *n_bufs -= 1; - chain_bi0 = wrk->tx_buffers[*n_bufs]; + chain_bi0 = ctx->tx_buffers[*n_bufs]; chain_b = vlib_get_buffer (vm, chain_bi0); chain_b->current_data = 0; data = vlib_buffer_get_current (chain_b); @@ -880,7 +974,7 @@ session_tx_fill_buffer (vlib_main_t * vm, session_tx_context_t * ctx, n_bytes_read = svm_fifo_peek (f, offset, deq_now, data0); ASSERT (n_bytes_read > 0); - if (ctx->s->session_state == SESSION_STATE_LISTENING) + if (transport_connection_is_cless (ctx->tc)) { ip_copy (&ctx->tc->rmt_ip, &hdr->rmt_ip, ctx->tc->is_ip4); ctx->tc->rmt_port = hdr->rmt_port; @@ -925,7 +1019,15 @@ session_tx_not_ready (session_t * s, u8 peek_data) /* Can retransmit for closed sessions but can't send new data if * session is not ready or closed */ else if (s->session_state < SESSION_STATE_READY) - return 1; + { + /* Allow accepting session to send custom packets. + * For instance, tcp want to send acks in established, but + * the app has not called accept() yet */ + if (s->session_state == SESSION_STATE_ACCEPTING && + (s->flags & SESSION_F_CUSTOM_TX)) + return 0; + return 1; + } else if (s->session_state >= SESSION_STATE_TRANSPORT_CLOSED) { /* Allow closed transports to still send custom packets. @@ -1188,13 +1290,13 @@ session_tx_fifo_read_and_snd_i (session_worker_t * wrk, return SESSION_TX_NO_DATA; } - vec_validate_aligned (wrk->tx_buffers, ctx->n_bufs_needed - 1, + vec_validate_aligned (ctx->tx_buffers, ctx->n_bufs_needed - 1, CLIB_CACHE_LINE_BYTES); - n_bufs = vlib_buffer_alloc (vm, wrk->tx_buffers, ctx->n_bufs_needed); + n_bufs = vlib_buffer_alloc (vm, ctx->tx_buffers, ctx->n_bufs_needed); if (PREDICT_FALSE (n_bufs < ctx->n_bufs_needed)) { if (n_bufs) - vlib_buffer_free (vm, wrk->tx_buffers, n_bufs); + vlib_buffer_free (vm, ctx->tx_buffers, n_bufs); session_evt_add_head_old (wrk, elt); vlib_node_increment_counter (wrk->vm, node->node_index, SESSION_QUEUE_ERROR_NO_BUFFER, 1); @@ -1212,15 +1314,15 @@ session_tx_fifo_read_and_snd_i (session_worker_t * wrk, vlib_buffer_t *b0, *b1; u32 bi0, bi1; - pbi = wrk->tx_buffers[n_bufs - 3]; + pbi = ctx->tx_buffers[n_bufs - 3]; pb = vlib_get_buffer (vm, pbi); vlib_prefetch_buffer_header (pb, STORE); - pbi = wrk->tx_buffers[n_bufs - 4]; + pbi = ctx->tx_buffers[n_bufs - 4]; pb = vlib_get_buffer (vm, pbi); vlib_prefetch_buffer_header (pb, STORE); - bi0 = wrk->tx_buffers[--n_bufs]; - bi1 = wrk->tx_buffers[--n_bufs]; + bi0 = ctx->tx_buffers[--n_bufs]; + bi1 = ctx->tx_buffers[--n_bufs]; b0 = vlib_get_buffer (vm, bi0); b1 = vlib_get_buffer (vm, bi1); @@ -1245,12 +1347,12 @@ session_tx_fifo_read_and_snd_i (session_worker_t * wrk, if (n_left > 1) { - pbi = wrk->tx_buffers[n_bufs - 2]; + pbi = ctx->tx_buffers[n_bufs - 2]; pb = vlib_get_buffer (vm, pbi); vlib_prefetch_buffer_header (pb, STORE); } - bi0 = wrk->tx_buffers[--n_bufs]; + bi0 = ctx->tx_buffers[--n_bufs]; b0 = vlib_get_buffer (vm, bi0); session_tx_fill_buffer (vm, ctx, b0, &n_bufs, peek_data); @@ -1269,7 +1371,7 @@ session_tx_fifo_read_and_snd_i (session_worker_t * wrk, ctx->n_segs_per_evt, ctx->s, n_trace); if (PREDICT_FALSE (n_bufs)) - vlib_buffer_free (vm, wrk->tx_buffers, n_bufs); + vlib_buffer_free (vm, ctx->tx_buffers, n_bufs); *n_tx_packets += ctx->n_segs_per_evt; @@ -1404,7 +1506,7 @@ session_event_dispatch_ctrl (session_worker_t * wrk, session_evt_elt_t * elt) session_mq_listen_uri_handler (session_evt_ctrl_data (wrk, elt)); break; case SESSION_CTRL_EVT_UNLISTEN: - session_mq_unlisten_handler (session_evt_ctrl_data (wrk, elt)); + session_mq_unlisten_handler (wrk, elt); break; case SESSION_CTRL_EVT_CONNECT: session_mq_connect_handler (wrk, elt); @@ -1448,13 +1550,13 @@ session_event_dispatch_ctrl (session_worker_t * wrk, session_evt_elt_t * elt) } /* Regrab elements in case pool moved */ - elt = pool_elt_at_index (wrk->event_elts, ei); + elt = clib_llist_elt (wrk->event_elts, ei); if (!clib_llist_elt_is_linked (elt, evt_list)) { e = &elt->evt; if (e->event_type >= SESSION_CTRL_EVT_BOUND) session_evt_ctrl_data_free (wrk, elt); - session_evt_elt_free (wrk, elt); + clib_llist_put (wrk->event_elts, elt); } SESSION_EVT (SESSION_EVT_COUNTS, CNT_CTRL_EVTS, 1, wrk); } @@ -1479,7 +1581,7 @@ session_event_dispatch_io (session_worker_t * wrk, vlib_node_runtime_t * node, s = session_event_get_session (wrk, e); if (PREDICT_FALSE (!s)) break; - CLIB_PREFETCH (s->tx_fifo, 2 * CLIB_CACHE_LINE_BYTES, LOAD); + CLIB_PREFETCH (s->tx_fifo, sizeof (*(s->tx_fifo)), LOAD); wrk->ctx.s = s; /* Spray packets in per session type frames, since they go to * different nodes */ @@ -1513,9 +1615,9 @@ session_event_dispatch_io (session_worker_t * wrk, vlib_node_runtime_t * node, SESSION_EVT (SESSION_IO_EVT_COUNTS, e->event_type, 1, wrk); /* Regrab elements in case pool moved */ - elt = pool_elt_at_index (wrk->event_elts, ei); + elt = clib_llist_elt (wrk->event_elts, ei); if (!clib_llist_elt_is_linked (elt, evt_list)) - session_evt_elt_free (wrk, elt); + clib_llist_put (wrk->event_elts, elt); } /* *INDENT-OFF* */ @@ -1559,9 +1661,9 @@ static void session_flush_pending_tx_buffers (session_worker_t * wrk, vlib_node_runtime_t * node) { - vlib_buffer_enqueue_to_next (wrk->vm, node, wrk->pending_tx_buffers, - wrk->pending_tx_nexts, - vec_len (wrk->pending_tx_nexts)); + vlib_buffer_enqueue_to_next_vec (wrk->vm, node, &wrk->pending_tx_buffers, + &wrk->pending_tx_nexts, + vec_len (wrk->pending_tx_nexts)); vec_reset_length (wrk->pending_tx_buffers); vec_reset_length (wrk->pending_tx_nexts); } @@ -1585,41 +1687,6 @@ session_wrk_handle_mq (session_worker_t *wrk, svm_msg_q_t *mq) return n_to_dequeue; } -static void -session_wrk_timerfd_update (session_worker_t *wrk, u64 time_ns) -{ - struct itimerspec its; - - its.it_value.tv_sec = 0; - its.it_value.tv_nsec = time_ns; - its.it_interval.tv_sec = 0; - its.it_interval.tv_nsec = its.it_value.tv_nsec; - - if (timerfd_settime (wrk->timerfd, 0, &its, NULL) == -1) - clib_warning ("timerfd_settime"); -} - -always_inline u64 -session_wrk_tfd_timeout (session_wrk_state_t state, u32 thread_index) -{ - if (state == SESSION_WRK_INTERRUPT) - return thread_index ? 1e6 : vlib_num_workers () ? 5e8 : 1e6; - else if (state == SESSION_WRK_IDLE) - return thread_index ? 1e8 : vlib_num_workers () ? 5e8 : 1e8; - else - return 0; -} - -static inline void -session_wrk_set_state (session_worker_t *wrk, session_wrk_state_t state) -{ - u64 time_ns; - - wrk->state = state; - time_ns = session_wrk_tfd_timeout (state, wrk->vm->thread_index); - session_wrk_timerfd_update (wrk, time_ns); -} - static void session_wrk_update_state (session_worker_t *wrk) { @@ -1627,7 +1694,7 @@ session_wrk_update_state (session_worker_t *wrk) if (wrk->state == SESSION_WRK_POLLING) { - if (pool_elts (wrk->event_elts) == 3 && + if (clib_llist_elts (wrk->event_elts) == 4 && vlib_last_vectors_per_main_loop (vm) < 1) { session_wrk_set_state (wrk, SESSION_WRK_INTERRUPT); @@ -1637,7 +1704,7 @@ session_wrk_update_state (session_worker_t *wrk) } else if (wrk->state == SESSION_WRK_INTERRUPT) { - if (pool_elts (wrk->event_elts) > 3 || + if (clib_llist_elts (wrk->event_elts) > 4 || vlib_last_vectors_per_main_loop (vm) > 1) { session_wrk_set_state (wrk, SESSION_WRK_POLLING); @@ -1651,7 +1718,7 @@ session_wrk_update_state (session_worker_t *wrk) } else { - if (pool_elts (wrk->event_elts)) + if (clib_llist_elts (wrk->event_elts)) { session_wrk_set_state (wrk, SESSION_WRK_INTERRUPT); } @@ -1691,12 +1758,18 @@ session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, * Handle control events */ - ctrl_he = pool_elt_at_index (wrk->event_elts, wrk->ctrl_head); - - clib_llist_foreach_safe (wrk->event_elts, evt_list, ctrl_he, elt, ({ - clib_llist_remove (wrk->event_elts, evt_list, elt); - session_event_dispatch_ctrl (wrk, elt); - })); + ei = wrk->ctrl_head; + ctrl_he = clib_llist_elt (wrk->event_elts, ei); + next_ei = clib_llist_next_index (ctrl_he, evt_list); + old_ti = clib_llist_prev_index (ctrl_he, evt_list); + while (ei != old_ti) + { + ei = next_ei; + elt = clib_llist_elt (wrk->event_elts, next_ei); + next_ei = clib_llist_next_index (elt, evt_list); + clib_llist_remove (wrk->event_elts, evt_list, elt); + session_event_dispatch_ctrl (wrk, elt); + } SESSION_EVT (SESSION_EVT_DSP_CNTRS, CTRL_EVTS, wrk); @@ -1704,14 +1777,14 @@ session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, * Handle the new io events. */ - new_he = pool_elt_at_index (wrk->event_elts, wrk->new_head); - old_he = pool_elt_at_index (wrk->event_elts, wrk->old_head); + new_he = clib_llist_elt (wrk->event_elts, wrk->new_head); + old_he = clib_llist_elt (wrk->event_elts, wrk->old_head); old_ti = clib_llist_prev_index (old_he, evt_list); ei = clib_llist_next_index (new_he, evt_list); while (ei != wrk->new_head && n_tx_packets < SESSION_NODE_FRAME_SIZE) { - elt = pool_elt_at_index (wrk->event_elts, ei); + elt = clib_llist_elt (wrk->event_elts, ei); ei = clib_llist_next_index (elt, evt_list); clib_llist_remove (wrk->event_elts, evt_list, elt); session_event_dispatch_io (wrk, node, elt, &n_tx_packets); @@ -1725,12 +1798,12 @@ session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, if (old_ti != wrk->old_head) { - old_he = pool_elt_at_index (wrk->event_elts, wrk->old_head); + old_he = clib_llist_elt (wrk->event_elts, wrk->old_head); ei = clib_llist_next_index (old_he, evt_list); while (n_tx_packets < SESSION_NODE_FRAME_SIZE) { - elt = pool_elt_at_index (wrk->event_elts, ei); + elt = clib_llist_elt (wrk->event_elts, ei); next_ei = clib_llist_next_index (elt, evt_list); clib_llist_remove (wrk->event_elts, evt_list, elt); @@ -1760,15 +1833,14 @@ session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, } /* *INDENT-OFF* */ -VLIB_REGISTER_NODE (session_queue_node) = -{ +VLIB_REGISTER_NODE (session_queue_node) = { .function = session_queue_node_fn, .flags = VLIB_NODE_FLAG_TRACE_SUPPORTED, .name = "session-queue", .format_trace = format_session_queue_trace, .type = VLIB_NODE_TYPE_INPUT, - .n_errors = ARRAY_LEN (session_queue_error_strings), - .error_strings = session_queue_error_strings, + .n_errors = SESSION_QUEUE_N_ERROR, + .error_counters = session_error_counters, .state = VLIB_NODE_STATE_DISABLED, }; /* *INDENT-ON* */