From 32dcd3b2f227dec638c39ade0c58d6741d83ec30 Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Mon, 8 Jul 2019 12:25:38 -0400 Subject: vppinfra: allocate bihash virtual space on demand Reduces the vpp image virtual size by multiple gigabytes Add a "show bihash" command which displays configured and current virtual space in use by bihash tables. Modify the .py test framework to call "show bihash" on test tear-down Type: refactor Change-Id: Ifc1b7e2c43d29bbef645f6802fa29ff8ef09940c Signed-off-by: Dave Barach --- src/vpp/vnet/main.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) (limited to 'src/vpp/vnet') diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c index 5100d5c79b8..673120a2a97 100644 --- a/src/vpp/vnet/main.c +++ b/src/vpp/vnet/main.c @@ -415,6 +415,87 @@ vlib_app_num_thread_stacks_needed (void) * messages! */ +#include + +typedef struct +{ + u8 *name; + u64 actual_virt_size; + u64 configured_virt_size; +} name_sort_t; + +static int +name_sort_cmp (void *a1, void *a2) +{ + name_sort_t *n1 = a1; + name_sort_t *n2 = a2; + + return strcmp ((char *) n1->name, (char *) n2->name); +} + +static clib_error_t * +show_bihash_command_fn (vlib_main_t * vm, + unformat_input_t * input, vlib_cli_command_t * cmd) +{ + int i; + clib_bihash_8_8_t *h; + u64 total_actual_virt_size = 0; + u64 total_configured_virt_size = 0; + u64 actual_virt_size; + u64 configured_virt_size; + name_sort_t *names = 0; + name_sort_t *this; + int verbose = 0; + + if (unformat (input, "verbose")) + verbose = 1; + + for (i = 0; i < vec_len (clib_all_bihashes); i++) + { + h = (clib_bihash_8_8_t *) clib_all_bihashes[i]; + if (alloc_arena (h) || verbose) + { + vec_add2 (names, this, 1); + this->name = format (0, "%s%c", h->name, 0); + configured_virt_size = h->memory_size; + actual_virt_size = alloc_arena (h) ? h->memory_size : 0ULL; + this->actual_virt_size = actual_virt_size; + this->configured_virt_size = configured_virt_size; + total_actual_virt_size += actual_virt_size; + total_configured_virt_size += configured_virt_size; + } + } + + vec_sort_with_function (names, name_sort_cmp); + + vlib_cli_output (vm, "%-30s %8s %s", "Name", "Actual", "Configured"); + + for (i = 0; i < vec_len (names); i++) + { + vlib_cli_output (vm, "%-30s %8U %U", names[i].name, + format_memory_size, + names[i].actual_virt_size, + format_memory_size, names[i].configured_virt_size); + vec_free (names[i].name); + } + + vec_free (names); + + vlib_cli_output (vm, "%-30s %8U %U", "Total", + format_memory_size, total_actual_virt_size, + format_memory_size, total_configured_virt_size); + return 0; +} + +/* *INDENT-OFF* */ +VLIB_CLI_COMMAND (show_bihash_command, static) = +{ + .path = "show bihash", + .short_help = "show bihash", + .function = show_bihash_command_fn, +}; +/* *INDENT-ON* */ + /* * fd.io coding-style-patch-verification: ON * -- cgit 1.2.3-korg