X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlib%2Fmain.c;h=964bc4a04e923247f28f1fd04be09e461972e53d;hb=9f5b36926b74109974e7c3ce9bb3a0a7d676c46c;hp=0786465e0e4e7dfeb34be323fafb66c7615237a7;hpb=58b2eb1af562c292feb6d3cdce4656746e61da75;p=vpp.git diff --git a/src/vlib/main.c b/src/vlib/main.c index 0786465e0e4..964bc4a04e9 100644 --- a/src/vlib/main.c +++ b/src/vlib/main.c @@ -41,80 +41,17 @@ #include #include #include +#include #include #include -#include -CJ_GLOBAL_LOG_PROTOTYPE; - -/* Actually allocate a few extra slots of vector data to support - speculative vector enqueues which overflow vector data in next frame. */ -#define VLIB_FRAME_SIZE_ALLOC (VLIB_FRAME_SIZE + 4) - -u32 wraps; - -always_inline u32 -vlib_frame_bytes (u32 n_scalar_bytes, u32 n_vector_bytes) -{ - u32 n_bytes; - - /* Make room for vlib_frame_t plus scalar arguments. */ - n_bytes = vlib_frame_vector_byte_offset (n_scalar_bytes); - - /* Make room for vector arguments. - Allocate a few extra slots of vector data to support - speculative vector enqueues which overflow vector data in next frame. */ -#define VLIB_FRAME_SIZE_EXTRA 4 - n_bytes += (VLIB_FRAME_SIZE + VLIB_FRAME_SIZE_EXTRA) * n_vector_bytes; - - /* Magic number is first 32bit number after vector data. - Used to make sure that vector data is never overrun. */ #define VLIB_FRAME_MAGIC (0xabadc0ed) - n_bytes += sizeof (u32); - - /* Pad to cache line. */ - n_bytes = round_pow2 (n_bytes, CLIB_CACHE_LINE_BYTES); - - return n_bytes; -} always_inline u32 * vlib_frame_find_magic (vlib_frame_t * f, vlib_node_t * node) { - void *p = f; - - p += vlib_frame_vector_byte_offset (node->scalar_size); - - p += (VLIB_FRAME_SIZE + VLIB_FRAME_SIZE_EXTRA) * node->vector_size; - - return p; -} - -static inline vlib_frame_size_t * -get_frame_size_info (vlib_node_main_t * nm, - u32 n_scalar_bytes, u32 n_vector_bytes) -{ -#ifdef VLIB_SUPPORTS_ARBITRARY_SCALAR_SIZES - uword key = (n_scalar_bytes << 16) | n_vector_bytes; - uword *p, i; - - p = hash_get (nm->frame_size_hash, key); - if (p) - i = p[0]; - else - { - i = vec_len (nm->frame_sizes); - vec_validate (nm->frame_sizes, i); - hash_set (nm->frame_size_hash, key, i); - } - - return vec_elt_at_index (nm->frame_sizes, i); -#else - ASSERT (vlib_frame_bytes (n_scalar_bytes, n_vector_bytes) - == (vlib_frame_bytes (0, 4))); - return vec_elt_at_index (nm->frame_sizes, 0); -#endif + return (void *) f + node->magic_offset; } static vlib_frame_t * @@ -125,29 +62,35 @@ vlib_frame_alloc_to_node (vlib_main_t * vm, u32 to_node_index, vlib_frame_size_t *fs; vlib_node_t *to_node; vlib_frame_t *f; - u32 l, n, scalar_size, vector_size; + u32 l, n; + + ASSERT (vm == vlib_get_main ()); to_node = vlib_get_node (vm, to_node_index); - scalar_size = to_node->scalar_size; - vector_size = to_node->vector_size; + vec_validate (nm->frame_sizes, to_node->frame_size_index); + fs = vec_elt_at_index (nm->frame_sizes, to_node->frame_size_index); - fs = get_frame_size_info (nm, scalar_size, vector_size); - n = vlib_frame_bytes (scalar_size, vector_size); + if (fs->frame_size == 0) + fs->frame_size = to_node->frame_size; + else + ASSERT (fs->frame_size == to_node->frame_size); + + n = fs->frame_size; if ((l = vec_len (fs->free_frames)) > 0) { /* Allocate from end of free list. */ f = fs->free_frames[l - 1]; - _vec_len (fs->free_frames) = l - 1; + vec_set_len (fs->free_frames, l - 1); } else { - f = clib_mem_alloc_aligned_no_fail (n, VLIB_FRAME_ALIGN); + f = clib_mem_alloc_aligned_no_fail (n, CLIB_CACHE_LINE_BYTES); } /* Poison frame when debugging. */ if (CLIB_DEBUG > 0) - clib_memset (f, 0xfe, n); + clib_memset_u8 (f, 0xfe, n); /* Insert magic number. */ { @@ -159,9 +102,11 @@ vlib_frame_alloc_to_node (vlib_main_t * vm, u32 to_node_index, f->frame_flags = VLIB_FRAME_IS_ALLOCATED | frame_flags; f->n_vectors = 0; - f->scalar_size = scalar_size; - f->vector_size = vector_size; + f->scalar_offset = to_node->scalar_offset; + f->vector_offset = to_node->vector_offset; + f->aux_offset = to_node->aux_offset; f->flags = 0; + f->frame_size_index = to_node->frame_size_index; fs->n_alloc_frames += 1; @@ -192,6 +137,31 @@ vlib_get_frame_to_node (vlib_main_t * vm, u32 to_node_index) return vlib_get_frame (vm, f); } +static inline void +vlib_validate_frame_indices (vlib_frame_t * f) +{ + if (CLIB_DEBUG > 0) + { + int i; + u32 *from = vlib_frame_vector_args (f); + + /* Check for bad buffer index values */ + for (i = 0; i < f->n_vectors; i++) + { + if (from[i] == 0) + { + clib_warning ("BUG: buffer index 0 at index %d", i); + ASSERT (0); + } + else if (from[i] == 0xfefefefe) + { + clib_warning ("BUG: frame poison pattern at index %d", i); + ASSERT (0); + } + } + } +} + void vlib_put_frame_to_node (vlib_main_t * vm, u32 to_node_index, vlib_frame_t * f) { @@ -201,6 +171,10 @@ vlib_put_frame_to_node (vlib_main_t * vm, u32 to_node_index, vlib_frame_t * f) if (f->n_vectors == 0) return; + ASSERT (vm == vlib_get_main ()); + + vlib_validate_frame_indices (f); + to_node = vlib_get_node (vm, to_node_index); vec_add2 (vm->node_main.pending_frames, p, 1); @@ -213,16 +187,15 @@ vlib_put_frame_to_node (vlib_main_t * vm, u32 to_node_index, vlib_frame_t * f) /* Free given frame. */ void -vlib_frame_free (vlib_main_t * vm, vlib_node_runtime_t * r, vlib_frame_t * f) +vlib_frame_free (vlib_main_t *vm, vlib_frame_t *f) { vlib_node_main_t *nm = &vm->node_main; - vlib_node_t *node; vlib_frame_size_t *fs; + ASSERT (vm == vlib_get_main ()); ASSERT (f->frame_flags & VLIB_FRAME_IS_ALLOCATED); - node = vlib_get_node (vm, r->node_index); - fs = get_frame_size_info (nm, node->scalar_size, node->vector_size); + fs = vec_elt_at_index (nm->frame_sizes, f->frame_size_index); ASSERT (f->frame_flags & VLIB_FRAME_IS_ALLOCATED); @@ -234,6 +207,7 @@ vlib_frame_free (vlib_main_t * vm, vlib_node_runtime_t * r, vlib_frame_t * f) } f->frame_flags &= ~(VLIB_FRAME_IS_ALLOCATED | VLIB_FRAME_NO_APPEND); + f->flags = 0; vec_add1 (fs->free_frames, f); ASSERT (fs->n_alloc_frames > 0); @@ -244,19 +218,24 @@ static clib_error_t * show_frame_stats (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - vlib_node_main_t *nm = &vm->node_main; vlib_frame_size_t *fs; - vlib_cli_output (vm, "%=6s%=12s%=12s", "Size", "# Alloc", "# Free"); - vec_foreach (fs, nm->frame_sizes) - { - u32 n_alloc = fs->n_alloc_frames; - u32 n_free = vec_len (fs->free_frames); + vlib_cli_output (vm, "%=8s%=6s%=12s%=12s", "Thread", "Size", "# Alloc", + "# Free"); + foreach_vlib_main () + { + vlib_node_main_t *nm = &this_vlib_main->node_main; + vec_foreach (fs, nm->frame_sizes) + { + u32 n_alloc = fs->n_alloc_frames; + u32 n_free = vec_len (fs->free_frames); - if (n_alloc + n_free > 0) - vlib_cli_output (vm, "%=6d%=12d%=12d", - fs - nm->frame_sizes, n_alloc, n_free); - } + if (n_alloc + n_free > 0) + vlib_cli_output (vm, "%=8d%=6d%=12d%=12d", + this_vlib_main->thread_index, fs->frame_size, + n_alloc, n_free); + } + } return 0; } @@ -434,6 +413,9 @@ vlib_put_next_frame_validate (vlib_main_t * vm, f = vlib_get_frame (vm, nf->frame); ASSERT (n_vectors_left <= VLIB_FRAME_SIZE); + + vlib_validate_frame_indices (f); + n_after = VLIB_FRAME_SIZE - n_vectors_left; n_before = f->n_vectors; @@ -495,12 +477,8 @@ vlib_put_next_frame (vlib_main_t * vm, if (!(f->frame_flags & VLIB_FRAME_PENDING)) { __attribute__ ((unused)) vlib_node_t *node; - vlib_node_t *next_node; - vlib_node_runtime_t *next_runtime; node = vlib_get_node (vm, r->node_index); - next_node = vlib_get_next_node (vm, r->node_index, next_index); - next_runtime = vlib_node_get_runtime (vm, next_node->index); vec_add2 (nm->pending_frames, p, 1); @@ -509,18 +487,6 @@ vlib_put_next_frame (vlib_main_t * vm, p->next_frame_index = nf - nm->next_frames; nf->flags |= VLIB_FRAME_PENDING; f->frame_flags |= VLIB_FRAME_PENDING; - - /* - * If we're going to dispatch this frame on another thread, - * force allocation of a new frame. Otherwise, we create - * a dangling frame reference. Each thread has its own copy of - * the next_frames vector. - */ - if (0 && r->thread_index != next_runtime->thread_index) - { - nf->frame = NULL; - nf->flags &= ~(VLIB_FRAME_PENDING | VLIB_FRAME_IS_ALLOCATED); - } } /* Copy trace flag from next_frame and from runtime. */ @@ -540,44 +506,38 @@ vlib_put_next_frame (vlib_main_t * vm, } /* Sync up runtime (32 bit counters) and main node stats (64 bit counters). */ -never_inline void -vlib_node_runtime_sync_stats (vlib_main_t * vm, - vlib_node_runtime_t * r, - uword n_calls, uword n_vectors, uword n_clocks, - uword n_ticks0, uword n_ticks1) +void +vlib_node_runtime_sync_stats_node (vlib_node_t *n, vlib_node_runtime_t *r, + uword n_calls, uword n_vectors, + uword n_clocks) { - vlib_node_t *n = vlib_get_node (vm, r->node_index); - n->stats_total.calls += n_calls + r->calls_since_last_overflow; n->stats_total.vectors += n_vectors + r->vectors_since_last_overflow; n->stats_total.clocks += n_clocks + r->clocks_since_last_overflow; - n->stats_total.perf_counter0_ticks += n_ticks0 + - r->perf_counter0_ticks_since_last_overflow; - n->stats_total.perf_counter1_ticks += n_ticks1 + - r->perf_counter1_ticks_since_last_overflow; - n->stats_total.perf_counter_vectors += n_vectors + - r->perf_counter_vectors_since_last_overflow; n->stats_total.max_clock = r->max_clock; n->stats_total.max_clock_n = r->max_clock_n; r->calls_since_last_overflow = 0; r->vectors_since_last_overflow = 0; r->clocks_since_last_overflow = 0; - r->perf_counter0_ticks_since_last_overflow = 0ULL; - r->perf_counter1_ticks_since_last_overflow = 0ULL; - r->perf_counter_vectors_since_last_overflow = 0ULL; +} + +void +vlib_node_runtime_sync_stats (vlib_main_t *vm, vlib_node_runtime_t *r, + uword n_calls, uword n_vectors, uword n_clocks) +{ + vlib_node_t *n = vlib_get_node (vm, r->node_index); + vlib_node_runtime_sync_stats_node (n, r, n_calls, n_vectors, n_clocks); } always_inline void __attribute__ ((unused)) vlib_process_sync_stats (vlib_main_t * vm, vlib_process_t * p, - uword n_calls, uword n_vectors, uword n_clocks, - uword n_ticks0, uword n_ticks1) + uword n_calls, uword n_vectors, uword n_clocks) { vlib_node_runtime_t *rt = &p->node_runtime; vlib_node_t *n = vlib_get_node (vm, rt->node_index); - vlib_node_runtime_sync_stats (vm, rt, n_calls, n_vectors, n_clocks, - n_ticks0, n_ticks1); + vlib_node_runtime_sync_stats (vm, rt, n_calls, n_vectors, n_clocks); n->stats_total.suspends += p->n_suspends; p->n_suspends = 0; } @@ -590,7 +550,7 @@ vlib_node_sync_stats (vlib_main_t * vm, vlib_node_t * n) if (n->type == VLIB_NODE_TYPE_PROCESS) { /* Nothing to do for PROCESS nodes except in main thread */ - if (vm != &vlib_global_main) + if (vm != vlib_get_first_main ()) return; vlib_process_t *p = vlib_get_process_from_node (vm, n); @@ -603,7 +563,7 @@ vlib_node_sync_stats (vlib_main_t * vm, vlib_node_t * n) vec_elt_at_index (vm->node_main.nodes_by_type[n->type], n->runtime_index); - vlib_node_runtime_sync_stats (vm, rt, 0, 0, 0, 0, 0); + vlib_node_runtime_sync_stats (vm, rt, 0, 0, 0); /* Sync up runtime next frame vector counters with main node structure. */ { @@ -623,32 +583,21 @@ always_inline u32 vlib_node_runtime_update_stats (vlib_main_t * vm, vlib_node_runtime_t * node, uword n_calls, - uword n_vectors, uword n_clocks, - uword n_ticks0, uword n_ticks1) + uword n_vectors, uword n_clocks) { u32 ca0, ca1, v0, v1, cl0, cl1, r; - u32 ptick00, ptick01, ptick10, ptick11, pvec0, pvec1; cl0 = cl1 = node->clocks_since_last_overflow; ca0 = ca1 = node->calls_since_last_overflow; v0 = v1 = node->vectors_since_last_overflow; - ptick00 = ptick01 = node->perf_counter0_ticks_since_last_overflow; - ptick10 = ptick11 = node->perf_counter1_ticks_since_last_overflow; - pvec0 = pvec1 = node->perf_counter_vectors_since_last_overflow; ca1 = ca0 + n_calls; v1 = v0 + n_vectors; cl1 = cl0 + n_clocks; - ptick01 = ptick00 + n_ticks0; - ptick11 = ptick10 + n_ticks1; - pvec1 = pvec0 + n_vectors; node->calls_since_last_overflow = ca1; node->clocks_since_last_overflow = cl1; node->vectors_since_last_overflow = v1; - node->perf_counter0_ticks_since_last_overflow = ptick01; - node->perf_counter1_ticks_since_last_overflow = ptick11; - node->perf_counter_vectors_since_last_overflow = pvec1; node->max_clock_n = node->max_clock > n_clocks ? node->max_clock_n : n_vectors; @@ -656,49 +605,32 @@ vlib_node_runtime_update_stats (vlib_main_t * vm, r = vlib_node_runtime_update_main_loop_vector_stats (vm, node, n_vectors); - if (PREDICT_FALSE (ca1 < ca0 || v1 < v0 || cl1 < cl0) || (ptick01 < ptick00) - || (ptick11 < ptick10) || (pvec1 < pvec0)) + if (PREDICT_FALSE (ca1 < ca0 || v1 < v0 || cl1 < cl0)) { node->calls_since_last_overflow = ca0; node->clocks_since_last_overflow = cl0; node->vectors_since_last_overflow = v0; - node->perf_counter0_ticks_since_last_overflow = ptick00; - node->perf_counter1_ticks_since_last_overflow = ptick10; - node->perf_counter_vectors_since_last_overflow = pvec0; - vlib_node_runtime_sync_stats (vm, node, n_calls, n_vectors, n_clocks, - n_ticks0, n_ticks1); + vlib_node_runtime_sync_stats (vm, node, n_calls, n_vectors, n_clocks); } return r; } -always_inline void -vlib_node_runtime_perf_counter (vlib_main_t * vm, u64 * pmc0, u64 * pmc1, - vlib_node_runtime_t * node, - vlib_frame_t * frame, int before_or_after) -{ - *pmc0 = 0; - *pmc1 = 0; - if (PREDICT_FALSE (vec_len (vm->vlib_node_runtime_perf_counter_cbs) != 0)) - clib_call_callbacks (vm->vlib_node_runtime_perf_counter_cbs, vm, pmc0, - pmc1, node, frame, before_or_after); -} - always_inline void vlib_process_update_stats (vlib_main_t * vm, vlib_process_t * p, uword n_calls, uword n_vectors, uword n_clocks) { vlib_node_runtime_update_stats (vm, &p->node_runtime, - n_calls, n_vectors, n_clocks, 0ULL, 0ULL); + n_calls, n_vectors, n_clocks); } static clib_error_t * vlib_cli_elog_clear (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - elog_reset_buffer (&vm->elog_main); + elog_reset_buffer (&vlib_global_main.elog_main); return 0; } @@ -715,7 +647,7 @@ static clib_error_t * elog_save_buffer (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - elog_main_t *em = &vm->elog_main; + elog_main_t *em = &vlib_global_main.elog_main; char *file, *chroot_file; clib_error_t *error = 0; @@ -749,21 +681,12 @@ elog_save_buffer (vlib_main_t * vm, } void -elog_post_mortem_dump (void) +vlib_post_mortem_dump (void) { - vlib_main_t *vm = &vlib_global_main; - elog_main_t *em = &vm->elog_main; - u8 *filename; - clib_error_t *error; + vlib_global_main_t *vgm = vlib_get_global_main (); - if (!vm->elog_post_mortem_dump) - return; - - filename = format (0, "/tmp/elog_post_mortem.%d%c", getpid (), 0); - error = elog_write_file (em, (char *) filename, 1 /* flush ring */ ); - if (error) - clib_error_report (error); - vec_free (filename); + for (int i = 0; i < vec_len (vgm->post_mortem_callbacks); i++) + (vgm->post_mortem_callbacks[i]) (); } /* *INDENT-OFF* */ @@ -778,7 +701,7 @@ static clib_error_t * elog_stop (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - elog_main_t *em = &vm->elog_main; + elog_main_t *em = &vlib_global_main.elog_main; em->n_total_events_disable_limit = em->n_total_events; @@ -798,7 +721,7 @@ static clib_error_t * elog_restart (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { - elog_main_t *em = &vm->elog_main; + elog_main_t *em = &vlib_global_main.elog_main; em->n_total_events_disable_limit = ~0; @@ -815,14 +738,14 @@ VLIB_CLI_COMMAND (elog_restart_cli, static) = { /* *INDENT-ON* */ static clib_error_t * -elog_resize (vlib_main_t * vm, - unformat_input_t * input, vlib_cli_command_t * cmd) +elog_resize_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) { - elog_main_t *em = &vm->elog_main; + elog_main_t *em = &vlib_global_main.elog_main; u32 tmp; /* Stop the parade */ - elog_reset_buffer (&vm->elog_main); + elog_reset_buffer (em); if (unformat (input, "%d", &tmp)) { @@ -840,7 +763,7 @@ elog_resize (vlib_main_t * vm, VLIB_CLI_COMMAND (elog_resize_cli, static) = { .path = "event-logger resize", .short_help = "event-logger resize ", - .function = elog_resize, + .function = elog_resize_command_fn, }; /* *INDENT-ON* */ @@ -849,7 +772,7 @@ VLIB_CLI_COMMAND (elog_resize_cli, static) = { static void elog_show_buffer_internal (vlib_main_t * vm, u32 n_events_to_show) { - elog_main_t *em = &vm->elog_main; + elog_main_t *em = &vlib_global_main.elog_main; elog_event_t *e, *es; f64 dt; @@ -914,8 +837,8 @@ vlib_elog_main_loop_event (vlib_main_t * vm, u32 node_index, u64 time, u32 n_vectors, u32 is_return) { - vlib_main_t *evm = &vlib_global_main; - elog_main_t *em = &evm->elog_main; + vlib_main_t *evm = vlib_get_first_main (); + elog_main_t *em = vlib_get_elog_main (); int enabled = evm->elog_trace_graph_dispatch | evm->elog_trace_graph_circuit; @@ -947,184 +870,15 @@ vlib_elog_main_loop_event (vlib_main_t * vm, } } -#if VLIB_BUFFER_TRACE_TRAJECTORY > 0 -void (*vlib_buffer_trace_trajectory_cb) (vlib_buffer_t * b, u32 node_index); -void (*vlib_buffer_trace_trajectory_init_cb) (vlib_buffer_t * b); - -void -vlib_buffer_trace_trajectory_init (vlib_buffer_t * b) -{ - if (PREDICT_TRUE (vlib_buffer_trace_trajectory_init_cb != 0)) - { - (*vlib_buffer_trace_trajectory_init_cb) (b); - } -} - -#endif - static inline void add_trajectory_trace (vlib_buffer_t * b, u32 node_index) { #if VLIB_BUFFER_TRACE_TRAJECTORY > 0 - if (PREDICT_TRUE (vlib_buffer_trace_trajectory_cb != 0)) - { - (*vlib_buffer_trace_trajectory_cb) (b, node_index); - } -#endif -} - -u8 *format_vnet_buffer_flags (u8 * s, va_list * args) __attribute__ ((weak)); -u8 * -format_vnet_buffer_flags (u8 * s, va_list * args) -{ - s = format (s, "BUG STUB %s", __FUNCTION__); - return s; -} - -u8 *format_vnet_buffer_opaque (u8 * s, va_list * args) __attribute__ ((weak)); -u8 * -format_vnet_buffer_opaque (u8 * s, va_list * args) -{ - s = format (s, "BUG STUB %s", __FUNCTION__); - return s; -} - -u8 *format_vnet_buffer_opaque2 (u8 * s, va_list * args) - __attribute__ ((weak)); -u8 * -format_vnet_buffer_opaque2 (u8 * s, va_list * args) -{ - s = format (s, "BUG STUB %s", __FUNCTION__); - return s; -} - -static u8 * -format_buffer_metadata (u8 * s, va_list * args) -{ - vlib_buffer_t *b = va_arg (*args, vlib_buffer_t *); - - s = format (s, "flags: %U\n", format_vnet_buffer_flags, b); - s = format (s, "current_data: %d, current_length: %d\n", - (i32) (b->current_data), (i32) (b->current_length)); - s = format (s, "current_config_index: %d, flow_id: %x, next_buffer: %x\n", - b->current_config_index, b->flow_id, b->next_buffer); - s = format (s, "error: %d, ref_count: %d, buffer_pool_index: %d\n", - (u32) (b->error), (u32) (b->ref_count), - (u32) (b->buffer_pool_index)); - s = format (s, - "trace_handle: 0x%x, len_not_first_buf: %d\n", - b->trace_handle, b->total_length_not_including_first_buffer); - return s; -} - -#define A(x) vec_add1(vm->pcap_buffer, (x)) - -static void -dispatch_pcap_trace (vlib_main_t * vm, - vlib_node_runtime_t * node, vlib_frame_t * frame) -{ - int i; - vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **bufp, *b; - pcap_main_t *pm = &vm->dispatch_pcap_main; - vlib_trace_main_t *tm = &vm->trace_main; - u32 capture_size; - vlib_node_t *n; - i32 n_left; - f64 time_now = vlib_time_now (vm); - u32 *from; - u8 *d; - u8 string_count; - - /* Input nodes don't have frames yet */ - if (frame == 0 || frame->n_vectors == 0) + if (PREDICT_FALSE (b->trajectory_nb >= VLIB_BUFFER_TRACE_TRAJECTORY_MAX)) return; - - from = vlib_frame_vector_args (frame); - vlib_get_buffers (vm, from, bufs, frame->n_vectors); - bufp = bufs; - - n = vlib_get_node (vm, node->node_index); - - for (i = 0; i < frame->n_vectors; i++) - { - if (PREDICT_TRUE (pm->n_packets_captured < pm->n_packets_to_capture)) - { - b = bufp[i]; - - vec_reset_length (vm->pcap_buffer); - string_count = 0; - - /* Version, flags */ - A ((u8) VLIB_PCAP_MAJOR_VERSION); - A ((u8) VLIB_PCAP_MINOR_VERSION); - A (0 /* string_count */ ); - A (n->protocol_hint); - - /* Buffer index (big endian) */ - A ((from[i] >> 24) & 0xff); - A ((from[i] >> 16) & 0xff); - A ((from[i] >> 8) & 0xff); - A ((from[i] >> 0) & 0xff); - - /* Node name, NULL-terminated ASCII */ - vm->pcap_buffer = format (vm->pcap_buffer, "%v%c", n->name, 0); - string_count++; - - vm->pcap_buffer = format (vm->pcap_buffer, "%U%c", - format_buffer_metadata, b, 0); - string_count++; - vm->pcap_buffer = format (vm->pcap_buffer, "%U%c", - format_vnet_buffer_opaque, b, 0); - string_count++; - vm->pcap_buffer = format (vm->pcap_buffer, "%U%c", - format_vnet_buffer_opaque2, b, 0); - string_count++; - - /* Is this packet traced? */ - if (PREDICT_FALSE (b->flags & VLIB_BUFFER_IS_TRACED)) - { - vlib_trace_header_t **h - = pool_elt_at_index (tm->trace_buffer_pool, - vlib_buffer_get_trace_index (b)); - - vm->pcap_buffer = format (vm->pcap_buffer, "%U%c", - format_vlib_trace, vm, h[0], 0); - string_count++; - } - - /* Save the string count */ - vm->pcap_buffer[2] = string_count; - - /* Figure out how many bytes in the pcap trace */ - capture_size = vec_len (vm->pcap_buffer) + - +vlib_buffer_length_in_chain (vm, b); - - clib_spinlock_lock_if_init (&pm->lock); - n_left = clib_min (capture_size, 16384); - d = pcap_add_packet (pm, time_now, n_left, capture_size); - - /* Copy the header */ - clib_memcpy_fast (d, vm->pcap_buffer, vec_len (vm->pcap_buffer)); - d += vec_len (vm->pcap_buffer); - - n_left = clib_min - (vlib_buffer_length_in_chain (vm, b), - (16384 - vec_len (vm->pcap_buffer))); - /* Copy the packet data */ - while (1) - { - u32 copy_length = clib_min ((u32) n_left, b->current_length); - clib_memcpy_fast (d, b->data + b->current_data, copy_length); - n_left -= b->current_length; - if (n_left <= 0) - break; - d += b->current_length; - ASSERT (b->flags & VLIB_BUFFER_NEXT_PRESENT); - b = vlib_get_buffer (vm, b->next_buffer); - } - clib_spinlock_unlock_if_init (&pm->lock); - } - } + b->trajectory_trace[b->trajectory_nb] = node_index; + b->trajectory_nb++; +#endif } static_always_inline u64 @@ -1138,7 +892,6 @@ dispatch_node (vlib_main_t * vm, u64 t; vlib_node_main_t *nm = &vm->node_main; vlib_next_frame_t *nf; - u64 pmc_before[2], pmc_after[2], pmc_delta[2]; if (CLIB_DEBUG > 0) { @@ -1178,8 +931,8 @@ dispatch_node (vlib_main_t * vm, last_time_stamp, frame ? frame->n_vectors : 0, /* is_after */ 0); - vlib_node_runtime_perf_counter (vm, &pmc_before[0], &pmc_before[1], - node, frame, 0 /* before */ ); + vlib_node_runtime_perf_counter (vm, node, frame, 0, last_time_stamp, + VLIB_NODE_RUNTIME_PERF_BEFORE); /* * Turn this on if you run into @@ -1196,28 +949,23 @@ dispatch_node (vlib_main_t * vm, vlib_buffer_t *b = vlib_get_buffer (vm, from[i]); add_trajectory_trace (b, node->node_index); } - if (PREDICT_FALSE (vm->dispatch_pcap_enable)) - dispatch_pcap_trace (vm, node, frame); - n = node->function (vm, node, frame); + if (PREDICT_TRUE (vm->dispatch_wrapper_fn == 0)) + n = node->function (vm, node, frame); + else + n = vm->dispatch_wrapper_fn (vm, node, frame); } else { - if (PREDICT_FALSE (vm->dispatch_pcap_enable)) - dispatch_pcap_trace (vm, node, frame); - n = node->function (vm, node, frame); + if (PREDICT_TRUE (vm->dispatch_wrapper_fn == 0)) + n = node->function (vm, node, frame); + else + n = vm->dispatch_wrapper_fn (vm, node, frame); } t = clib_cpu_time_now (); - /* - * To validate accounting: pmc_delta = t - pmc_before; - * perf ticks should equal clocks/pkt... - */ - vlib_node_runtime_perf_counter (vm, &pmc_after[0], &pmc_after[1], node, - frame, 1 /* after */ ); - - pmc_delta[0] = pmc_after[0] - pmc_before[0]; - pmc_delta[1] = pmc_after[1] - pmc_before[1]; + vlib_node_runtime_perf_counter (vm, node, frame, n, t, + VLIB_NODE_RUNTIME_PERF_AFTER); vlib_elog_main_loop_event (vm, node->node_index, t, n, 1 /* is_after */ ); @@ -1227,17 +975,11 @@ dispatch_node (vlib_main_t * vm, v = vlib_node_runtime_update_stats (vm, node, /* n_calls */ 1, /* n_vectors */ n, - /* n_clocks */ t - last_time_stamp, - pmc_delta[0] /* PMC0 */ , - pmc_delta[1] /* PMC1 */ ); - - /* When in interrupt mode and vector rate crosses threshold switch to - polling mode. */ - if (PREDICT_FALSE ((dispatch_state == VLIB_NODE_STATE_INTERRUPT) - || (dispatch_state == VLIB_NODE_STATE_POLLING - && (node->flags - & - VLIB_NODE_FLAG_SWITCH_FROM_INTERRUPT_TO_POLLING_MODE)))) + /* n_clocks */ t - last_time_stamp); + + /* When in adaptive mode and vector rate crosses threshold switch to + polling mode and vice versa. */ + if (PREDICT_FALSE (node->flags & VLIB_NODE_FLAG_ADAPTIVE_MODE)) { /* *INDENT-OFF* */ ELOG_TYPE_DECLARE (e) = @@ -1270,7 +1012,8 @@ dispatch_node (vlib_main_t * vm, nm->input_node_counts_by_state[VLIB_NODE_STATE_INTERRUPT] -= 1; nm->input_node_counts_by_state[VLIB_NODE_STATE_POLLING] += 1; - if (PREDICT_FALSE (vlib_global_main.elog_trace_graph_dispatch)) + if (PREDICT_FALSE ( + vlib_get_first_main ()->elog_trace_graph_dispatch)) { vlib_worker_thread_t *w = vlib_worker_threads + vm->thread_index; @@ -1305,7 +1048,8 @@ dispatch_node (vlib_main_t * vm, + vm->thread_index; node->flags |= VLIB_NODE_FLAG_SWITCH_FROM_POLLING_TO_INTERRUPT_MODE; - if (PREDICT_FALSE (vlib_global_main.elog_trace_graph_dispatch)) + if (PREDICT_FALSE ( + vlib_get_first_main ()->elog_trace_graph_dispatch)) { ed = ELOG_TRACK_DATA (&vlib_global_main.elog_main, e, w->elog_track); @@ -1326,7 +1070,7 @@ dispatch_pending_node (vlib_main_t * vm, uword pending_frame_index, { vlib_node_main_t *nm = &vm->node_main; vlib_frame_t *f; - vlib_next_frame_t *nf, nf_dummy; + vlib_next_frame_t *nf, nf_placeholder; vlib_node_runtime_t *n; vlib_frame_t *restore_frame; vlib_pending_frame_t *p; @@ -1340,8 +1084,8 @@ dispatch_pending_node (vlib_main_t * vm, uword pending_frame_index, f = vlib_get_frame (vm, p->frame); if (p->next_frame_index == VLIB_PENDING_FRAME_NO_NEXT_FRAME) { - /* No next frame: so use dummy on stack. */ - nf = &nf_dummy; + /* No next frame: so use placeholder on stack. */ + nf = &nf_placeholder; nf->flags = f->frame_flags & VLIB_NODE_FLAG_TRACE; nf->frame = NULL; } @@ -1376,6 +1120,12 @@ dispatch_pending_node (vlib_main_t * vm, uword pending_frame_index, VLIB_NODE_TYPE_INTERNAL, VLIB_NODE_STATE_POLLING, f, last_time_stamp); + /* Internal node vector-rate accounting, for summary stats */ + vm->internal_node_vectors += f->n_vectors; + vm->internal_node_calls++; + vm->internal_node_last_vectors_per_main_loop = + (f->n_vectors > vm->internal_node_last_vectors_per_main_loop) ? + f->n_vectors : vm->internal_node_last_vectors_per_main_loop; f->frame_flags &= ~(VLIB_FRAME_PENDING | VLIB_FRAME_NO_APPEND); @@ -1413,13 +1163,14 @@ dispatch_pending_node (vlib_main_t * vm, uword pending_frame_index, /* no new frame has been assigned to this node, use the saved one */ nf->frame = restore_frame; f->n_vectors = 0; + f->flags = 0; } else { /* The node has gained a frame, implying packets from the current frame were re-queued to this same node. we don't need the saved one anymore */ - vlib_frame_free (vm, n, f); + vlib_frame_free (vm, f); } } else @@ -1427,7 +1178,7 @@ dispatch_pending_node (vlib_main_t * vm, uword pending_frame_index, if (f->frame_flags & VLIB_FRAME_FREE_AFTER_DISPATCH) { ASSERT (!(n->flags & VLIB_NODE_FLAG_FRAME_NO_FREE_AFTER_DISPATCH)); - vlib_frame_free (vm, n, f); + vlib_frame_free (vm, f); } } @@ -1462,6 +1213,8 @@ vlib_process_bootstrap (uword _a) vm = a->vm; p = a->process; + vlib_process_finish_switch_stack (vm); + f = a->frame; node = &p->node_runtime; @@ -1469,6 +1222,7 @@ vlib_process_bootstrap (uword _a) ASSERT (vlib_process_stack_is_valid (p)); + vlib_process_start_switch_stack (vm, 0); clib_longjmp (&p->return_longjmp, n); return n; @@ -1487,14 +1241,19 @@ vlib_process_startup (vlib_main_t * vm, vlib_process_t * p, vlib_frame_t * f) r = clib_setjmp (&p->return_longjmp, VLIB_PROCESS_RETURN_LONGJMP_RETURN); if (r == VLIB_PROCESS_RETURN_LONGJMP_RETURN) - r = clib_calljmp (vlib_process_bootstrap, pointer_to_uword (&a), - (void *) p->stack + (1 << p->log2_n_stack_bytes)); + { + vlib_process_start_switch_stack (vm, p); + r = clib_calljmp (vlib_process_bootstrap, pointer_to_uword (&a), + (void *) p->stack + (1 << p->log2_n_stack_bytes)); + } + else + vlib_process_finish_switch_stack (vm); return r; } static_always_inline uword -vlib_process_resume (vlib_process_t * p) +vlib_process_resume (vlib_main_t * vm, vlib_process_t * p) { uword r; p->flags &= ~(VLIB_PROCESS_IS_SUSPENDED_WAITING_FOR_CLOCK @@ -1502,7 +1261,12 @@ vlib_process_resume (vlib_process_t * p) | VLIB_PROCESS_RESUME_PENDING); r = clib_setjmp (&p->return_longjmp, VLIB_PROCESS_RETURN_LONGJMP_RETURN); if (r == VLIB_PROCESS_RETURN_LONGJMP_RETURN) - clib_longjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_RESUME); + { + vlib_process_start_switch_stack (vm, p); + clib_longjmp (&p->resume_longjmp, VLIB_PROCESS_RESUME_LONGJMP_RESUME); + } + else + vlib_process_finish_switch_stack (vm); return r; } @@ -1532,6 +1296,9 @@ dispatch_process (vlib_main_t * vm, old_process_index = nm->current_process_index; nm->current_process_index = node->runtime_index; + vlib_node_runtime_perf_counter (vm, node_runtime, f, 0, last_time_stamp, + VLIB_NODE_RUNTIME_PERF_BEFORE); + n_vectors = vlib_process_startup (vm, p, f); nm->current_process_index = old_process_index; @@ -1571,6 +1338,9 @@ dispatch_process (vlib_main_t * vm, vlib_elog_main_loop_event (vm, node_runtime->node_index, t, is_suspend, /* is_after */ 1); + vlib_node_runtime_perf_counter (vm, node_runtime, f, n_vectors, t, + VLIB_NODE_RUNTIME_PERF_AFTER); + vlib_process_update_stats (vm, p, /* n_calls */ !is_suspend, /* n_vectors */ n_vectors, @@ -1621,7 +1391,10 @@ dispatch_suspended_process (vlib_main_t * vm, /* Save away current process for suspend. */ nm->current_process_index = node->runtime_index; - n_vectors = vlib_process_resume (p); + vlib_node_runtime_perf_counter (vm, node_runtime, f, 0, last_time_stamp, + VLIB_NODE_RUNTIME_PERF_BEFORE); + + n_vectors = vlib_process_resume (vm, p); t = clib_cpu_time_now (); nm->current_process_index = ~0; @@ -1654,6 +1427,9 @@ dispatch_suspended_process (vlib_main_t * vm, vlib_elog_main_loop_event (vm, node_runtime->node_index, t, !is_suspend, /* is_after */ 1); + vlib_node_runtime_perf_counter (vm, node_runtime, f, n_vectors, t, + VLIB_NODE_RUNTIME_PERF_AFTER); + vlib_process_update_stats (vm, p, /* n_calls */ !is_suspend, /* n_vectors */ n_vectors, @@ -1668,7 +1444,6 @@ vl_api_send_pending_rpc_requests (vlib_main_t * vm) { } - static_always_inline void vlib_main_or_worker_loop (vlib_main_t * vm, int is_main) { @@ -1676,15 +1451,15 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main) vlib_thread_main_t *tm = vlib_get_thread_main (); uword i; u64 cpu_time_now; + f64 now; vlib_frame_queue_main_t *fqm; - u32 *last_node_runtime_indices = 0; u32 frame_queue_check_counter = 0; /* Initialize pending node vector. */ if (is_main) { vec_resize (nm->pending_frames, 32); - _vec_len (nm->pending_frames) = 0; + vec_set_len (nm->pending_frames, 0); } /* Mark time of main loop start. */ @@ -1697,10 +1472,7 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main) cpu_time_now = clib_cpu_time_now (); /* Pre-allocate interupt runtime indices and lock. */ - vec_alloc (nm->pending_interrupt_node_runtime_indices, 32); - vec_alloc (last_node_runtime_indices, 32); - if (!is_main) - clib_spinlock_init (&nm->pending_interrupt_lock); + vec_alloc_aligned (nm->pending_interrupts, 1, CLIB_CACHE_LINE_BYTES); /* Pre-allocate expired nodes. */ if (!nm->polling_threshold_vector_length) @@ -1710,6 +1482,7 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main) vm->cpu_id = clib_get_current_cpu_id (); vm->numa_node = clib_get_current_numa_node (); + os_set_numa_index (vm->numa_node); /* Start all processes. */ if (is_main) @@ -1740,33 +1513,38 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main) } if (!is_main) - { - vlib_worker_thread_barrier_check (); - if (PREDICT_FALSE (vm->check_frame_queues + - frame_queue_check_counter)) - { - u32 processed = 0; + vlib_worker_thread_barrier_check (); - if (vm->check_frame_queues) - { - frame_queue_check_counter = 100; - vm->check_frame_queues = 0; - } + if (PREDICT_FALSE (vm->check_frame_queues + frame_queue_check_counter)) + { + u32 processed = 0; + vlib_frame_queue_dequeue_fn_t *fn; - vec_foreach (fqm, tm->frame_queue_mains) - processed += vlib_frame_queue_dequeue (vm, fqm); + if (vm->check_frame_queues) + { + frame_queue_check_counter = 100; + vm->check_frame_queues = 0; + } - /* No handoff queue work found? */ - if (processed) - frame_queue_check_counter = 100; - else - frame_queue_check_counter--; + vec_foreach (fqm, tm->frame_queue_mains) + { + fn = fqm->frame_queue_dequeue_fn; + processed += (fn) (vm, fqm); } - if (PREDICT_FALSE (vec_len (vm->worker_thread_main_loop_callbacks))) - clib_call_callbacks (vm->worker_thread_main_loop_callbacks, vm); + + /* No handoff queue work found? */ + if (processed) + frame_queue_check_counter = 100; + else + frame_queue_check_counter--; } + if (PREDICT_FALSE (vec_len (vm->worker_thread_main_loop_callbacks))) + clib_call_callbacks (vm->worker_thread_main_loop_callbacks, vm, + cpu_time_now); + /* Process pre-input nodes. */ + cpu_time_now = clib_cpu_time_now (); vec_foreach (n, nm->nodes_by_type[VLIB_NODE_TYPE_PRE_INPUT]) cpu_time_now = dispatch_node (vm, n, VLIB_NODE_TYPE_PRE_INPUT, @@ -1785,47 +1563,31 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main) if (PREDICT_TRUE (is_main && vm->queue_signal_pending == 0)) vm->queue_signal_callback (vm); - /* Next handle interrupts. */ - { - /* unlocked read, for performance */ - uword l = _vec_len (nm->pending_interrupt_node_runtime_indices); - uword i; - if (PREDICT_FALSE (l > 0)) - { - u32 *tmp; - if (!is_main) - { - clib_spinlock_lock (&nm->pending_interrupt_lock); - /* Re-read w/ lock held, in case another thread added an item */ - l = _vec_len (nm->pending_interrupt_node_runtime_indices); - } + if (__atomic_load_n (nm->pending_interrupts, __ATOMIC_ACQUIRE)) + { + int int_num = -1; + *nm->pending_interrupts = 0; + + while ((int_num = + clib_interrupt_get_next (nm->interrupts, int_num)) != -1) + { + vlib_node_runtime_t *n; + clib_interrupt_clear (nm->interrupts, int_num); + n = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT], + int_num); + cpu_time_now = dispatch_node (vm, n, VLIB_NODE_TYPE_INPUT, + VLIB_NODE_STATE_INTERRUPT, + /* frame */ 0, cpu_time_now); + } + } - tmp = nm->pending_interrupt_node_runtime_indices; - nm->pending_interrupt_node_runtime_indices = - last_node_runtime_indices; - last_node_runtime_indices = tmp; - _vec_len (last_node_runtime_indices) = 0; - if (!is_main) - clib_spinlock_unlock (&nm->pending_interrupt_lock); - for (i = 0; i < l; i++) - { - n = vec_elt_at_index (nm->nodes_by_type[VLIB_NODE_TYPE_INPUT], - last_node_runtime_indices[i]); - cpu_time_now = - dispatch_node (vm, n, VLIB_NODE_TYPE_INPUT, - VLIB_NODE_STATE_INTERRUPT, - /* frame */ 0, - cpu_time_now); - } - } - } /* Input nodes may have added work to the pending vector. Process pending vector until there is nothing left. All pending vectors will be processed from input -> output. */ for (i = 0; i < _vec_len (nm->pending_frames); i++) cpu_time_now = dispatch_pending_node (vm, i, cpu_time_now); /* Reset pending vector for next iteration. */ - _vec_len (nm->pending_frames) = 0; + vec_set_len (nm->pending_frames, 0); if (is_main) { @@ -1911,14 +1673,40 @@ vlib_main_or_worker_loop (vlib_main_t * vm, int is_main) dispatch_suspended_process (vm, di, cpu_time_now); } } - _vec_len (nm->data_from_advancing_timing_wheel) = 0; + vec_set_len (nm->data_from_advancing_timing_wheel, 0); } } vlib_increment_main_loop_counter (vm); - /* Record time stamp in case there are no enabled nodes and above calls do not update time stamp. */ cpu_time_now = clib_cpu_time_now (); + vm->loops_this_reporting_interval++; + now = clib_time_now_internal (&vm->clib_time, cpu_time_now); + /* Time to update loops_per_second? */ + if (PREDICT_FALSE (now >= vm->loop_interval_end)) + { + /* Next sample ends in 20ms */ + if (vm->loop_interval_start) + { + f64 this_loops_per_second; + + this_loops_per_second = + ((f64) vm->loops_this_reporting_interval) / (now - + vm->loop_interval_start); + + vm->loops_per_second = + vm->loops_per_second * vm->damping_constant + + (1.0 - vm->damping_constant) * this_loops_per_second; + if (vm->loops_per_second != 0.0) + vm->seconds_per_loop = 1.0 / vm->loops_per_second; + else + vm->seconds_per_loop = 0.0; + } + /* New interval starts now, and ends in 20ms */ + vm->loop_interval_start = now; + vm->loop_interval_end = now + 2e-4; + vm->loops_this_reporting_interval = 0; + } } } @@ -1934,11 +1722,49 @@ vlib_worker_loop (vlib_main_t * vm) vlib_main_or_worker_loop (vm, /* is_main */ 0); } -vlib_main_t vlib_global_main; +vlib_global_main_t vlib_global_main; + +void +vlib_add_del_post_mortem_callback (void *cb, int is_add) +{ + vlib_global_main_t *vgm = vlib_get_global_main (); + int i; + + if (is_add == 0) + { + for (i = vec_len (vgm->post_mortem_callbacks) - 1; i >= 0; i--) + if (vgm->post_mortem_callbacks[i] == cb) + vec_del1 (vgm->post_mortem_callbacks, i); + return; + } + + for (i = 0; i < vec_len (vgm->post_mortem_callbacks); i++) + if (vgm->post_mortem_callbacks[i] == cb) + return; + vec_add1 (vgm->post_mortem_callbacks, cb); +} + +static void +elog_post_mortem_dump (void) +{ + elog_main_t *em = vlib_get_elog_main (); + + u8 *filename; + clib_error_t *error; + + filename = format (0, "/tmp/elog_post_mortem.%d%c", getpid (), 0); + error = elog_write_file (em, (char *) filename, 1 /* flush ring */); + if (error) + clib_error_report (error); + /* + * We're in the middle of crashing. Don't try to free the filename. + */ +} static clib_error_t * vlib_main_configure (vlib_main_t * vm, unformat_input_t * input) { + vlib_global_main_t *vgm = vlib_get_global_main (); int turn_on_mem_trace = 0; while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT) @@ -1947,10 +1773,26 @@ vlib_main_configure (vlib_main_t * vm, unformat_input_t * input) turn_on_mem_trace = 1; else if (unformat (input, "elog-events %d", - &vm->elog_main.event_ring_size)) - ; + &vgm->configured_elog_ring_size)) + vgm->configured_elog_ring_size = + 1 << max_log2 (vgm->configured_elog_ring_size); else if (unformat (input, "elog-post-mortem-dump")) - vm->elog_post_mortem_dump = 1; + vlib_add_del_post_mortem_callback (elog_post_mortem_dump, + /* is_add */ 1); + else if (unformat (input, "buffer-alloc-success-rate %f", + &vm->buffer_alloc_success_rate)) + { + if (VLIB_BUFFER_ALLOC_FAULT_INJECTOR == 0) + return clib_error_return + (0, "Buffer fault injection not configured"); + } + else if (unformat (input, "buffer-alloc-success-seed %u", + &vm->buffer_alloc_success_seed)) + { + if (VLIB_BUFFER_ALLOC_FAULT_INJECTOR == 0) + return clib_error_return + (0, "Buffer fault injection not configured"); + } else return unformat_parse_error (input); } @@ -1967,12 +1809,11 @@ vlib_main_configure (vlib_main_t * vm, unformat_input_t * input) VLIB_EARLY_CONFIG_FUNCTION (vlib_main_configure, "vlib"); static void -dummy_queue_signal_callback (vlib_main_t * vm) +placeholder_queue_signal_callback (vlib_main_t * vm) { } #define foreach_weak_reference_stub \ -_(vlib_map_stat_segment_init) \ _(vpe_api_init) \ _(vlibmemory_init) \ _(map_api_segment_init) @@ -2010,24 +1851,22 @@ vl_api_get_elog_trace_api_messages (void) int vlib_main (vlib_main_t * volatile vm, unformat_input_t * input) { + vlib_global_main_t *vgm = vlib_get_global_main (); clib_error_t *volatile error; vlib_node_main_t *nm = &vm->node_main; - vm->queue_signal_callback = dummy_queue_signal_callback; + vm->queue_signal_callback = placeholder_queue_signal_callback; - clib_time_init (&vm->clib_time); - - /* Turn on event log. */ - if (!vm->elog_main.event_ring_size) - vm->elog_main.event_ring_size = 128 << 10; - elog_init (&vm->elog_main, vm->elog_main.event_ring_size); - elog_enable_disable (&vm->elog_main, 1); - vl_api_set_elog_main (&vm->elog_main); + /* Reconfigure event log which is enabled very early */ + if (vgm->configured_elog_ring_size && + vgm->configured_elog_ring_size != vgm->elog_main.event_ring_size) + elog_resize (&vgm->elog_main, vgm->configured_elog_ring_size); + vl_api_set_elog_main (vlib_get_elog_main ()); (void) vl_api_set_elog_trace_api_messages (1); /* Default name. */ - if (!vm->name) - vm->name = "VLIB"; + if (!vgm->name) + vgm->name = "VLIB"; if ((error = vlib_physmem_init (vm))) { @@ -2035,7 +1874,13 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input) goto done; } - if ((error = vlib_map_stat_segment_init (vm))) + if ((error = vlib_log_init (vm))) + { + clib_error_report (error); + goto done; + } + + if ((error = vlib_stats_init (vm))) { clib_error_report (error); goto done; @@ -2053,6 +1898,9 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input) goto done; } + /* Register node ifunction variants */ + vlib_register_all_node_march_variants (vm); + /* Register static nodes so that init functions may use them. */ vlib_register_all_static_nodes (vm); @@ -2092,8 +1940,8 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input) } /* See unix/main.c; most likely already set up */ - if (vm->init_functions_called == 0) - vm->init_functions_called = hash_create (0, /* value bytes */ 0); + if (vgm->init_functions_called == 0) + vgm->init_functions_called = hash_create (0, /* value bytes */ 0); if ((error = vlib_call_all_init_functions (vm))) goto done; @@ -2101,7 +1949,7 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input) CLIB_CACHE_LINE_BYTES); vec_validate (nm->data_from_advancing_timing_wheel, 10); - _vec_len (nm->data_from_advancing_timing_wheel) = 0; + vec_set_len (nm->data_from_advancing_timing_wheel, 0); /* Create the process timing wheel */ TW (tw_timer_wheel_init) ((TWT (tw_timer_wheel) *) nm->timing_wheel, @@ -2110,15 +1958,32 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input) ~0 /* max expirations per call */ ); vec_validate (vm->pending_rpc_requests, 0); - _vec_len (vm->pending_rpc_requests) = 0; + vec_set_len (vm->pending_rpc_requests, 0); vec_validate (vm->processing_rpc_requests, 0); - _vec_len (vm->processing_rpc_requests) = 0; + vec_set_len (vm->processing_rpc_requests, 0); + + /* Default params for the buffer allocator fault injector, if configured */ + if (VLIB_BUFFER_ALLOC_FAULT_INJECTOR > 0) + { + vm->buffer_alloc_success_seed = 0xdeaddabe; + vm->buffer_alloc_success_rate = 0.80; + } if ((error = vlib_call_all_config_functions (vm, input, 0 /* is_early */ ))) goto done; + /* + * Use exponential smoothing, with a half-life of 1 second + * reported_rate(t) = reported_rate(t-1) * K + rate(t)*(1-K) + * + * Sample every 20ms, aka 50 samples per second + * K = exp (-1.0/20.0); + * K = 0.95 + */ + vm->damping_constant = exp (-1.0 / 20.0); + /* Sort per-thread init functions before we start threads */ - vlib_sort_init_exit_functions (&vm->worker_init_function_registrations); + vlib_sort_init_exit_functions (&vgm->worker_init_function_registrations); /* Call all main loop enter functions. */ { @@ -2145,6 +2010,7 @@ vlib_main (vlib_main_t * volatile vm, unformat_input_t * input) vlib_main_loop (vm); done: + vlib_worker_thread_barrier_sync (vm); /* Call all exit functions. */ { clib_error_t *sub_error; @@ -2152,238 +2018,32 @@ done: if (sub_error) clib_error_report (sub_error); } + vlib_worker_thread_barrier_release (vm); if (error) clib_error_report (error); - return 0; + return vm->main_loop_exit_status; } -static inline clib_error_t * -pcap_dispatch_trace_command_internal (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd, int rx_tx) +vlib_main_t * +vlib_get_main_not_inline (void) { - unformat_input_t _line_input, *line_input = &_line_input; - pcap_main_t *pm = &vm->dispatch_pcap_main; - u8 *filename = 0; - u32 max = 1000; - int enabled = 0; - int is_error = 0; - clib_error_t *error = 0; - u32 node_index, add; - vlib_trace_main_t *tm; - vlib_trace_node_t *tn; - - /* Get a line of input. */ - if (!unformat_user (input, unformat_line_input, line_input)) - return 0; - - while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) - { - if (unformat (line_input, "on")) - { - if (vm->dispatch_pcap_enable == 0) - { - enabled = 1; - } - else - { - vlib_cli_output (vm, "pcap dispatch capture already on..."); - is_error = 1; - break; - } - } - else if (unformat (line_input, "off")) - { - if (vm->dispatch_pcap_enable) - { - vlib_cli_output - (vm, "captured %d pkts...", pm->n_packets_captured); - if (pm->n_packets_captured) - { - pm->n_packets_to_capture = pm->n_packets_captured; - error = pcap_write (pm); - if (error) - clib_error_report (error); - else - vlib_cli_output (vm, "saved to %s...", pm->file_name); - } - vm->dispatch_pcap_enable = 0; - } - else - { - vlib_cli_output (vm, "pcap tx capture already off..."); - is_error = 1; - break; - } - } - else if (unformat (line_input, "max %d", &max)) - { - if (vm->dispatch_pcap_enable) - { - vlib_cli_output - (vm, - "can't change max value while pcap tx capture active..."); - is_error = 1; - break; - } - pm->n_packets_to_capture = max; - } - else - if (unformat - (line_input, "file %U", unformat_vlib_tmpfile, &filename)) - { - if (vm->dispatch_pcap_enable) - { - vlib_cli_output - (vm, "can't change file while pcap tx capture active..."); - is_error = 1; - break; - } - } - else if (unformat (line_input, "status")) - { - if (vm->dispatch_pcap_enable) - { - vlib_cli_output - (vm, "pcap dispatch capture is on: %d of %d pkts...", - pm->n_packets_captured, pm->n_packets_to_capture); - vlib_cli_output (vm, "Capture to file %s", pm->file_name); - } - else - { - vlib_cli_output (vm, "pcap dispatch capture is off..."); - } - break; - } - else if (unformat (line_input, "buffer-trace %U %d", - unformat_vlib_node, vm, &node_index, &add)) - { - if (vnet_trace_dummy == 0) - vec_validate_aligned (vnet_trace_dummy, 2048, - CLIB_CACHE_LINE_BYTES); - vlib_cli_output (vm, "Buffer tracing of %d pkts from %U enabled...", - add, format_vlib_node_name, vm, node_index); - - /* *INDENT-OFF* */ - foreach_vlib_main (( - { - tm = &this_vlib_main->trace_main; - tm->verbose = 0; /* not sure this ever did anything... */ - vec_validate (tm->nodes, node_index); - tn = tm->nodes + node_index; - tn->limit += add; - tm->trace_enable = 1; - })); - /* *INDENT-ON* */ - } - - else - { - error = clib_error_return (0, "unknown input `%U'", - format_unformat_error, line_input); - is_error = 1; - break; - } - } - unformat_free (line_input); - - if (is_error == 0) - { - /* Clean up from previous run */ - vec_free (pm->file_name); - vec_free (pm->pcap_data); - - memset (pm, 0, sizeof (*pm)); - pm->n_packets_to_capture = max; - - if (enabled) - { - if (filename == 0) - filename = format (0, "/tmp/dispatch.pcap%c", 0); - - pm->file_name = (char *) filename; - pm->n_packets_captured = 0; - pm->packet_type = PCAP_PACKET_TYPE_vpp; - if (pm->lock == 0) - clib_spinlock_init (&(pm->lock)); - vm->dispatch_pcap_enable = 1; - vlib_cli_output (vm, "pcap dispatch capture on..."); - } - } - - return error; + return vlib_get_main (); } -static clib_error_t * -pcap_dispatch_trace_command_fn (vlib_main_t * vm, - unformat_input_t * input, - vlib_cli_command_t * cmd) +elog_main_t * +vlib_get_elog_main_not_inline () { - return pcap_dispatch_trace_command_internal (vm, input, cmd, VLIB_RX); + return &vlib_global_main.elog_main; } -/*? - * This command is used to start or stop pcap dispatch trace capture, or show - * the capture status. - * - * This command has the following optional parameters: - * - * - on|off - Used to start or stop capture. - * - * - max - Depth of local buffer. Once 'nn' number - * of packets have been received, buffer is flushed to file. Once another - * 'nn' number of packets have been received, buffer is flushed - * to file, overwriting previous write. If not entered, value defaults - * to 100. Can only be updated if packet capture is off. - * - * - file - Used to specify the output filename. The file will - * be placed in the '/tmp' directory, so only the filename is - * supported. Directory should not be entered. If file already exists, file - * will be overwritten. If no filename is provided, '/tmp/vpe.pcap' - * will be used. Can only be updated if packet capture is off. - * - * - status - Displays the current status and configured attributes - * associated with a packet capture. If packet capture is in progress, - * 'status' also will return the number of packets currently in - * the local buffer. All additional attributes entered on command line - * with 'status' will be ignored and not applied. - * - * @cliexpar - * Example of how to display the status of capture when off: - * @cliexstart{pcap dispatch trace status} - * max is 100, for any interface to file /tmp/vpe.pcap - * pcap dispatch capture is off... - * @cliexend - * Example of how to start a dispatch trace capture: - * @cliexstart{pcap dispatch trace on max 35 file dispatchTrace.pcap} - * pcap dispatch capture on... - * @cliexend - * Example of how to start a dispatch trace capture with buffer tracing - * @cliexstart{pcap dispatch trace on max 10000 file dispatchTrace.pcap buffer-trace dpdk-input 1000} - * pcap dispatch capture on... - * @cliexend - * Example of how to display the status of a tx packet capture in progress: - * @cliexstart{pcap tx trace status} - * max is 35, dispatch trace to file /tmp/vppTest.pcap - * pcap tx capture is on: 20 of 35 pkts... - * @cliexend - * Example of how to stop a tx packet capture: - * @cliexstart{vppctl pcap dispatch trace off} - * captured 21 pkts... - * saved to /tmp/dispatchTrace.pcap... - * @cliexend -?*/ -/* *INDENT-OFF* */ -VLIB_CLI_COMMAND (pcap_dispatch_trace_command, static) = { - .path = "pcap dispatch trace", - .short_help = - "pcap dispatch trace [on|off] [max ] [file ] [status]\n" - " [buffer-trace ]", - .function = pcap_dispatch_trace_command_fn, -}; -/* *INDENT-ON* */ +void +vlib_exit_with_status (vlib_main_t *vm, int status) +{ + vm->main_loop_exit_status = status; + __atomic_store_n (&vm->main_loop_exit_now, 1, __ATOMIC_RELEASE); +} /* * fd.io coding-style-patch-verification: ON