X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_node.c;h=98965f334afa03b65668fd5d88be8c41fe7209fe;hb=d9818dd68c162079f3ddb5443a78d0d91d55d0fe;hp=b6c1b2f04f34e267a91ed5305ba46be91cc1ae40;hpb=b2371c25fed6b2e751163df590bb9d9a93a75a0f;p=vpp.git diff --git a/src/vnet/session/session_node.c b/src/vnet/session/session_node.c index b6c1b2f04f3..98965f334af 100644 --- a/src/vnet/session/session_node.c +++ b/src/vnet/session/session_node.c @@ -20,9 +20,193 @@ #include #include #include +#include #include #include +static void +session_mq_accepted_reply_handler (void *data) +{ + session_accepted_reply_msg_t *mp = (session_accepted_reply_msg_t *) data; + vnet_disconnect_args_t _a = { 0 }, *a = &_a; + stream_session_state_t old_state; + app_worker_t *app_wrk; + local_session_t *ls; + stream_session_t *s; + + /* Server isn't interested, kill the session */ + if (mp->retval) + { + a->app_index = mp->context; + a->handle = mp->handle; + vnet_disconnect_session (a); + return; + } + + if (session_handle_is_local (mp->handle)) + { + ls = application_get_local_session_from_handle (mp->handle); + if (!ls) + { + clib_warning ("unknown local handle 0x%lx", mp->handle); + return; + } + app_wrk = app_worker_get (ls->app_wrk_index); + if (app_wrk->app_index != mp->context) + { + clib_warning ("server %u doesn't own local handle 0x%lx", + mp->context, mp->handle); + return; + } + if (application_local_session_connect_notify (ls)) + return; + ls->session_state = SESSION_STATE_READY; + } + else + { + s = session_get_from_handle_if_valid (mp->handle); + if (!s) + return; + + app_wrk = app_worker_get (s->app_wrk_index); + if (app_wrk->app_index != mp->context) + { + clib_warning ("app doesn't own session"); + return; + } + + old_state = s->session_state; + s->session_state = SESSION_STATE_READY; + if (!svm_fifo_is_empty (s->server_rx_fifo)) + app_worker_lock_and_send_event (app_wrk, s, FIFO_EVENT_APP_RX); + + /* Closed while waiting for app to reply. Resend disconnect */ + if (old_state >= SESSION_STATE_TRANSPORT_CLOSING) + { + application_t *app = application_get (app_wrk->app_index); + app->cb_fns.session_disconnect_callback (s); + s->session_state = old_state; + return; + } + } +} + +static void +session_mq_reset_reply_handler (void *data) +{ + vnet_disconnect_args_t _a = { 0 }, *a = &_a; + session_reset_reply_msg_t *mp; + app_worker_t *app_wrk; + stream_session_t *s; + application_t *app; + u32 index, thread_index; + + mp = (session_reset_reply_msg_t *) data; + app = application_lookup (mp->context); + if (!app) + return; + + session_parse_handle (mp->handle, &index, &thread_index); + s = session_get_if_valid (index, thread_index); + + /* Session was already closed or already cleaned up */ + if (!s || s->session_state != SESSION_STATE_TRANSPORT_CLOSING) + return; + + app_wrk = app_worker_get (s->app_wrk_index); + if (!app_wrk || app_wrk->app_index != app->app_index) + { + clib_warning ("App % does not own handle 0x%lx!", app->app_index, + mp->handle); + return; + } + + /* Client objected to resetting the session, log and continue */ + if (mp->retval) + { + clib_warning ("client retval %d", mp->retval); + return; + } + + /* This comes as a response to a reset, transport only waiting for + * confirmation to remove connection state, no need to disconnect */ + a->handle = mp->handle; + a->app_index = app->app_index; + vnet_disconnect_session (a); +} + +static void +session_mq_disconnected_handler (void *data) +{ + session_disconnected_reply_msg_t *rmp; + vnet_disconnect_args_t _a, *a = &_a; + svm_msg_q_msg_t _msg, *msg = &_msg; + session_disconnected_msg_t *mp; + app_worker_t *app_wrk; + session_event_t *evt; + stream_session_t *s; + application_t *app; + int rv = 0; + + mp = (session_disconnected_msg_t *) data; + if (!(s = session_get_from_handle_if_valid (mp->handle))) + { + clib_warning ("could not disconnect handle %llu", mp->handle); + return; + } + app_wrk = app_worker_get (s->app_wrk_index); + app = application_lookup (mp->client_index); + if (!(app_wrk && app && app->app_index == app_wrk->app_index)) + { + clib_warning ("could not disconnect session: %llu app: %u", + mp->handle, mp->client_index); + return; + } + + a->handle = mp->handle; + a->app_index = app_wrk->wrk_index; + rv = vnet_disconnect_session (a); + + svm_msg_q_lock_and_alloc_msg_w_ring (app_wrk->event_queue, + SESSION_MQ_CTRL_EVT_RING, + SVM_Q_WAIT, msg); + svm_msg_q_unlock (app_wrk->event_queue); + evt = svm_msg_q_msg_data (app_wrk->event_queue, msg); + clib_memset (evt, 0, sizeof (*evt)); + evt->event_type = SESSION_CTRL_EVT_DISCONNECTED; + rmp = (session_disconnected_reply_msg_t *) evt->data; + rmp->handle = mp->handle; + rmp->context = mp->context; + rmp->retval = rv; + svm_msg_q_add (app_wrk->event_queue, msg, SVM_Q_WAIT); +} + +static void +session_mq_disconnected_reply_handler (void *data) +{ + session_disconnected_reply_msg_t *mp; + vnet_disconnect_args_t _a, *a = &_a; + application_t *app; + + mp = (session_disconnected_reply_msg_t *) data; + + /* Client objected to disconnecting the session, log and continue */ + if (mp->retval) + { + clib_warning ("client retval %d", mp->retval); + return; + } + + /* Disconnect has been confirmed. Confirm close to transport */ + app = application_lookup (mp->context); + if (app) + { + a->handle = mp->handle; + a->app_index = app->app_index; + vnet_disconnect_session (a); + } +} + vlib_node_registration_t session_queue_node; typedef struct @@ -44,8 +228,6 @@ format_session_queue_trace (u8 * s, va_list * args) return s; } -vlib_node_registration_t session_queue_node; - #define foreach_session_queue_error \ _(TX, "Packets transmitted") \ _(TIMER, "Timer events") \ @@ -65,29 +247,44 @@ static char *session_queue_error_strings[] = { #undef _ }; -always_inline void -session_tx_trace_buffer (vlib_main_t * vm, vlib_node_runtime_t * node, - u32 next_index, vlib_buffer_t * b, - stream_session_t * s, u32 * n_trace) +enum +{ + SESSION_TX_NO_BUFFERS = -2, + SESSION_TX_NO_DATA, + SESSION_TX_OK +}; + +static void +session_tx_trace_frame (vlib_main_t * vm, vlib_node_runtime_t * node, + u32 next_index, u32 * to_next, u16 n_segs, + stream_session_t * s, u32 n_trace) { session_queue_trace_t *t; - vlib_trace_buffer (vm, node, next_index, b, 1 /* follow_chain */ ); - vlib_set_trace_count (vm, node, --*n_trace); - t = vlib_add_trace (vm, node, b, sizeof (*t)); - t->session_index = s->session_index; - t->server_thread_index = s->thread_index; + vlib_buffer_t *b; + int i; + + for (i = 0; i < clib_min (n_trace, n_segs); i++) + { + b = vlib_get_buffer (vm, to_next[i - n_segs]); + vlib_trace_buffer (vm, node, next_index, b, 1 /* follow_chain */ ); + t = vlib_add_trace (vm, node, b, sizeof (*t)); + t->session_index = s->session_index; + t->server_thread_index = s->thread_index; + } + vlib_set_trace_count (vm, node, n_trace - i); } always_inline void session_tx_fifo_chain_tail (vlib_main_t * vm, session_tx_context_t * ctx, vlib_buffer_t * b, u16 * n_bufs, u8 peek_data) { - session_manager_main_t *smm = &session_manager_main; vlib_buffer_t *chain_b, *prev_b; u32 chain_bi0, to_deq, left_from_seg; + session_manager_worker_t *wrk; u16 len_to_deq, n_bytes_read; u8 *data, j; + wrk = session_manager_get_worker (ctx->s->thread_index); b->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID; b->total_length_not_including_first_buffer = 0; @@ -101,8 +298,8 @@ 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 = smm->tx_buffers[ctx->s->thread_index][*n_bufs]; - _vec_len (smm->tx_buffers[ctx->s->thread_index]) = *n_bufs; + chain_bi0 = wrk->tx_buffers[*n_bufs]; + _vec_len (wrk->tx_buffers) = *n_bufs; chain_b = vlib_get_buffer (vm, chain_bi0); chain_b->current_data = 0; @@ -128,7 +325,10 @@ session_tx_fifo_chain_tail (vlib_main_t * vm, session_tx_context_t * ctx, hdr->data_offset += n_bytes_read; if (hdr->data_offset == hdr->data_length) - svm_fifo_dequeue_drop (f, hdr->data_length); + { + u32 offset = hdr->data_length + SESSION_CONN_HDR_LEN; + svm_fifo_dequeue_drop (f, offset); + } } else n_bytes_read = svm_fifo_dequeue_nowait (ctx->s->server_tx_fifo, @@ -156,16 +356,15 @@ session_tx_fifo_chain_tail (vlib_main_t * vm, session_tx_context_t * ctx, always_inline int session_output_try_get_buffers (vlib_main_t * vm, - session_manager_main_t * smm, + session_manager_worker_t * wrk, u32 thread_index, u16 * n_bufs, u32 wanted) { u32 n_alloc; - vec_validate_aligned (smm->tx_buffers[thread_index], wanted - 1, - CLIB_CACHE_LINE_BYTES); - n_alloc = vlib_buffer_alloc (vm, &smm->tx_buffers[thread_index][*n_bufs], + vec_validate_aligned (wrk->tx_buffers, wanted - 1, CLIB_CACHE_LINE_BYTES); + n_alloc = vlib_buffer_alloc (vm, &wrk->tx_buffers[*n_bufs], wanted - *n_bufs); *n_bufs += n_alloc; - _vec_len (smm->tx_buffers[thread_index]) = *n_bufs; + _vec_len (wrk->tx_buffers) = *n_bufs; return n_alloc; } @@ -183,7 +382,6 @@ session_tx_fill_buffer (vlib_main_t * vm, session_tx_context_t * ctx, b->error = 0; b->flags = VNET_BUFFER_F_LOCALLY_ORIGINATED; b->current_data = 0; - b->total_length_not_including_first_buffer = 0; data0 = vlib_buffer_make_headroom (b, MAX_HDRS_LEN); len_to_deq = clib_min (ctx->left_to_snd, ctx->deq_per_first_buf); @@ -242,11 +440,11 @@ session_tx_fill_buffer (vlib_main_t * vm, session_tx_context_t * ctx, session_tx_fifo_chain_tail (vm, ctx, b, n_bufs, peek_data); /* *INDENT-OFF* */ - SESSION_EVT_DBG(SESSION_EVT_DEQ, s, ({ - ed->data[0] = e->event_type; - ed->data[1] = max_dequeue; + SESSION_EVT_DBG(SESSION_EVT_DEQ, ctx->s, ({ + ed->data[0] = FIFO_EVENT_APP_TX; + ed->data[1] = ctx->max_dequeue; ed->data[2] = len_to_deq; - ed->data[3] = left_to_snd; + ed->data[3] = ctx->left_to_snd; })); /* *INDENT-ON* */ } @@ -260,7 +458,7 @@ session_tx_not_ready (stream_session_t * s, u8 peek_data) * session is not ready or closed */ if (s->session_state < SESSION_STATE_READY) return 1; - if (s->session_state == SESSION_STATE_CLOSED) + if (s->session_state >= SESSION_STATE_TRANSPORT_CLOSED) return 2; } return 0; @@ -343,8 +541,7 @@ session_tx_set_dequeue_params (vlib_main_t * vm, session_tx_context_t * ctx, ctx->max_len_to_snd = max_segs * ctx->snd_mss; } - n_bytes_per_buf = vlib_buffer_free_list_buffer_size (vm, - VLIB_BUFFER_DEFAULT_FREE_LIST_INDEX); + n_bytes_per_buf = VLIB_BUFFER_DATA_SIZE; ASSERT (n_bytes_per_buf > MAX_HDRS_LEN); n_bytes_per_seg = MAX_HDRS_LEN + ctx->snd_mss; ctx->n_bufs_per_seg = ceil ((f64) n_bytes_per_seg / n_bytes_per_buf); @@ -355,15 +552,16 @@ session_tx_set_dequeue_params (vlib_main_t * vm, session_tx_context_t * ctx, always_inline int session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, - session_fifo_event_t * e, + session_event_t * e, stream_session_t * s, int *n_tx_packets, u8 peek_data) { - u32 next_index, next0, next1, next2, next3, *to_next, n_left_to_next; + u32 next_index, next0, next1, *to_next, n_left_to_next; u32 n_trace = vlib_get_trace_count (vm, node), n_bufs_needed = 0; u32 thread_index = s->thread_index, n_left, pbi; session_manager_main_t *smm = &session_manager_main; - session_tx_context_t *ctx = &smm->ctx[thread_index]; + session_manager_worker_t *wrk = &smm->wrk[thread_index]; + session_tx_context_t *ctx = &wrk->ctx; transport_proto_t tp; vlib_buffer_t *pb; u16 n_bufs, rv; @@ -371,23 +569,33 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, if (PREDICT_FALSE ((rv = session_tx_not_ready (s, peek_data)))) { if (rv < 2) - vec_add1 (smm->pending_event_vector[thread_index], *e); - return 0; + vec_add1 (wrk->pending_event_vector, *e); + return SESSION_TX_NO_DATA; } next_index = smm->session_type_to_next[s->session_type]; - next0 = next1 = next2 = next3 = next_index; + next0 = next1 = next_index; tp = session_get_transport_proto (s); ctx->s = s; ctx->transport_vft = transport_protocol_get_vft (tp); ctx->tc = session_tx_get_transport (ctx, peek_data); ctx->snd_mss = ctx->transport_vft->send_mss (ctx->tc); - ctx->snd_space = ctx->transport_vft->send_space (ctx->tc); + + if (PREDICT_FALSE (e->event_type == SESSION_IO_EVT_TX_FLUSH)) + { + if (ctx->transport_vft->flush_data) + ctx->transport_vft->flush_data (ctx->tc); + } + + ctx->snd_space = transport_connection_snd_space (ctx->tc, + vm->clib_time. + last_cpu_time, + ctx->snd_mss); if (ctx->snd_space == 0 || ctx->snd_mss == 0) { - vec_add1 (smm->pending_event_vector[thread_index], *e); - return 0; + vec_add1 (wrk->pending_event_vector, *e); + return SESSION_TX_NO_DATA; } /* Allow enqueuing of a new event */ @@ -398,9 +606,9 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, peek_data); if (PREDICT_FALSE (!ctx->max_len_to_snd)) - return 0; + return SESSION_TX_NO_DATA; - n_bufs = vec_len (smm->tx_buffers[thread_index]); + n_bufs = vec_len (wrk->tx_buffers); n_bufs_needed = ctx->n_segs_per_evt * ctx->n_bufs_per_seg; /* @@ -408,12 +616,12 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, */ if (n_bufs < n_bufs_needed) { - session_output_try_get_buffers (vm, smm, thread_index, &n_bufs, + session_output_try_get_buffers (vm, wrk, thread_index, &n_bufs, ctx->n_bufs_per_seg * VLIB_FRAME_SIZE); if (PREDICT_FALSE (n_bufs < n_bufs_needed)) { - vec_add1 (smm->pending_event_vector[thread_index], *e); - return -1; + vec_add1 (wrk->pending_event_vector, *e); + return SESSION_TX_NO_BUFFERS; } } @@ -428,86 +636,86 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, } ctx->left_to_snd = ctx->max_len_to_snd; n_left = ctx->n_segs_per_evt; - while (n_left) + + while (n_left >= 4) { - while (n_left >= 4) - { - vlib_buffer_t *b0, *b1; - u32 bi0, bi1; + vlib_buffer_t *b0, *b1; + u32 bi0, bi1; - pbi = smm->tx_buffers[thread_index][n_bufs - 3]; - pb = vlib_get_buffer (vm, pbi); - vlib_prefetch_buffer_header (pb, STORE); - pbi = smm->tx_buffers[thread_index][n_bufs - 4]; - pb = vlib_get_buffer (vm, pbi); - vlib_prefetch_buffer_header (pb, STORE); + pbi = wrk->tx_buffers[n_bufs - 3]; + pb = vlib_get_buffer (vm, pbi); + vlib_prefetch_buffer_header (pb, STORE); + pbi = wrk->tx_buffers[n_bufs - 4]; + pb = vlib_get_buffer (vm, pbi); + vlib_prefetch_buffer_header (pb, STORE); - to_next[0] = bi0 = smm->tx_buffers[thread_index][--n_bufs]; - to_next[1] = bi1 = smm->tx_buffers[thread_index][--n_bufs]; + to_next[0] = bi0 = wrk->tx_buffers[--n_bufs]; + to_next[1] = bi1 = wrk->tx_buffers[--n_bufs]; - b0 = vlib_get_buffer (vm, bi0); - b1 = vlib_get_buffer (vm, bi1); + b0 = vlib_get_buffer (vm, bi0); + b1 = vlib_get_buffer (vm, bi1); - session_tx_fill_buffer (vm, ctx, b0, &n_bufs, peek_data); - session_tx_fill_buffer (vm, ctx, b1, &n_bufs, peek_data); + session_tx_fill_buffer (vm, ctx, b0, &n_bufs, peek_data); + session_tx_fill_buffer (vm, ctx, b1, &n_bufs, peek_data); - ctx->transport_vft->push_header (ctx->tc, b0); - ctx->transport_vft->push_header (ctx->tc, b1); + ctx->transport_vft->push_header (ctx->tc, b0); + ctx->transport_vft->push_header (ctx->tc, b1); - to_next += 2; - n_left_to_next -= 2; - n_left -= 2; + to_next += 2; + n_left_to_next -= 2; + n_left -= 2; - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0); - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b1); + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0); + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b1); - if (PREDICT_FALSE (n_trace > 0)) - { - session_tx_trace_buffer (vm, node, next_index, b0, s, &n_trace); - if (n_trace) - session_tx_trace_buffer (vm, node, next_index, b1, s, - &n_trace); - } + vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next, + n_left_to_next, bi0, bi1, next0, + next1); + } + while (n_left) + { + vlib_buffer_t *b0; + u32 bi0; - vlib_validate_buffer_enqueue_x2 (vm, node, next_index, to_next, - n_left_to_next, bi0, bi1, - next0, next1); - } - while (n_left) + if (n_left > 1) { - vlib_buffer_t *b0; - u32 bi0; + pbi = wrk->tx_buffers[n_bufs - 2]; + pb = vlib_get_buffer (vm, pbi); + vlib_prefetch_buffer_header (pb, STORE); + } - ASSERT (n_bufs >= 1); - to_next[0] = bi0 = smm->tx_buffers[thread_index][--n_bufs]; - b0 = vlib_get_buffer (vm, bi0); - session_tx_fill_buffer (vm, ctx, b0, &n_bufs, peek_data); + to_next[0] = bi0 = wrk->tx_buffers[--n_bufs]; + b0 = vlib_get_buffer (vm, bi0); + session_tx_fill_buffer (vm, ctx, b0, &n_bufs, peek_data); - /* Ask transport to push header after current_length and - * total_length_not_including_first_buffer are updated */ - ctx->transport_vft->push_header (ctx->tc, b0); + /* Ask transport to push header after current_length and + * total_length_not_including_first_buffer are updated */ + ctx->transport_vft->push_header (ctx->tc, b0); - to_next += 1; - n_left_to_next -= 1; - n_left -= 1; + to_next += 1; + n_left_to_next -= 1; + n_left -= 1; - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0); - if (PREDICT_FALSE (n_trace > 0)) - session_tx_trace_buffer (vm, node, next_index, b0, s, &n_trace); + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0); - vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, - n_left_to_next, bi0, next0); - } + vlib_validate_buffer_enqueue_x1 (vm, node, next_index, to_next, + n_left_to_next, bi0, next0); } - _vec_len (smm->tx_buffers[thread_index]) = n_bufs; + + if (PREDICT_FALSE (n_trace > 0)) + session_tx_trace_frame (vm, node, next_index, to_next, + ctx->n_segs_per_evt, s, n_trace); + + _vec_len (wrk->tx_buffers) = n_bufs; *n_tx_packets += ctx->n_segs_per_evt; + transport_connection_update_tx_stats (ctx->tc, ctx->max_len_to_snd); vlib_put_next_frame (vm, node, next_index, n_left_to_next); /* If we couldn't dequeue all bytes mark as partially read */ ASSERT (ctx->left_to_snd == 0); if (ctx->max_len_to_snd < ctx->max_dequeue) if (svm_fifo_set_event (s->server_tx_fifo)) - vec_add1 (smm->pending_event_vector[thread_index], *e); + vec_add1 (wrk->pending_event_vector, *e); if (!peek_data && ctx->transport_vft->tx_type == TRANSPORT_TX_DGRAM) { @@ -518,65 +726,267 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, /* More data needs to be read */ else if (svm_fifo_max_dequeue (s->server_tx_fifo) > 0) if (svm_fifo_set_event (s->server_tx_fifo)) - vec_add1 (smm->pending_event_vector[thread_index], *e); + vec_add1 (wrk->pending_event_vector, *e); } - return 0; + return SESSION_TX_OK; } int session_tx_fifo_peek_and_snd (vlib_main_t * vm, vlib_node_runtime_t * node, - session_fifo_event_t * e0, - stream_session_t * s0, int *n_tx_pkts) + session_event_t * e, + stream_session_t * s, int *n_tx_pkts) { - return session_tx_fifo_read_and_snd_i (vm, node, e0, s0, n_tx_pkts, 1); + return session_tx_fifo_read_and_snd_i (vm, node, e, s, n_tx_pkts, 1); } int session_tx_fifo_dequeue_and_snd (vlib_main_t * vm, vlib_node_runtime_t * node, - session_fifo_event_t * e0, - stream_session_t * s0, int *n_tx_pkts) + session_event_t * e, + stream_session_t * s, int *n_tx_pkts) { - return session_tx_fifo_read_and_snd_i (vm, node, e0, s0, n_tx_pkts, 0); + return session_tx_fifo_read_and_snd_i (vm, node, e, s, n_tx_pkts, 0); } int session_tx_fifo_dequeue_internal (vlib_main_t * vm, vlib_node_runtime_t * node, - session_fifo_event_t * e0, - stream_session_t * s0, int *n_tx_pkts) + session_event_t * e, + stream_session_t * s, int *n_tx_pkts) { application_t *app; - app = application_get (s0->opaque); - svm_fifo_unset_event (s0->server_tx_fifo); - return app->cb_fns.builtin_app_tx_callback (s0); + if (PREDICT_FALSE (s->session_state == SESSION_STATE_CLOSED)) + return 0; + app = application_get (s->t_app_index); + svm_fifo_unset_event (s->server_tx_fifo); + return app->cb_fns.builtin_app_tx_callback (s); } always_inline stream_session_t * -session_event_get_session (session_fifo_event_t * e, u8 thread_index) +session_event_get_session (session_event_t * e, u8 thread_index) { return session_get_if_valid (e->fifo->master_session_index, thread_index); } +static void +session_update_dispatch_period (session_manager_worker_t * wrk, f64 now, + u32 thread_index) +{ + if (wrk->last_tx_packets) + { + f64 sample = now - wrk->last_vlib_time; + wrk->dispatch_period = (wrk->dispatch_period + sample) * 0.5; + } + wrk->last_vlib_time = now; +} + +static uword +session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * frame) +{ + session_manager_main_t *smm = vnet_get_session_manager_main (); + u32 thread_index = vm->thread_index, n_to_dequeue, n_events; + session_manager_worker_t *wrk = &smm->wrk[thread_index]; + session_event_t *e, *fifo_events; + svm_msg_q_msg_t _msg, *msg = &_msg; + f64 now = vlib_time_now (vm); + int n_tx_packets = 0, i, rv; + app_worker_t *app_wrk; + application_t *app; + svm_msg_q_t *mq; + void (*fp) (void *); + + SESSION_EVT_DBG (SESSION_EVT_POLL_GAP_TRACK, smm, thread_index); + + /* + * Update transport time + */ + session_update_dispatch_period (wrk, now, thread_index); + transport_update_time (now, thread_index); + + SESSION_EVT_DBG (SESSION_EVT_DEQ_NODE, 0); + + /* Make sure postponed events are handled first */ + fifo_events = wrk->free_event_vector; + vec_append (fifo_events, wrk->postponed_event_vector); + _vec_len (wrk->postponed_event_vector) = 0; + + /* Try to dequeue what is available. Don't wait for lock. + * XXX: we may need priorities here */ + mq = wrk->vpp_event_queue; + n_to_dequeue = svm_msg_q_size (mq); + if (n_to_dequeue && svm_msg_q_try_lock (mq) == 0) + { + for (i = 0; i < n_to_dequeue; i++) + { + vec_add2 (fifo_events, e, 1); + svm_msg_q_sub_w_lock (mq, msg); + /* Works because reply messages are smaller than a session evt. + * If we ever need to support bigger messages this needs to be + * fixed */ + clib_memcpy_fast (e, svm_msg_q_msg_data (mq, msg), sizeof (*e)); + svm_msg_q_free_msg (mq, msg); + } + svm_msg_q_unlock (mq); + } + + vec_append (fifo_events, wrk->pending_event_vector); + vec_append (fifo_events, wrk->pending_disconnects); + + _vec_len (wrk->pending_event_vector) = 0; + _vec_len (wrk->pending_disconnects) = 0; + + n_events = vec_len (fifo_events); + if (PREDICT_FALSE (!n_events)) + return 0; + + for (i = 0; i < n_events; i++) + { + stream_session_t *s; /* $$$ prefetch 1 ahead maybe */ + session_event_t *e; + u8 want_tx_evt; + + e = &fifo_events[i]; + switch (e->event_type) + { + case SESSION_IO_EVT_TX_FLUSH: + case FIFO_EVENT_APP_TX: + /* Don't try to send more that one frame per dispatch cycle */ + if (n_tx_packets == VLIB_FRAME_SIZE) + { + vec_add1 (wrk->postponed_event_vector, *e); + break; + } + + s = session_event_get_session (e, thread_index); + if (PREDICT_FALSE (!s)) + { + clib_warning ("session was freed!"); + continue; + } + + want_tx_evt = svm_fifo_want_tx_evt (s->server_tx_fifo); + /* Spray packets in per session type frames, since they go to + * different nodes */ + rv = (smm->session_tx_fns[s->session_type]) (vm, node, e, s, + &n_tx_packets); + if (PREDICT_TRUE (rv == SESSION_TX_OK)) + { + if (PREDICT_FALSE (want_tx_evt)) + { + svm_fifo_set_want_tx_evt (s->server_tx_fifo, 0); + session_dequeue_notify (s); + } + } + else if (PREDICT_FALSE (rv == SESSION_TX_NO_BUFFERS)) + { + vlib_node_increment_counter (vm, node->node_index, + SESSION_QUEUE_ERROR_NO_BUFFER, 1); + continue; + } + break; + case FIFO_EVENT_DISCONNECT: + s = session_get_from_handle_if_valid (e->session_handle); + if (PREDICT_FALSE (!s)) + break; + + /* Make sure session disconnects run after the pending list is + * drained, i.e., postpone if the first time. If not the first + * and the tx queue is still not empty, try to wait for some + * dispatch cycles */ + if (!e->postponed + || (e->postponed < 200 + && svm_fifo_max_dequeue (s->server_tx_fifo))) + { + e->postponed += 1; + vec_add1 (wrk->pending_disconnects, *e); + continue; + } + + session_transport_close (s); + break; + case FIFO_EVENT_BUILTIN_RX: + s = session_event_get_session (e, thread_index); + if (PREDICT_FALSE (!s || s->session_state >= SESSION_STATE_CLOSING)) + continue; + svm_fifo_unset_event (s->server_rx_fifo); + app_wrk = app_worker_get (s->app_wrk_index); + app = application_get (app_wrk->app_index); + app->cb_fns.builtin_app_rx_callback (s); + break; + case FIFO_EVENT_BUILTIN_TX: + s = session_get_from_handle_if_valid (e->session_handle); + if (PREDICT_TRUE (s != 0)) + session_tx_fifo_dequeue_internal (vm, node, e, s, &n_tx_packets); + break; + case FIFO_EVENT_RPC: + fp = e->rpc_args.fp; + (*fp) (e->rpc_args.arg); + break; + case SESSION_CTRL_EVT_DISCONNECTED: + session_mq_disconnected_handler (e->data); + break; + case SESSION_CTRL_EVT_ACCEPTED_REPLY: + session_mq_accepted_reply_handler (e->data); + break; + case SESSION_CTRL_EVT_CONNECTED_REPLY: + break; + case SESSION_CTRL_EVT_DISCONNECTED_REPLY: + session_mq_disconnected_reply_handler (e->data); + break; + case SESSION_CTRL_EVT_RESET_REPLY: + session_mq_reset_reply_handler (e->data); + break; + default: + clib_warning ("unhandled event type %d", e->event_type); + } + } + + _vec_len (fifo_events) = 0; + wrk->free_event_vector = fifo_events; + wrk->last_tx_packets = n_tx_packets; + + vlib_node_increment_counter (vm, session_queue_node.index, + SESSION_QUEUE_ERROR_TX, n_tx_packets); + + SESSION_EVT_DBG (SESSION_EVT_DISPATCH_END, smm, thread_index); + + return n_tx_packets; +} + +/* *INDENT-OFF* */ +VLIB_REGISTER_NODE (session_queue_node) = +{ + .function = session_queue_node_fn, + .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, + .state = VLIB_NODE_STATE_DISABLED, +}; +/* *INDENT-ON* */ + void dump_thread_0_event_queue (void) { session_manager_main_t *smm = vnet_get_session_manager_main (); vlib_main_t *vm = &vlib_global_main; u32 my_thread_index = vm->thread_index; - session_fifo_event_t _e, *e = &_e; + session_event_t _e, *e = &_e; + svm_msg_q_ring_t *ring; stream_session_t *s0; + svm_msg_q_msg_t *msg; + svm_msg_q_t *mq; int i, index; - i8 *headp; - - svm_queue_t *q; - q = smm->vpp_event_queues[my_thread_index]; - index = q->head; + mq = smm->wrk[my_thread_index].vpp_event_queue; + index = mq->q->head; - for (i = 0; i < q->cursize; i++) + for (i = 0; i < mq->q->cursize; i++) { - headp = (i8 *) (&q->data[0] + q->elsize * index); - clib_memcpy (e, headp, q->elsize); + msg = (svm_msg_q_msg_t *) (&mq->q->data[0] + mq->q->elsize * index); + ring = svm_msg_q_ring (mq, msg->ring_index); + clib_memcpy_fast (e, svm_msg_q_msg_data (mq, msg), ring->elsize); switch (e->event_type) { @@ -598,7 +1008,8 @@ dump_thread_0_event_queue (void) case FIFO_EVENT_RPC: fformat (stdout, "[%04d] RPC call %llx with %llx\n", - i, (u64) (e->rpc_args.fp), (u64) (e->rpc_args.arg)); + i, (u64) (uword) (e->rpc_args.fp), + (u64) (uword) (e->rpc_args.arg)); break; default: @@ -609,13 +1020,13 @@ dump_thread_0_event_queue (void) index++; - if (index == q->maxsize) + if (index == mq->q->maxsize) index = 0; } } static u8 -session_node_cmp_event (session_fifo_event_t * e, svm_fifo_t * f) +session_node_cmp_event (session_event_t * e, svm_fifo_t * f) { stream_session_t *s; switch (e->event_type) @@ -645,221 +1056,52 @@ session_node_cmp_event (session_fifo_event_t * e, svm_fifo_t * f) } u8 -session_node_lookup_fifo_event (svm_fifo_t * f, session_fifo_event_t * e) +session_node_lookup_fifo_event (svm_fifo_t * f, session_event_t * e) { - session_manager_main_t *smm = vnet_get_session_manager_main (); - svm_queue_t *q; - session_fifo_event_t *pending_event_vector, *evt; + session_event_t *pending_event_vector, *evt; + session_manager_worker_t *wrk; int i, index, found = 0; - i8 *headp; + svm_msg_q_msg_t *msg; + svm_msg_q_ring_t *ring; + svm_msg_q_t *mq; u8 thread_index; ASSERT (e); thread_index = f->master_thread_index; + wrk = session_manager_get_worker (thread_index); + /* * Search evt queue */ - q = smm->vpp_event_queues[thread_index]; - index = q->head; - for (i = 0; i < q->cursize; i++) + mq = wrk->vpp_event_queue; + index = mq->q->head; + for (i = 0; i < mq->q->cursize; i++) { - headp = (i8 *) (&q->data[0] + q->elsize * index); - clib_memcpy (e, headp, q->elsize); + msg = (svm_msg_q_msg_t *) (&mq->q->data[0] + mq->q->elsize * index); + ring = svm_msg_q_ring (mq, msg->ring_index); + clib_memcpy_fast (e, svm_msg_q_msg_data (mq, msg), ring->elsize); found = session_node_cmp_event (e, f); if (found) return 1; - if (++index == q->maxsize) + if (++index == mq->q->maxsize) index = 0; } /* * Search pending events vector */ - pending_event_vector = smm->pending_event_vector[thread_index]; + pending_event_vector = wrk->pending_event_vector; vec_foreach (evt, pending_event_vector) { found = session_node_cmp_event (evt, f); if (found) { - clib_memcpy (e, evt, sizeof (*evt)); + clib_memcpy_fast (e, evt, sizeof (*evt)); break; } } return found; } -static uword -session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, - vlib_frame_t * frame) -{ - session_manager_main_t *smm = vnet_get_session_manager_main (); - session_fifo_event_t *my_pending_event_vector, *e; - session_fifo_event_t *my_fifo_events; - u32 n_to_dequeue, n_events; - svm_queue_t *q; - application_t *app; - int n_tx_packets = 0; - u32 thread_index = vm->thread_index; - int i, rv; - f64 now = vlib_time_now (vm); - void (*fp) (void *); - - SESSION_EVT_DBG (SESSION_EVT_POLL_GAP_TRACK, smm, thread_index); - - /* - * Update transport time - */ - transport_update_time (now, thread_index); - - /* - * Get vpp queue events - */ - q = smm->vpp_event_queues[thread_index]; - if (PREDICT_FALSE (q == 0)) - return 0; - - my_fifo_events = smm->free_event_vector[thread_index]; - - /* min number of events we can dequeue without blocking */ - n_to_dequeue = q->cursize; - my_pending_event_vector = smm->pending_event_vector[thread_index]; - - if (!n_to_dequeue && !vec_len (my_pending_event_vector) - && !vec_len (smm->pending_disconnects[thread_index])) - return 0; - - SESSION_EVT_DBG (SESSION_EVT_DEQ_NODE, 0); - - /* - * If we didn't manage to process previous events try going - * over them again without dequeuing new ones. - */ - /* XXX: Block senders to sessions that can't keep up */ - if (0 && vec_len (my_pending_event_vector) >= 100) - { - clib_warning ("too many fifo events unsolved"); - goto skip_dequeue; - } - - /* See you in the next life, don't be late */ - if (pthread_mutex_trylock (&q->mutex)) - return 0; - - for (i = 0; i < n_to_dequeue; i++) - { - vec_add2 (my_fifo_events, e, 1); - svm_queue_sub_raw (q, (u8 *) e); - } - - /* The other side of the connection is not polling */ - if (q->cursize < (q->maxsize / 8)) - (void) pthread_cond_broadcast (&q->condvar); - pthread_mutex_unlock (&q->mutex); - - vec_append (my_fifo_events, my_pending_event_vector); - vec_append (my_fifo_events, smm->pending_disconnects[thread_index]); - - _vec_len (my_pending_event_vector) = 0; - smm->pending_event_vector[thread_index] = my_pending_event_vector; - _vec_len (smm->pending_disconnects[thread_index]) = 0; - -skip_dequeue: - n_events = vec_len (my_fifo_events); - for (i = 0; i < n_events; i++) - { - stream_session_t *s0; /* $$$ prefetch 1 ahead maybe */ - session_fifo_event_t *e0; - - e0 = &my_fifo_events[i]; - switch (e0->event_type) - { - case FIFO_EVENT_APP_TX: - if (n_tx_packets == VLIB_FRAME_SIZE) - { - vec_add1 (smm->pending_event_vector[thread_index], *e0); - break; - } - - s0 = session_event_get_session (e0, thread_index); - if (PREDICT_FALSE (!s0)) - { - clib_warning ("It's dead, Jim!"); - continue; - } - - /* Spray packets in per session type frames, since they go to - * different nodes */ - rv = (smm->session_tx_fns[s0->session_type]) (vm, node, e0, s0, - &n_tx_packets); - /* Out of buffers */ - if (PREDICT_FALSE (rv < 0)) - { - vlib_node_increment_counter (vm, node->node_index, - SESSION_QUEUE_ERROR_NO_BUFFER, 1); - continue; - } - break; - case FIFO_EVENT_DISCONNECT: - /* Make sure stream disconnects run after the pending list is drained */ - s0 = session_get_from_handle (e0->session_handle); - if (!e0->postponed) - { - e0->postponed = 1; - vec_add1 (smm->pending_disconnects[thread_index], *e0); - continue; - } - /* If tx queue is still not empty, wait a bit */ - if (svm_fifo_max_dequeue (s0->server_tx_fifo) - && e0->postponed < 200) - { - e0->postponed += 1; - vec_add1 (smm->pending_disconnects[thread_index], *e0); - continue; - } - - stream_session_disconnect_transport (s0); - break; - case FIFO_EVENT_BUILTIN_RX: - s0 = session_event_get_session (e0, thread_index); - if (PREDICT_FALSE (!s0)) - continue; - svm_fifo_unset_event (s0->server_rx_fifo); - app = application_get (s0->app_index); - app->cb_fns.builtin_app_rx_callback (s0); - break; - case FIFO_EVENT_RPC: - fp = e0->rpc_args.fp; - (*fp) (e0->rpc_args.arg); - break; - - default: - clib_warning ("unhandled event type %d", e0->event_type); - } - } - - _vec_len (my_fifo_events) = 0; - smm->free_event_vector[thread_index] = my_fifo_events; - - vlib_node_increment_counter (vm, session_queue_node.index, - SESSION_QUEUE_ERROR_TX, n_tx_packets); - - SESSION_EVT_DBG (SESSION_EVT_DEQ_NODE, 1); - - return n_tx_packets; -} - -/* *INDENT-OFF* */ -VLIB_REGISTER_NODE (session_queue_node) = -{ - .function = session_queue_node_fn, - .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, - .state = VLIB_NODE_STATE_DISABLED, -}; -/* *INDENT-ON* */ - static clib_error_t * session_queue_exit (vlib_main_t * vm) {