X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fsession%2Fsession_node.c;h=605fd584e2dcdabcfd06024ab9a20c279eb4cea5;hb=317b8e08367c769b90463613231b9fcfad486098;hp=a01f01c8bcb5336e7d0c03c9c3b69351f2b1854d;hpb=671e60e65635b8d030bf303c88411192c747b59e;p=vpp.git diff --git a/src/vnet/session/session_node.c b/src/vnet/session/session_node.c index a01f01c8bcb..605fd584e2d 100644 --- a/src/vnet/session/session_node.c +++ b/src/vnet/session/session_node.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: @@ -21,18 +21,26 @@ #include #include #include +#include #include #include +static void session_mq_accepted_reply_handler (void *data); + +static void +accepted_notify_cb (void *data, u32 data_len) +{ + session_mq_accepted_reply_handler (data); +} + 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; + session_state_t old_state; app_worker_t *app_wrk; - local_session_t *ls; - stream_session_t *s; + session_t *s; /* Server isn't interested, kill the session */ if (mp->retval) @@ -43,48 +51,45 @@ session_mq_accepted_reply_handler (void *data) return; } - if (session_handle_is_local (mp->handle)) + /* Mail this back from the main thread. We're not polling in main + * thread so we're using other workers for notifications. */ + if (vlib_num_workers () && vlib_get_thread_index () != 0 + && session_thread_from_handle (mp->handle) == 0) { - 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)) + vl_api_rpc_call_main_thread (accepted_notify_cb, data, + sizeof (session_accepted_reply_msg_t)); + return; + } + + 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; + } + + if (!session_has_transport (s)) + { + s->session_state = SESSION_STATE_READY; + if (ct_session_connect_notify (s)) 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); + + if (!svm_fifo_is_empty_prod (s->rx_fifo)) + app_worker_lock_and_send_event (app_wrk, s, SESSION_IO_EVT_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); + app_worker_close_notify (app_wrk, s); s->session_state = old_state; return; } @@ -97,7 +102,7 @@ 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; + session_t *s; application_t *app; u32 index, thread_index; @@ -144,7 +149,7 @@ session_mq_disconnected_handler (void *data) session_disconnected_msg_t *mp; app_worker_t *app_wrk; session_event_t *evt; - stream_session_t *s; + session_t *s; application_t *app; int rv = 0; @@ -173,7 +178,7 @@ session_mq_disconnected_handler (void *data) 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; + evt->event_type = SESSION_CTRL_EVT_DISCONNECTED_REPLY; rmp = (session_disconnected_reply_msg_t *) evt->data; rmp->handle = mp->handle; rmp->context = mp->context; @@ -207,6 +212,86 @@ session_mq_disconnected_reply_handler (void *data) } } +static void +session_mq_worker_update_handler (void *data) +{ + session_worker_update_msg_t *mp = (session_worker_update_msg_t *) data; + session_worker_update_reply_msg_t *rmp; + svm_msg_q_msg_t _msg, *msg = &_msg; + app_worker_t *app_wrk; + u32 owner_app_wrk_map; + session_event_t *evt; + session_t *s; + application_t *app; + + app = application_lookup (mp->client_index); + if (!app) + return; + if (!(s = session_get_from_handle_if_valid (mp->handle))) + { + clib_warning ("invalid handle %llu", mp->handle); + return; + } + app_wrk = app_worker_get (s->app_wrk_index); + if (app_wrk->app_index != app->app_index) + { + clib_warning ("app %u does not own session %llu", app->app_index, + mp->handle); + return; + } + owner_app_wrk_map = app_wrk->wrk_map_index; + app_wrk = application_get_worker (app, mp->wrk_index); + + /* This needs to come from the new owner */ + if (mp->req_wrk_index == owner_app_wrk_map) + { + session_req_worker_update_msg_t *wump; + + 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_REQ_WORKER_UPDATE; + wump = (session_req_worker_update_msg_t *) evt->data; + wump->session_handle = mp->handle; + svm_msg_q_add (app_wrk->event_queue, msg, SVM_Q_WAIT); + return; + } + + app_worker_own_session (app_wrk, s); + + /* + * Send reply + */ + 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_WORKER_UPDATE_REPLY; + rmp = (session_worker_update_reply_msg_t *) evt->data; + rmp->handle = mp->handle; + rmp->rx_fifo = pointer_to_uword (s->rx_fifo); + rmp->tx_fifo = pointer_to_uword (s->tx_fifo); + rmp->segment_handle = session_segment_handle (s); + svm_msg_q_add (app_wrk->event_queue, msg, SVM_Q_WAIT); + + /* + * Retransmit messages that may have been lost + */ + if (s->tx_fifo && !svm_fifo_is_empty (s->tx_fifo)) + session_send_io_evt_to_thread (s->tx_fifo, SESSION_IO_EVT_TX); + + if (s->rx_fifo && !svm_fifo_is_empty (s->rx_fifo)) + app_worker_lock_and_send_event (app_wrk, s, SESSION_IO_EVT_RX); + + if (s->session_state >= SESSION_STATE_TRANSPORT_CLOSING) + app_worker_close_notify (app_wrk, s); +} + vlib_node_registration_t session_queue_node; typedef struct @@ -257,7 +342,7 @@ enum 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_t * s, u32 n_trace) { session_queue_trace_t *t; vlib_buffer_t *b; @@ -280,11 +365,11 @@ 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_manager_worker_t *wrk; + session_worker_t *wrk; u16 len_to_deq, n_bytes_read; u8 *data, j; - wrk = session_manager_get_worker (ctx->s->thread_index); + wrk = session_main_get_worker (ctx->s->thread_index); b->flags |= VLIB_BUFFER_TOTAL_LENGTH_VALID; b->total_length_not_including_first_buffer = 0; @@ -299,14 +384,12 @@ session_tx_fifo_chain_tail (vlib_main_t * vm, session_tx_context_t * ctx, *n_bufs -= 1; 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; data = vlib_buffer_get_current (chain_b); if (peek_data) { - n_bytes_read = svm_fifo_peek (ctx->s->server_tx_fifo, + n_bytes_read = svm_fifo_peek (ctx->s->tx_fifo, ctx->tx_offset, len_to_deq, data); ctx->tx_offset += n_bytes_read; } @@ -314,7 +397,7 @@ session_tx_fifo_chain_tail (vlib_main_t * vm, session_tx_context_t * ctx, { if (ctx->transport_vft->tx_type == TRANSPORT_TX_DGRAM) { - svm_fifo_t *f = ctx->s->server_tx_fifo; + svm_fifo_t *f = ctx->s->tx_fifo; session_dgram_hdr_t *hdr = &ctx->hdr; u16 deq_now; deq_now = clib_min (hdr->data_length - hdr->data_offset, @@ -331,7 +414,7 @@ session_tx_fifo_chain_tail (vlib_main_t * vm, session_tx_context_t * ctx, } } else - n_bytes_read = svm_fifo_dequeue_nowait (ctx->s->server_tx_fifo, + n_bytes_read = svm_fifo_dequeue_nowait (ctx->s->tx_fifo, len_to_deq, data); } ASSERT (n_bytes_read == len_to_deq); @@ -354,20 +437,6 @@ session_tx_fifo_chain_tail (vlib_main_t * vm, session_tx_context_t * ctx, ctx->left_to_snd -= left_from_seg; } -always_inline int -session_output_try_get_buffers (vlib_main_t * vm, - session_manager_worker_t * wrk, - u32 thread_index, u16 * n_bufs, u32 wanted) -{ - u32 n_alloc; - 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 (wrk->tx_buffers) = *n_bufs; - return n_alloc; -} - always_inline void session_tx_fill_buffer (vlib_main_t * vm, session_tx_context_t * ctx, vlib_buffer_t * b, u16 * n_bufs, u8 peek_data) @@ -383,12 +452,12 @@ session_tx_fill_buffer (vlib_main_t * vm, session_tx_context_t * ctx, b->flags = VNET_BUFFER_F_LOCALLY_ORIGINATED; b->current_data = 0; - data0 = vlib_buffer_make_headroom (b, MAX_HDRS_LEN); + data0 = vlib_buffer_make_headroom (b, TRANSPORT_MAX_HDRS_LEN); len_to_deq = clib_min (ctx->left_to_snd, ctx->deq_per_first_buf); if (peek_data) { - n_bytes_read = svm_fifo_peek (ctx->s->server_tx_fifo, ctx->tx_offset, + n_bytes_read = svm_fifo_peek (ctx->s->tx_fifo, ctx->tx_offset, len_to_deq, data0); ASSERT (n_bytes_read > 0); /* Keep track of progress locally, transport is also supposed to @@ -400,7 +469,7 @@ session_tx_fill_buffer (vlib_main_t * vm, session_tx_context_t * ctx, if (ctx->transport_vft->tx_type == TRANSPORT_TX_DGRAM) { session_dgram_hdr_t *hdr = &ctx->hdr; - svm_fifo_t *f = ctx->s->server_tx_fifo; + svm_fifo_t *f = ctx->s->tx_fifo; u16 deq_now; u32 offset; @@ -425,7 +494,7 @@ session_tx_fill_buffer (vlib_main_t * vm, session_tx_context_t * ctx, } else { - n_bytes_read = svm_fifo_dequeue_nowait (ctx->s->server_tx_fifo, + n_bytes_read = svm_fifo_dequeue_nowait (ctx->s->tx_fifo, len_to_deq, data0); ASSERT (n_bytes_read > 0); } @@ -441,7 +510,7 @@ session_tx_fill_buffer (vlib_main_t * vm, session_tx_context_t * ctx, /* *INDENT-OFF* */ SESSION_EVT_DBG(SESSION_EVT_DEQ, ctx->s, ({ - ed->data[0] = FIFO_EVENT_APP_TX; + ed->data[0] = SESSION_IO_EVT_TX; ed->data[1] = ctx->max_dequeue; ed->data[2] = len_to_deq; ed->data[3] = ctx->left_to_snd; @@ -450,7 +519,7 @@ session_tx_fill_buffer (vlib_main_t * vm, session_tx_context_t * ctx, } always_inline u8 -session_tx_not_ready (stream_session_t * s, u8 peek_data) +session_tx_not_ready (session_t * s, u8 peek_data) { if (peek_data) { @@ -489,7 +558,7 @@ session_tx_set_dequeue_params (vlib_main_t * vm, session_tx_context_t * ctx, u32 max_segs, u8 peek_data) { u32 n_bytes_per_buf, n_bytes_per_seg; - ctx->max_dequeue = svm_fifo_max_dequeue (ctx->s->server_tx_fifo); + ctx->max_dequeue = svm_fifo_max_dequeue_cons (ctx->s->tx_fifo); if (peek_data) { /* Offset in rx fifo from where to peek data */ @@ -510,7 +579,7 @@ session_tx_set_dequeue_params (vlib_main_t * vm, session_tx_context_t * ctx, ctx->max_len_to_snd = 0; return; } - svm_fifo_peek (ctx->s->server_tx_fifo, 0, sizeof (ctx->hdr), + svm_fifo_peek (ctx->s->tx_fifo, 0, sizeof (ctx->hdr), (u8 *) & ctx->hdr); ASSERT (ctx->hdr.data_length > ctx->hdr.data_offset); ctx->max_dequeue = ctx->hdr.data_length - ctx->hdr.data_offset; @@ -541,43 +610,41 @@ 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_DATA_SIZE; - ASSERT (n_bytes_per_buf > MAX_HDRS_LEN); - n_bytes_per_seg = MAX_HDRS_LEN + ctx->snd_mss; + n_bytes_per_buf = vlib_buffer_get_default_data_size (vm); + ASSERT (n_bytes_per_buf > TRANSPORT_MAX_HDRS_LEN); + n_bytes_per_seg = TRANSPORT_MAX_HDRS_LEN + ctx->snd_mss; ctx->n_bufs_per_seg = ceil ((f64) n_bytes_per_seg / n_bytes_per_buf); ctx->deq_per_buf = clib_min (ctx->snd_mss, n_bytes_per_buf); ctx->deq_per_first_buf = clib_min (ctx->snd_mss, - n_bytes_per_buf - MAX_HDRS_LEN); + n_bytes_per_buf - + TRANSPORT_MAX_HDRS_LEN); } always_inline int session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, - session_event_t * e, - stream_session_t * s, int *n_tx_packets, + session_worker_t * wrk, + session_event_t * e, int *n_tx_packets, u8 peek_data) { - u32 next_index, next0, next1, *to_next, n_left_to_next; + u32 next_index, next0, next1, *to_next, n_left_to_next, n_left, pbi; 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_manager_worker_t *wrk = &smm->wrk[thread_index]; + session_main_t *smm = &session_main; session_tx_context_t *ctx = &wrk->ctx; transport_proto_t tp; vlib_buffer_t *pb; u16 n_bufs, rv; - if (PREDICT_FALSE ((rv = session_tx_not_ready (s, peek_data)))) + if (PREDICT_FALSE ((rv = session_tx_not_ready (ctx->s, peek_data)))) { if (rv < 2) vec_add1 (wrk->pending_event_vector, *e); return SESSION_TX_NO_DATA; } - next_index = smm->session_type_to_next[s->session_type]; + next_index = smm->session_type_to_next[ctx->s->session_type]; next0 = next1 = next_index; - tp = session_get_transport_proto (s); - ctx->s = s; + tp = session_get_transport_proto (ctx->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); @@ -589,8 +656,8 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, } ctx->snd_space = transport_connection_snd_space (ctx->tc, - vm-> - clib_time.last_cpu_time, + vm->clib_time. + last_cpu_time, ctx->snd_mss); if (ctx->snd_space == 0 || ctx->snd_mss == 0) { @@ -599,7 +666,7 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, } /* Allow enqueuing of a new event */ - svm_fifo_unset_event (s->server_tx_fifo); + svm_fifo_unset_event (ctx->s->tx_fifo); /* Check how much we can pull. */ session_tx_set_dequeue_params (vm, ctx, VLIB_FRAME_SIZE - *n_tx_packets, @@ -608,21 +675,16 @@ 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 (wrk->tx_buffers); n_bufs_needed = ctx->n_segs_per_evt * ctx->n_bufs_per_seg; - - /* - * Make sure we have at least one full frame of buffers ready - */ - if (n_bufs < n_bufs_needed) + vec_validate_aligned (wrk->tx_buffers, n_bufs_needed - 1, + CLIB_CACHE_LINE_BYTES); + n_bufs = vlib_buffer_alloc (vm, wrk->tx_buffers, n_bufs_needed); + if (PREDICT_FALSE (n_bufs < n_bufs_needed)) { - 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 (wrk->pending_event_vector, *e); - return SESSION_TX_NO_BUFFERS; - } + if (n_bufs) + vlib_buffer_free (vm, wrk->tx_buffers, n_bufs); + vec_add1 (wrk->pending_event_vector, *e); + return SESSION_TX_NO_BUFFERS; } /* @@ -704,9 +766,12 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, 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; + ctx->n_segs_per_evt, ctx->s, n_trace); + if (PREDICT_FALSE (n_bufs)) + { + clib_warning ("not all buffers consumed"); + vlib_buffer_free (vm, 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); @@ -714,18 +779,18 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, /* 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)) + if (svm_fifo_set_event (ctx->s->tx_fifo)) vec_add1 (wrk->pending_event_vector, *e); if (!peek_data && ctx->transport_vft->tx_type == TRANSPORT_TX_DGRAM) { /* Fix dgram pre header */ if (ctx->max_len_to_snd < ctx->max_dequeue) - svm_fifo_overwrite_head (s->server_tx_fifo, (u8 *) & ctx->hdr, + svm_fifo_overwrite_head (ctx->s->tx_fifo, (u8 *) & ctx->hdr, sizeof (session_dgram_pre_hdr_t)); /* 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)) + else if (svm_fifo_max_dequeue_cons (ctx->s->tx_fifo) > 0) + if (svm_fifo_set_event (ctx->s->tx_fifo)) vec_add1 (wrk->pending_event_vector, *e); } return SESSION_TX_OK; @@ -733,42 +798,42 @@ session_tx_fifo_read_and_snd_i (vlib_main_t * vm, vlib_node_runtime_t * node, int session_tx_fifo_peek_and_snd (vlib_main_t * vm, vlib_node_runtime_t * node, - session_event_t * e, - stream_session_t * s, int *n_tx_pkts) + session_worker_t * wrk, + session_event_t * e, int *n_tx_pkts) { - return session_tx_fifo_read_and_snd_i (vm, node, e, s, n_tx_pkts, 1); + return session_tx_fifo_read_and_snd_i (vm, node, wrk, e, n_tx_pkts, 1); } int session_tx_fifo_dequeue_and_snd (vlib_main_t * vm, vlib_node_runtime_t * node, - session_event_t * e, - stream_session_t * s, int *n_tx_pkts) + session_worker_t * wrk, + session_event_t * e, int *n_tx_pkts) { - return session_tx_fifo_read_and_snd_i (vm, node, e, s, n_tx_pkts, 0); + return session_tx_fifo_read_and_snd_i (vm, node, wrk, e, n_tx_pkts, 0); } int session_tx_fifo_dequeue_internal (vlib_main_t * vm, vlib_node_runtime_t * node, - session_event_t * e, - stream_session_t * s, int *n_tx_pkts) + session_worker_t * wrk, + session_event_t * e, int *n_tx_pkts) { - application_t *app; - if (PREDICT_FALSE (s->session_state == SESSION_STATE_CLOSED)) + session_t *s = wrk->ctx.s; + + if (PREDICT_FALSE (s->session_state >= SESSION_STATE_TRANSPORT_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); + svm_fifo_unset_event (s->tx_fifo); + return transport_custom_tx (session_get_transport_proto (s), s); } -always_inline stream_session_t * +always_inline session_t * session_event_get_session (session_event_t * e, u8 thread_index) { - return session_get_if_valid (e->fifo->master_session_index, thread_index); + return session_get_if_valid (e->session_index, thread_index); } static void -session_update_dispatch_period (session_manager_worker_t * wrk, f64 now, +session_update_dispatch_period (session_worker_t * wrk, f64 now, u32 thread_index) { if (wrk->last_tx_packets) @@ -783,15 +848,14 @@ 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_main_t *smm = vnet_get_session_main (); u32 thread_index = vm->thread_index, n_to_dequeue, n_events; - session_manager_worker_t *wrk = &smm->wrk[thread_index]; + session_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 *); @@ -841,15 +905,15 @@ session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, for (i = 0; i < n_events; i++) { - stream_session_t *s; /* $$$ prefetch 1 ahead maybe */ + session_t *s; /* $$$ prefetch 1 ahead maybe */ session_event_t *e; - u8 want_tx_evt; + u8 need_tx_ntf; e = &fifo_events[i]; switch (e->event_type) { case SESSION_IO_EVT_TX_FLUSH: - case FIFO_EVENT_APP_TX: + case SESSION_IO_EVT_TX: /* Don't try to send more that one frame per dispatch cycle */ if (n_tx_packets == VLIB_FRAME_SIZE) { @@ -863,19 +927,18 @@ session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, clib_warning ("session was freed!"); continue; } - - want_tx_evt = svm_fifo_want_tx_evt (s->server_tx_fifo); + CLIB_PREFETCH (s->tx_fifo, 2 * CLIB_CACHE_LINE_BYTES, LOAD); + wrk->ctx.s = s; /* 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, + rv = (smm->session_tx_fns[s->session_type]) (vm, node, wrk, e, &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); - } + need_tx_ntf = svm_fifo_needs_tx_ntf (s->tx_fifo, + wrk->ctx.max_len_to_snd); + if (PREDICT_FALSE (need_tx_ntf)) + session_dequeue_notify (s); } else if (PREDICT_FALSE (rv == SESSION_TX_NO_BUFFERS)) { @@ -884,7 +947,14 @@ session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, continue; } break; - case FIFO_EVENT_DISCONNECT: + case SESSION_IO_EVT_RX: + s = session_event_get_session (e, thread_index); + if (!s) + break; + transport_app_rx_evt (session_get_transport_proto (s), + s->connection_index, s->thread_index); + break; + case SESSION_CTRL_EVT_CLOSE: s = session_get_from_handle_if_valid (e->session_handle); if (PREDICT_FALSE (!s)) break; @@ -895,7 +965,7 @@ session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, * dispatch cycles */ if (!e->postponed || (e->postponed < 200 - && svm_fifo_max_dequeue (s->server_tx_fifo))) + && svm_fifo_max_dequeue_cons (s->tx_fifo))) { e->postponed += 1; vec_add1 (wrk->pending_disconnects, *e); @@ -904,21 +974,22 @@ session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, session_transport_close (s); break; - case FIFO_EVENT_BUILTIN_RX: + case SESSION_IO_EVT_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); + svm_fifo_unset_event (s->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); + app_worker_builtin_rx (app_wrk, s); break; - case FIFO_EVENT_BUILTIN_TX: + case SESSION_IO_EVT_BUILTIN_TX: s = session_get_from_handle_if_valid (e->session_handle); + wrk->ctx.s = s; if (PREDICT_TRUE (s != 0)) - session_tx_fifo_dequeue_internal (vm, node, e, s, &n_tx_packets); + session_tx_fifo_dequeue_internal (vm, node, wrk, e, + &n_tx_packets); break; - case FIFO_EVENT_RPC: + case SESSION_CTRL_EVT_RPC: fp = e->rpc_args.fp; (*fp) (e->rpc_args.arg); break; @@ -936,6 +1007,9 @@ session_queue_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node, case SESSION_CTRL_EVT_RESET_REPLY: session_mq_reset_reply_handler (e->data); break; + case SESSION_CTRL_EVT_WORKER_UPDATE: + session_mq_worker_update_handler (e->data); + break; default: clib_warning ("unhandled event type %d", e->event_type); } @@ -969,12 +1043,12 @@ VLIB_REGISTER_NODE (session_queue_node) = void dump_thread_0_event_queue (void) { - session_manager_main_t *smm = vnet_get_session_manager_main (); + session_main_t *smm = vnet_get_session_main (); vlib_main_t *vm = &vlib_global_main; u32 my_thread_index = vm->thread_index; session_event_t _e, *e = &_e; svm_msg_q_ring_t *ring; - stream_session_t *s0; + session_t *s0; svm_msg_q_msg_t *msg; svm_msg_q_t *mq; int i, index; @@ -990,25 +1064,26 @@ dump_thread_0_event_queue (void) switch (e->event_type) { - case FIFO_EVENT_APP_TX: + case SESSION_IO_EVT_TX: s0 = session_event_get_session (e, my_thread_index); fformat (stdout, "[%04d] TX session %d\n", i, s0->session_index); break; - case FIFO_EVENT_DISCONNECT: + case SESSION_CTRL_EVT_CLOSE: s0 = session_get_from_handle (e->session_handle); fformat (stdout, "[%04d] disconnect session %d\n", i, s0->session_index); break; - case FIFO_EVENT_BUILTIN_RX: + case SESSION_IO_EVT_BUILTIN_RX: s0 = session_event_get_session (e, my_thread_index); fformat (stdout, "[%04d] builtin_rx %d\n", i, s0->session_index); break; - case FIFO_EVENT_RPC: + case SESSION_CTRL_EVT_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: @@ -1027,25 +1102,25 @@ dump_thread_0_event_queue (void) static u8 session_node_cmp_event (session_event_t * e, svm_fifo_t * f) { - stream_session_t *s; + session_t *s; switch (e->event_type) { - case FIFO_EVENT_APP_RX: - case FIFO_EVENT_APP_TX: - case FIFO_EVENT_BUILTIN_RX: - if (e->fifo == f) + case SESSION_IO_EVT_RX: + case SESSION_IO_EVT_TX: + case SESSION_IO_EVT_BUILTIN_RX: + if (e->session_index == f->master_session_index) return 1; break; - case FIFO_EVENT_DISCONNECT: + case SESSION_CTRL_EVT_CLOSE: break; - case FIFO_EVENT_RPC: + case SESSION_CTRL_EVT_RPC: s = session_get_from_handle (e->session_handle); if (!s) { clib_warning ("session has event but doesn't exist!"); break; } - if (s->server_rx_fifo == f || s->server_tx_fifo == f) + if (s->rx_fifo == f || s->tx_fifo == f) return 1; break; default: @@ -1058,7 +1133,7 @@ u8 session_node_lookup_fifo_event (svm_fifo_t * f, session_event_t * e) { session_event_t *pending_event_vector, *evt; - session_manager_worker_t *wrk; + session_worker_t *wrk; int i, index, found = 0; svm_msg_q_msg_t *msg; svm_msg_q_ring_t *ring; @@ -1067,7 +1142,7 @@ session_node_lookup_fifo_event (svm_fifo_t * f, session_event_t * e) ASSERT (e); thread_index = f->master_thread_index; - wrk = session_manager_get_worker (thread_index); + wrk = session_main_get_worker (thread_index); /* * Search evt queue @@ -1164,6 +1239,25 @@ VLIB_REGISTER_NODE (session_queue_process_node) = }; /* *INDENT-ON* */ +static_always_inline uword +session_queue_pre_input_inline (vlib_main_t * vm, vlib_node_runtime_t * node, + vlib_frame_t * frame) +{ + session_main_t *sm = &session_main; + if (!sm->wrk[0].vpp_event_queue) + return 0; + return session_queue_node_fn (vm, node, frame); +} + +/* *INDENT-OFF* */ +VLIB_REGISTER_NODE (session_queue_pre_input_node) = +{ + .function = session_queue_pre_input_inline, + .type = VLIB_NODE_TYPE_PRE_INPUT, + .name = "session-queue-main", + .state = VLIB_NODE_STATE_DISABLED, +}; +/* *INDENT-ON* */ /* * fd.io coding-style-patch-verification: ON