3 files changed, 49 insertions, 2 deletions

diff --git a/src/vnet/ip/ip4_mtrie.c b/src/vnet/ip/ip4_mtrie.c
index 00855f7db43..df70dc9edca 100644
--- a/src/vnet/ip/ip4_mtrie.c
+++ b/src/vnet/ip/ip4_mtrie.c
@@ -190,7 +190,7 @@ ip4_mtrie_8_init (ip4_mtrie_8_t *m)
 {
   ip4_mtrie_8_ply_t *root;
 
-  pool_get (ip4_ply_pool, root);
+  pool_get_aligned (ip4_ply_pool, root, CLIB_CACHE_LINE_BYTES);
   m->root_ply = root - ip4_ply_pool;
 
   ply_8_init (root, IP4_MTRIE_LEAF_EMPTY, 0, 0);
@@ -853,13 +853,19 @@ ip4_mtrie_module_init (vlib_main_t * vm)
   clib_error_t *error = NULL;
 
   /* Burn one ply so index 0 is taken */
-  pool_get (ip4_ply_pool, p);
+  pool_get_aligned (ip4_ply_pool, p, CLIB_CACHE_LINE_BYTES);
 
   return (error);
 }
 
 VLIB_INIT_FUNCTION (ip4_mtrie_module_init);
 
+void
+ip4_mtrie_pool_alloc (uword size)
+{
+  pool_alloc_aligned (ip4_ply_pool, size, CLIB_CACHE_LINE_BYTES);
+}
+
 /*
  * fd.io coding-style-patch-verification: ON
  *
diff --git a/src/vnet/ip/ip4_mtrie.h b/src/vnet/ip/ip4_mtrie.h
index 16c524745be..2631f07eb2b 100644
--- a/src/vnet/ip/ip4_mtrie.h
+++ b/src/vnet/ip/ip4_mtrie.h
@@ -179,6 +179,11 @@ format_function_t format_ip4_mtrie_8;
 extern ip4_mtrie_8_ply_t *ip4_ply_pool;
 
 /**
+ * @brief Pre-allocate the pool of plys
+ */
+extern void ip4_mtrie_pool_alloc (uword size);
+
+/**
  * Is the leaf terminal (i.e. an LB index) or non-terminal (i.e. a PLY index)
  */
 always_inline u32
diff --git a/src/vnet/ip/ip_init.c b/src/vnet/ip/ip_init.c
index c2490f196ef..cfc3644a1bf 100644
--- a/src/vnet/ip/ip_init.c
+++ b/src/vnet/ip/ip_init.c
@@ -38,6 +38,9 @@
  */
 
 #include <vnet/ip/ip.h>
+#include <vnet/ip/ip4_mtrie.h>
+#include <vnet/fib/fib_entry.h>
+#include <vnet/dpo/load_balance.h>
 
 ip_main_t ip_main;
 
@@ -112,6 +115,39 @@ VLIB_INIT_FUNCTION (ip_main_init) = {
 			    "flow_classify_init"),
 };
 
+static clib_error_t *
+ip_config_init (vlib_main_t *vm, unformat_input_t *input)
+{
+  uword lbsz = 0, fibentrysz = 0, mtriesz = 0;
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (unformat (input, "load-balance-pool-size %U", unformat_memory_size,
+		    &lbsz))
+	;
+      else if (unformat (input, "fib-entry-pool-size %U", unformat_memory_size,
+			 &fibentrysz))
+	;
+      else if (unformat (input, "ip4-mtrie-pool-size %U", unformat_memory_size,
+			 &mtriesz))
+	;
+      else
+	return clib_error_return (0, "unknown input `%U'",
+				  format_unformat_error, input);
+    }
+
+  if (lbsz)
+    load_balance_pool_alloc (lbsz);
+  if (fibentrysz)
+    fib_entry_pool_alloc (fibentrysz);
+  if (mtriesz)
+    ip4_mtrie_pool_alloc (mtriesz);
+
+  return 0;
+}
+
+VLIB_CONFIG_FUNCTION (ip_config_init, "l3fib");
+
 /*
  * fd.io coding-style-patch-verification: ON
  *