X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_node.c;h=e8ed1cf9b95ab5b64cc03c2a8bd6622beabfcbf1;hb=e96bf63bd0dc483179dc595b65ebd8bf2b310b8b;hp=350282bd90211ce3f01f3eee30ac5b503ec42c79;hpb=3c2fed5145d9e40a9ecd178c2866c813eddc6203;p=vpp.git diff --git a/src/vnet/session/session_node.c b/src/vnet/session/session_node.c index 350282bd902..e8ed1cf9b95 100644 --- a/src/vnet/session/session_node.c +++ b/src/vnet/session/session_node.c @@ -20,9 +20,181 @@ #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; + 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); + /* Closed while waiting for app to reply */ + if (!s || s->session_state > SESSION_STATE_READY) + 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; + } + 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); + } +} + +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 +216,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") \ @@ -72,7 +242,6 @@ enum 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, @@ -97,12 +266,13 @@ 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; @@ -116,8 +286,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; @@ -143,7 +313,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, @@ -171,16 +344,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; } @@ -369,7 +541,7 @@ 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) { @@ -377,7 +549,8 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, 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; @@ -385,7 +558,7 @@ 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); + vec_add1 (wrk->pending_event_vector, *e); return SESSION_TX_NO_DATA; } @@ -397,10 +570,20 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, 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); + vec_add1 (wrk->pending_event_vector, *e); return SESSION_TX_NO_DATA; } @@ -414,7 +597,7 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, if (PREDICT_FALSE (!ctx->max_len_to_snd)) 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; /* @@ -422,11 +605,11 @@ 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); + vec_add1 (wrk->pending_event_vector, *e); return SESSION_TX_NO_BUFFERS; } } @@ -448,15 +631,15 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, vlib_buffer_t *b0, *b1; u32 bi0, bi1; - pbi = smm->tx_buffers[thread_index][n_bufs - 3]; + pbi = wrk->tx_buffers[n_bufs - 3]; pb = vlib_get_buffer (vm, pbi); vlib_prefetch_buffer_header (pb, STORE); - pbi = smm->tx_buffers[thread_index][n_bufs - 4]; + 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); @@ -485,12 +668,12 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, if (n_left > 1) { - pbi = smm->tx_buffers[thread_index][n_bufs - 2]; + pbi = wrk->tx_buffers[n_bufs - 2]; 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[0] = bi0 = wrk->tx_buffers[--n_bufs]; b0 = vlib_get_buffer (vm, bi0); session_tx_fill_buffer (vm, ctx, b0, &n_bufs, peek_data); @@ -512,15 +695,16 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, session_tx_trace_frame (vm, node, next_index, to_next, ctx->n_segs_per_evt, s, n_trace); - _vec_len (smm->tx_buffers[thread_index]) = n_bufs; + _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) { @@ -531,14 +715,14 @@ 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 SESSION_TX_OK; } int session_tx_fifo_peek_and_snd (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_pkts) { return session_tx_fifo_read_and_snd_i (vm, node, e, s, n_tx_pkts, 1); @@ -546,7 +730,7 @@ session_tx_fifo_peek_and_snd (vlib_main_t * vm, vlib_node_runtime_t * node, int session_tx_fifo_dequeue_and_snd (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_pkts) { return session_tx_fifo_read_and_snd_i (vm, node, e, s, n_tx_pkts, 0); @@ -555,32 +739,47 @@ session_tx_fifo_dequeue_and_snd (vlib_main_t * vm, vlib_node_runtime_t * node, int session_tx_fifo_dequeue_internal (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_pkts) { application_t *app; - app = application_get (s->opaque); + 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_fifo_event_t *pending_events, *e; - session_fifo_event_t *fifo_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 *); @@ -590,92 +789,82 @@ session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, /* * Update transport time */ + session_update_dispatch_period (wrk, now, thread_index); transport_update_time (now, thread_index); - /* - * Get vpp queue events that we can dequeue without blocking - */ - mq = smm->vpp_event_queues[thread_index]; - fifo_events = smm->free_event_vector[thread_index]; - n_to_dequeue = svm_msg_q_size (mq); - pending_events = smm->pending_event_vector[thread_index]; - - if (!n_to_dequeue && !vec_len (pending_events) - && !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: Handle senders to sessions that can't keep up - */ - if (0 && vec_len (pending_events) >= 100) - { - clib_warning ("too many fifo events unsolved"); - goto skip_dequeue; - } + /* 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; - /* See you in the next life, don't be late + /* Try to dequeue what is available. Don't wait for lock. * XXX: we may need priorities here */ - if (svm_msg_q_try_lock (mq)) - return 0; - - for (i = 0; i < n_to_dequeue; i++) + mq = wrk->vpp_event_queue; + n_to_dequeue = svm_msg_q_size (mq); + if (n_to_dequeue && svm_msg_q_try_lock (mq) == 0) { - vec_add2 (fifo_events, e, 1); - svm_msg_q_sub_w_lock (mq, msg); - clib_memcpy (e, svm_msg_q_msg_data (mq, msg), sizeof (*e)); - svm_msg_q_free_msg (mq, msg); + 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); } - svm_msg_q_unlock (mq); + vec_append (fifo_events, wrk->pending_event_vector); + vec_append (fifo_events, wrk->pending_disconnects); - vec_append (fifo_events, pending_events); - vec_append (fifo_events, smm->pending_disconnects[thread_index]); + _vec_len (wrk->pending_event_vector) = 0; + _vec_len (wrk->pending_disconnects) = 0; - _vec_len (pending_events) = 0; - smm->pending_event_vector[thread_index] = pending_events; - _vec_len (smm->pending_disconnects[thread_index]) = 0; - -skip_dequeue: 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_fifo_event_t *e; - u32 to_dequeue; + 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 (smm->pending_event_vector[thread_index], *e); + vec_add1 (wrk->postponed_event_vector, *e); break; } s = session_event_get_session (e, thread_index); if (PREDICT_FALSE (!s)) { - clib_warning ("It's dead, Jim!"); + clib_warning ("session was freed!"); continue; } - to_dequeue = svm_fifo_max_dequeue (s->server_tx_fifo); + 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)) { - /* Notify app there's tx space if not polling */ - if (PREDICT_FALSE (to_dequeue == s->server_tx_fifo->nitems - && !svm_fifo_has_event (s->server_tx_fifo))) - session_dequeue_notify (s); + 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)) { @@ -685,19 +874,20 @@ skip_dequeue: } break; case FIFO_EVENT_DISCONNECT: - /* Make sure stream disconnects run after the pending list is - * drained */ - s = session_get_from_handle (e->session_handle); - if (!e->postponed) - { - e->postponed = 1; - vec_add1 (smm->pending_disconnects[thread_index], *e); - continue; - } - /* If tx queue is still not empty, wait */ - if (svm_fifo_max_dequeue (s->server_tx_fifo)) + 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))) { - vec_add1 (smm->pending_disconnects[thread_index], *e); + e->postponed += 1; + vec_add1 (wrk->pending_disconnects, *e); continue; } @@ -705,24 +895,44 @@ skip_dequeue: break; case FIFO_EVENT_BUILTIN_RX: s = session_event_get_session (e, thread_index); - if (PREDICT_FALSE (!s)) + if (PREDICT_FALSE (!s || s->session_state >= SESSION_STATE_CLOSING)) continue; svm_fifo_unset_event (s->server_rx_fifo); - app = application_get (s->app_index); + 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; - smm->free_event_vector[thread_index] = fifo_events; + 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); @@ -751,21 +961,21 @@ 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; - mq = smm->vpp_event_queues[my_thread_index]; + mq = smm->wrk[my_thread_index].vpp_event_queue; index = mq->q->head; for (i = 0; i < mq->q->cursize; i++) { 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 (e, svm_msg_q_msg_data (mq, msg), ring->elsize); + clib_memcpy_fast (e, svm_msg_q_msg_data (mq, msg), ring->elsize); switch (e->event_type) { @@ -804,7 +1014,7 @@ dump_thread_0_event_queue (void) } 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) @@ -834,28 +1044,30 @@ 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_msg_q_t *mq; - 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; 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 */ - mq = smm->vpp_event_queues[thread_index]; + mq = wrk->vpp_event_queue; index = mq->q->head; for (i = 0; i < mq->q->cursize; i++) { 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 (e, svm_msg_q_msg_data (mq, msg), ring->elsize); + clib_memcpy_fast (e, svm_msg_q_msg_data (mq, msg), ring->elsize); found = session_node_cmp_event (e, f); if (found) return 1; @@ -865,13 +1077,13 @@ session_node_lookup_fifo_event (svm_fifo_t * f, session_fifo_event_t * e) /* * 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; } }