else
{
s = session_get_from_handle_if_valid (mp->handle);
- if (!s)
- {
- clib_warning ("session doesn't exist");
- return;
- }
+ /* 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)
{
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;
u32 index, thread_index;
mp = (session_reset_reply_msg_t *) data;
- app = application_lookup (mp->client_index);
+ app = application_lookup (mp->context);
if (!app)
return;
session_parse_handle (mp->handle, &index, &thread_index);
s = session_get_if_valid (index, thread_index);
- if (!s)
- {
- clib_warning ("Invalid session!");
- return;
- }
+
+ /* 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)
{
/* This comes as a response to a reset, transport only waiting for
* confirmation to remove connection state, no need to disconnect */
- stream_session_cleanup (s);
+ a->handle = mp->handle;
+ a->app_index = app->app_index;
+ vnet_disconnect_session (a);
}
static 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;
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;
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;
}
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;
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;
}
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 =
- transport_connection_max_tx_burst (ctx->tc, vm->clib_time.last_cpu_time);
+
+ 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;
}
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;
/*
*/
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;
}
}
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);
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);
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);
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)
{
/* 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;
}
}
static void
-session_update_dispatch_period (session_manager_main_t * smm, f64 now,
+session_update_dispatch_period (session_manager_worker_t * wrk, f64 now,
u32 thread_index)
{
- f64 sample, prev_period = smm->dispatch_period[thread_index], a = 0.8;
-
- sample = now - smm->last_vlib_time[thread_index];
- smm->dispatch_period[thread_index] = a * sample + (1 - a) * prev_period;
- smm->last_vlib_time[thread_index] = now;
+ 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_manager_main_t *smm = vnet_get_session_manager_main ();
u32 thread_index = vm->thread_index, n_to_dequeue, n_events;
- session_event_t *pending_events, *e;
- session_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;
/*
* Update transport time
*/
- session_update_dispatch_period (smm, now, thread_index);
+ 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 */
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;
}
}
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;
}
}
_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);
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)
{
u8
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_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;
/*
* 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;
}
}