X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fvpp%2Fstats%2Fstat_segment.c;h=43a48707f1c266623fe0df1d3db01683958f7cd9;hb=b2c31b685fd2cf28436ca32bc93e23eb24c74878;hp=8727122cee738a8bdcc8917b1961d1e76989b270;hpb=e29fb5bf1b9ab87f4213d990377ea2604990135b;p=vpp.git diff --git a/src/vpp/stats/stat_segment.c b/src/vpp/stats/stat_segment.c index 8727122cee7..43a48707f1c 100644 --- a/src/vpp/stats/stat_segment.c +++ b/src/vpp/stats/stat_segment.c @@ -22,7 +22,6 @@ #undef HAVE_MEMFD_CREATE #include #include -#include stat_segment_main_t stat_segment_main; @@ -157,7 +156,6 @@ vlib_stats_delete_cm (void *cm_arg) vlib_simple_counter_main_t *cm = (vlib_simple_counter_main_t *) cm_arg; stat_segment_main_t *sm = &stat_segment_main; stat_segment_directory_entry_t *e; - stat_segment_shared_header_t *shared_header = sm->shared_header; /* Not all counters have names / hash-table entries */ if (!cm->name && !cm->stat_segment_name) @@ -174,10 +172,7 @@ vlib_stats_delete_cm (void *cm_arg) e = &sm->directory_vector[index]; hash_unset (sm->directory_vector_by_name, &e->name); - u64 *offset_vector = stat_segment_pointer (shared_header, e->offset_vector); - void *oldheap = clib_mem_set_heap (sm->heap); /* Enter stats segment */ - vec_free (offset_vector); clib_mem_set_heap (oldheap); /* Exit stats segment */ memset (e, 0, sizeof (*e)); @@ -226,32 +221,10 @@ vlib_stats_pop_heap (void *cm_arg, void *oldheap, u32 cindex, } stat_segment_directory_entry_t *ep = &sm->directory_vector[vector_index]; - ep->offset = stat_segment_offset (shared_header, cm->counters); /* Vector of threads of vectors of counters */ - u64 *offset_vector = - ep->offset_vector ? stat_segment_pointer (shared_header, - ep->offset_vector) : 0; - - /* Update the 2nd dimension offset vector */ - int i; - vec_validate (offset_vector, vec_len (cm->counters) - 1); - - if (sm->last != offset_vector) - { - for (i = 0; i < vec_len (cm->counters); i++) - offset_vector[i] = - stat_segment_offset (shared_header, cm->counters[i]); - } - else - offset_vector[cindex] = - stat_segment_offset (shared_header, cm->counters[cindex]); - - ep->offset_vector = stat_segment_offset (shared_header, offset_vector); - sm->directory_vector[vector_index].offset = - stat_segment_offset (shared_header, cm->counters); + ep->data = cm->counters; /* Reset the client hash table pointer, since it WILL change! */ - shared_header->directory_offset = - stat_segment_offset (shared_header, sm->directory_vector); + shared_header->directory_vector = sm->directory_vector; vlib_stat_segment_unlock (); clib_mem_set_heap (oldheap); @@ -278,13 +251,11 @@ vlib_stats_register_error_index (void *oldheap, u8 * name, u64 * em_vec, memcpy (e.name, name, vec_len (name)); e.name[vec_len (name)] = '\0'; e.type = STAT_DIR_TYPE_ERROR_INDEX; - e.offset = index; - e.offset_vector = 0; + e.index = index; vector_index = vlib_stats_create_counter (&e, oldheap); /* Warn clients to refresh any pointers they might be holding */ - shared_header->directory_offset = - stat_segment_offset (shared_header, sm->directory_vector); + shared_header->directory_vector = sm->directory_vector; } vlib_stat_segment_unlock (); @@ -293,45 +264,25 @@ vlib_stats_register_error_index (void *oldheap, u8 * name, u64 * em_vec, static void stat_validate_counter_vector (stat_segment_directory_entry_t * ep, u32 max) { - stat_segment_main_t *sm = &stat_segment_main; - stat_segment_shared_header_t *shared_header = sm->shared_header; - counter_t **counters = - ep->offset ? stat_segment_pointer (shared_header, ep->offset) : 0; + counter_t **counters = ep->data; vlib_thread_main_t *tm = vlib_get_thread_main (); int i; - u64 *offset_vector = 0; vec_validate_aligned (counters, tm->n_vlib_mains - 1, CLIB_CACHE_LINE_BYTES); - ep->offset = stat_segment_offset (shared_header, counters); - for (i = 0; i < tm->n_vlib_mains; i++) - { - vec_validate_aligned (counters[i], max, CLIB_CACHE_LINE_BYTES); - vec_add1 (offset_vector, - stat_segment_offset (shared_header, counters[i])); - } + vec_validate_aligned (counters[i], max, CLIB_CACHE_LINE_BYTES); - if (ep->offset_vector) - { - u64 *p = stat_segment_pointer (sm->shared_header, ep->offset_vector); - vec_free (p); - } - ep->offset_vector = stat_segment_offset (shared_header, offset_vector); + ep->data = counters; } always_inline void stat_set_simple_counter (stat_segment_directory_entry_t * ep, u32 thread_index, u32 index, u64 value) { - stat_segment_main_t *sm = &stat_segment_main; - stat_segment_shared_header_t *shared_header = sm->shared_header; - - ASSERT (shared_header); - counter_t *offset_vector = - stat_segment_pointer (sm->shared_header, ep->offset_vector); - counter_t *cb = - stat_segment_pointer (sm->shared_header, offset_vector[thread_index]); + ASSERT (ep->data); + counter_t **counters = ep->data; + counter_t *cb = counters[thread_index]; cb[index] = value; } @@ -349,13 +300,10 @@ vlib_stats_pop_heap2 (u64 * error_vector, u32 thread_index, void *oldheap, /* Reset the client hash table pointer, since it WILL change! */ vec_validate (sm->error_vector, thread_index); - sm->error_vector[thread_index] = - stat_segment_offset (shared_header, error_vector); + sm->error_vector[thread_index] = error_vector; - shared_header->error_offset = - stat_segment_offset (shared_header, sm->error_vector); - shared_header->directory_offset = - stat_segment_offset (shared_header, sm->directory_vector); + shared_header->error_vector = sm->error_vector; + shared_header->directory_vector = sm->directory_vector; if (lock) vlib_stat_segment_unlock (); @@ -368,33 +316,37 @@ vlib_map_stat_segment_init (void) stat_segment_main_t *sm = &stat_segment_main; stat_segment_shared_header_t *shared_header; void *oldheap; - ssize_t memory_size; + uword memory_size, sys_page_sz; int mfd; - char *mem_name = "stat_segment_test"; - void *memaddr; + char *mem_name = "stat segment"; + void *heap, *memaddr; memory_size = sm->memory_size; if (memory_size == 0) memory_size = STAT_SEGMENT_DEFAULT_SIZE; - /* Create shared memory segment */ - if ((mfd = memfd_create (mem_name, 0)) < 0) - return clib_error_return (0, "stat segment memfd_create failure"); + if (sm->log2_page_sz == CLIB_MEM_PAGE_SZ_UNKNOWN) + sm->log2_page_sz = CLIB_MEM_PAGE_SZ_DEFAULT; + mfd = clib_mem_vm_create_fd (sm->log2_page_sz, mem_name); + + if (mfd == -1) + return clib_error_return (0, "stat segment memory fd failure: %U", + format_clib_error, clib_mem_get_last_error ()); /* Set size */ if ((ftruncate (mfd, memory_size)) == -1) return clib_error_return (0, "stat segment ftruncate failure"); - if ((memaddr = - mmap (NULL, memory_size, PROT_READ | PROT_WRITE, MAP_SHARED, mfd, - 0)) == MAP_FAILED) + memaddr = clib_mem_vm_map_shared (0, memory_size, mfd, 0, mem_name); + + if (memaddr == CLIB_MEM_VM_MAP_FAILED) return clib_error_return (0, "stat segment mmap failure"); - void *heap; - heap = - create_mspace_with_base (((u8 *) memaddr) + getpagesize (), - memory_size - getpagesize (), 1 /* locked */ ); - mspace_disable_expand (heap); + sys_page_sz = clib_mem_get_page_size (); + + heap = clib_mem_create_heap (((u8 *) memaddr) + sys_page_sz, memory_size + - sys_page_sz, 1 /* locked */ , + "stat segment"); sm->heap = heap; sm->memfd = mfd; @@ -402,6 +354,7 @@ vlib_map_stat_segment_init (void) sm->shared_header = shared_header = memaddr; shared_header->version = STAT_SEGMENT_VERSION; + shared_header->base = memaddr; sm->stat_segment_lockp = clib_mem_alloc (sizeof (clib_spinlock_t)); clib_spinlock_init (sm->stat_segment_lockp); @@ -420,15 +373,14 @@ vlib_map_stat_segment_init (void) sm->directory_vector[STAT_COUNTER_##E].type = STAT_DIR_TYPE_##t; foreach_stat_segment_counter_name #undef _ - /* Save the vector offset in the shared segment, for clients */ - shared_header->directory_offset = - stat_segment_offset (shared_header, sm->directory_vector); + /* Save the vector in the shared segment, for clients */ + shared_header->directory_vector = sm->directory_vector; clib_mem_set_heap (oldheap); /* Total shared memory size */ clib_mem_usage_t usage; - mheap_usage (sm->heap, &usage); + clib_mem_get_heap_usage (sm->heap, &usage); sm->directory_vector[STAT_COUNTER_MEM_STATSEG_TOTAL].value = usage.bytes_total; @@ -482,7 +434,7 @@ format_stat_dir_entry (u8 * s, va_list * args) break; } - return format (s, format_string, ep->name, type_name, ep->offset); + return format (s, format_string, ep->name, type_name, 0); } static clib_error_t * @@ -522,7 +474,8 @@ show_stat_segment_command_fn (vlib_main_t * vm, if (verbose) { ASSERT (sm->heap); - vlib_cli_output (vm, "%U", format_mheap, sm->heap, 0 /* verbose */ ); + vlib_cli_output (vm, "%U", format_clib_mem_heap, sm->heap, + 0 /* verbose */ ); } return 0; @@ -551,7 +504,6 @@ update_node_counters (stat_segment_main_t * sm) vlib_main_t **stat_vms = 0; vlib_node_t ***node_dups = 0; int i, j; - stat_segment_shared_header_t *shared_header = sm->shared_header; static u32 no_max_nodes = 0; vlib_node_get_nodes (0 /* vm, for barrier sync */ , @@ -582,16 +534,11 @@ update_node_counters (stat_segment_main_t * sm) vec_validate (sm->nodes, l - 1); stat_segment_directory_entry_t *ep; ep = &sm->directory_vector[STAT_COUNTER_NODE_NAMES]; - ep->offset = stat_segment_offset (shared_header, sm->nodes); + ep->data = sm->nodes; - int i; - u64 *offset_vector = - ep->offset_vector ? stat_segment_pointer (shared_header, - ep->offset_vector) : 0; /* Update names dictionary */ - vec_validate (offset_vector, l - 1); vlib_node_t **nodes = node_dups[0]; - + int i; for (i = 0; i < vec_len (nodes); i++) { vlib_node_t *n = nodes[i]; @@ -600,13 +547,7 @@ update_node_counters (stat_segment_main_t * sm) if (sm->nodes[n->index]) vec_free (sm->nodes[n->index]); sm->nodes[n->index] = s; - offset_vector[i] = - sm->nodes[i] ? stat_segment_offset (shared_header, - sm->nodes[i]) : 0; - } - ep->offset_vector = stat_segment_offset (shared_header, offset_vector); - vlib_stat_segment_unlock (); clib_mem_set_heap (oldheap); no_max_nodes = l; @@ -622,31 +563,19 @@ update_node_counters (stat_segment_main_t * sm) counter_t *c; vlib_node_t *n = nodes[i]; - counters = - stat_segment_pointer (shared_header, - sm->directory_vector - [STAT_COUNTER_NODE_CLOCKS].offset); + counters = sm->directory_vector[STAT_COUNTER_NODE_CLOCKS].data; c = counters[j]; c[n->index] = n->stats_total.clocks - n->stats_last_clear.clocks; - counters = - stat_segment_pointer (shared_header, - sm->directory_vector - [STAT_COUNTER_NODE_VECTORS].offset); + counters = sm->directory_vector[STAT_COUNTER_NODE_VECTORS].data; c = counters[j]; c[n->index] = n->stats_total.vectors - n->stats_last_clear.vectors; - counters = - stat_segment_pointer (shared_header, - sm->directory_vector - [STAT_COUNTER_NODE_CALLS].offset); + counters = sm->directory_vector[STAT_COUNTER_NODE_CALLS].data; c = counters[j]; c[n->index] = n->stats_total.calls - n->stats_last_clear.calls; - counters = - stat_segment_pointer (shared_header, - sm->directory_vector - [STAT_COUNTER_NODE_SUSPENDS].offset); + counters = sm->directory_vector[STAT_COUNTER_NODE_SUSPENDS].data; c = counters[j]; c[n->index] = n->stats_total.suspends - n->stats_last_clear.suspends; @@ -729,7 +658,7 @@ do_stat_segment_updates (stat_segment_main_t * sm) /* Stats segment memory heap counter */ clib_mem_usage_t usage; - mheap_usage (sm->heap, &usage); + clib_mem_get_heap_usage (sm->heap, &usage); sm->directory_vector[STAT_COUNTER_MEM_STATSEG_USED].value = usage.bytes_used; @@ -738,10 +667,10 @@ do_stat_segment_updates (stat_segment_main_t * sm) /* *INDENT-OFF* */ stat_segment_gauges_pool_t *g; - pool_foreach(g, sm->gauges, - ({ + pool_foreach (g, sm->gauges) + { g->fn(&sm->directory_vector[g->directory_index], g->caller_index); - })); + } /* *INDENT-ON* */ /* Heartbeat, so clients detect we're still here */ @@ -879,8 +808,7 @@ stat_segment_register_gauge (u8 * name, stat_segment_update_fn update_fn, vlib_stat_segment_lock (); vector_index = vlib_stats_create_counter (&e, oldheap); - shared_header->directory_offset = - stat_segment_offset (shared_header, sm->directory_vector); + shared_header->directory_vector = sm->directory_vector; vlib_stat_segment_unlock (); clib_mem_set_heap (oldheap); @@ -919,8 +847,7 @@ stat_segment_register_state_counter (u8 * name, u32 * index) vector_index = vlib_stats_create_counter (&e, oldheap); - shared_header->directory_offset = - stat_segment_offset (shared_header, sm->directory_vector); + shared_header->directory_vector = sm->directory_vector; vlib_stat_segment_unlock (); clib_mem_set_heap (oldheap); @@ -982,6 +909,9 @@ statseg_config (vlib_main_t * vm, unformat_input_t * input) else if (unformat (input, "size %U", unformat_memory_size, &sm->memory_size)) ; + else if (unformat (input, "page-size %U", + unformat_log2_page_size, &sm->log2_page_sz)) + ; else if (unformat (input, "per-node-counters on")) sm->node_counters_enabled = 1; else if (unformat (input, "per-node-counters off")) @@ -1009,7 +939,6 @@ static clib_error_t * statseg_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add) { stat_segment_main_t *sm = &stat_segment_main; - stat_segment_shared_header_t *shared_header = sm->shared_header; void *oldheap = vlib_stats_push_heap (sm->interfaces); vlib_stat_segment_lock (); @@ -1040,32 +969,7 @@ statseg_sw_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add) stat_segment_directory_entry_t *ep; ep = &sm->directory_vector[STAT_COUNTER_INTERFACE_NAMES]; - ep->offset = stat_segment_offset (shared_header, sm->interfaces); - - int i; - u64 *offset_vector = - ep->offset_vector ? stat_segment_pointer (shared_header, - ep->offset_vector) : 0; - - vec_validate (offset_vector, vec_len (sm->interfaces) - 1); - - if (sm->last != sm->interfaces) - { - /* the interface vector moved, so need to recalulate the offset array */ - for (i = 0; i < vec_len (sm->interfaces); i++) - { - offset_vector[i] = - sm->interfaces[i] ? stat_segment_offset (shared_header, - sm->interfaces[i]) : 0; - } - } - else - { - offset_vector[sw_if_index] = - sm->interfaces[sw_if_index] ? - stat_segment_offset (shared_header, sm->interfaces[sw_if_index]) : 0; - } - ep->offset_vector = stat_segment_offset (shared_header, offset_vector); + ep->data = sm->interfaces; vlib_stat_segment_unlock (); clib_mem_set_heap (oldheap);