X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp%2Fvnet%2Fmain.c;h=7c7dd9870e9f8ff82ab8cbd8ef9f374497710301;hb=a690fdbfe179e0ea65818c03b52535bf9210efd0;hp=6819ae6a3a42532778ac7c39e24b4c99c77a638d;hpb=64911369ad6605ac234a1c843359586c3adc078d;p=vpp.git

diff --git a/src/vpp/vnet/main.c b/src/vpp/vnet/main.c
index 6819ae6a3a4..7c7dd9870e9 100644
--- a/src/vpp/vnet/main.c
+++ b/src/vpp/vnet/main.c
@@ -20,6 +20,7 @@
 #include <vppinfra/cpu.h>
 #include <vlib/vlib.h>
 #include <vlib/unix/unix.h>
+#include <vlib/threads.h>
 #include <vnet/plugin/plugin.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vpp/app/version.h>
@@ -31,6 +32,7 @@
  */
 char *vlib_plugin_path = NULL;
 char *vlib_plugin_app_version = VPP_BUILD_VER;
+char *vat_plugin_path = NULL;
 
 static void
 vpp_find_plugin_path ()
@@ -106,6 +108,7 @@ main (int argc, char *argv[])
   u32 size;
   int main_core = 1;
   cpu_set_t cpuset;
+  void *main_heap;
 
 #if __x86_64__
   CLIB_UNUSED (const char *msg)
@@ -219,6 +222,11 @@ main (int argc, char *argv[])
 	  if (i < (argc - 1))
 	    vlib_plugin_path = argv[++i];
 	}
+      if (!strncmp (argv[i], "test_plugin_path", 16))
+	{
+	  if (i < (argc - 1))
+	    vat_plugin_path = argv[++i];
+	}
       else if (!strncmp (argv[i], "heapsize", 8))
 	{
 	  sizep = (u8 *) argv[i + 1];
@@ -267,8 +275,17 @@ defaulted:
   vl_msg_api_set_first_available_msg_id (VL_MSG_FIRST_AVAILABLE);
 
   /* Allocate main heap */
-  if (clib_mem_init_thread_safe (0, main_heap_size))
+  if ((main_heap = clib_mem_init_thread_safe (0, main_heap_size)))
     {
+      vlib_worker_thread_t tmp;
+
+      /* Figure out which numa runs the main thread */
+      vlib_get_thread_core_numa (&tmp, main_core);
+      __os_numa_index = tmp.numa_id;
+
+      /* and use the main heap as that numa's numa heap */
+      clib_mem_set_per_numa_heap (main_heap);
+
       vm->init_functions_called = hash_create (0, /* value bytes */ 0);
       vpe_main_init (vm);
       return vlib_unix_main (argc, argv);
@@ -304,7 +321,7 @@ heapsize_config (vlib_main_t * vm, unformat_input_t * input)
 VLIB_CONFIG_FUNCTION (heapsize_config, "heapsize");
 
 static clib_error_t *
-plugin_path_config (vlib_main_t * vm, unformat_input_t * input)
+dummy_path_config (vlib_main_t * vm, unformat_input_t * input)
 {
   u8 *junk;
 
@@ -322,8 +339,22 @@ plugin_path_config (vlib_main_t * vm, unformat_input_t * input)
   return 0;
 }
 
+static clib_error_t *
+plugin_path_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  return dummy_path_config (vm, input);
+}
+
 VLIB_CONFIG_FUNCTION (plugin_path_config, "plugin_path");
 
+static clib_error_t *
+test_plugin_path_config (vlib_main_t * vm, unformat_input_t * input)
+{
+  return dummy_path_config (vm, input);
+}
+
+VLIB_CONFIG_FUNCTION (test_plugin_path_config, "test_plugin_path");
+
 void vl_msg_api_post_mortem_dump (void);
 void elog_post_mortem_dump (void);
 
@@ -395,6 +426,96 @@ vlib_app_num_thread_stacks_needed (void)
  * messages!
  */
 
+#include <vppinfra/bihash_8_8.h>
+
+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* */
+
+#ifdef CLIB_SANITIZE_ADDR
+/* default options for Address Sanitizer */
+const char *
+__asan_default_options (void)
+{
+  return "unmap_shadow_on_exit=1:disable_coredump=0:abort_on_error=1";
+}
+#endif /* CLIB_SANITIZE_ADDR */
+
 /*
  * fd.io coding-style-patch-verification: ON
  *