feat: upgrade to VPP 22.10v22.10-rc0

Change-Id: I556bd8c44f0ff7a631a0df34b498ffd7952fcf4a
Signed-off-by: Mauro Sardara <msardara@cisco.com>

7 files changed, 48 insertions, 34 deletions

diff --git a/hicn-plugin/src/faces/app/face_prod.c b/hicn-plugin/src/faces/app/face_prod.c
index 73e2a1262..54fbd418a 100644
--- a/hicn-plugin/src/faces/app/face_prod.c
+++ b/hicn-plugin/src/faces/app/face_prod.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Cisco and/or its affiliates.
+ * Copyright (c) 2021-2023 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -17,6 +17,7 @@
 #include <vlib/vlib.h>
 #include <vnet/vnet.h>
 #include <vnet/interface_funcs.h>
+#include <vppinfra/pool.h>
 
 #include "face_prod.h"
 #include "address_mgr.h"
@@ -24,6 +25,7 @@
 #include "../../route.h"
 #include "../../cache_policies/cs_lru.h"
 
+#define INITIAL_POOL_SIZE 16
 hicn_face_prod_state_t *face_state_vec;
 
 /* used to check if an interface is already in the vector */
@@ -32,9 +34,6 @@ u32 *face_state_pool;
 static int
 hicn_app_state_create (u32 swif, index_t adj_index, fib_prefix_t *prefix)
 {
-  /* Make sure that the pool is not empty */
-  pool_validate_index (face_state_pool, 0);
-
   u32 *swif_app;
   u8 found = 0;
 
@@ -74,9 +73,6 @@ hicn_app_state_create (u32 swif, index_t adj_index, fib_prefix_t *prefix)
 static int
 hicn_app_state_del (u32 swif)
 {
-  /* Make sure that the pool is not empty */
-  pool_validate_index (face_state_pool, 0);
-
   u32 *temp;
   u32 *swif_app = NULL;
   u8 found = 0;
@@ -357,6 +353,13 @@ format_hicn_face_prod (u8 *s, va_list *args)
   return s;
 }
 
+void
+hicn_face_prod_init ()
+{
+  /* Make sure that the pool is not empty */
+  pool_alloc (face_state_pool, INITIAL_POOL_SIZE);
+}
+
 VNET_FEATURE_INIT (hicn_prod_app_input_ip6, static) = {
   .arc_name = "ip6-unicast",
   .node_name = "hicn-face-prod-input",
diff --git a/hicn-plugin/src/faces/app/face_prod.h b/hicn-plugin/src/faces/app/face_prod.h
index 51373d541..46bdf7c24 100644
--- a/hicn-plugin/src/faces/app/face_prod.h
+++ b/hicn-plugin/src/faces/app/face_prod.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Cisco and/or its affiliates.
+ * Copyright (c) 2021-2023 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -96,6 +96,11 @@ int hicn_face_prod_set_lru_max (hicn_face_id_t face_id, u32 *requested_size);
  */
 u8 *format_hicn_face_prod (u8 *s, va_list *args);
 
+/**
+ * @brief Init the producer face module
+ */
+void hicn_face_prod_init ();
+
 #endif /* _FACE_PROD_H_ */
 
 /*
diff --git a/hicn-plugin/src/faces/face.c b/hicn-plugin/src/faces/face.c
index 58c1c34c8..84fd5e6ee 100644
--- a/hicn-plugin/src/faces/face.c
+++ b/hicn-plugin/src/faces/face.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Cisco and/or its affiliates.
+ * Copyright (c) 2021-2023 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -15,6 +15,7 @@
 #include <vnet/fib/fib_entry_track.h>
 
 #include "face.h"
+#include "app/face_prod.h"
 #include "../hicn.h"
 #include "../params.h"
 #include "../error.h"
@@ -60,14 +61,14 @@ face_show (u8 *s, int face_id, u32 indent)
 mhash_t hicn_face_hashtb;
 
 const static char *const hicn_face6_nodes[] = {
-  "hicn6-face-output",	// this is the name you give your node in
-			// VLIB_REGISTER_NODE
+  "hicn6-face-output", // this is the name you give your node in
+		       // VLIB_REGISTER_NODE
   NULL,
 };
 
 const static char *const hicn_face4_nodes[] = {
-  "hicn4-face-output",	// this is the name you give your node in
-			// VLIB_REGISTER_NODE
+  "hicn4-face-output", // this is the name you give your node in
+		       // VLIB_REGISTER_NODE
   NULL,
 };
 
@@ -151,7 +152,6 @@ static const fib_node_vft_t hicn_face_fib_node_vft = {
 void
 hicn_face_module_init (vlib_main_t *vm)
 {
-  pool_validate (hicn_dpoi_face_pool);
   pool_alloc (hicn_dpoi_face_pool, 1024);
   counters = vec_new (vlib_combined_counter_main_t,
 		      HICN_PARAM_FACES_MAX * HICN_N_COUNTER);
@@ -171,6 +171,11 @@ hicn_face_module_init (vlib_main_t *vm)
    */
   hicn_face_fib_node_type =
     fib_node_register_new_type ("hicn_face_fib_node", &hicn_face_fib_node_vft);
+
+  /*
+   * Init producer face module
+   */
+  hicn_face_prod_init ();
 }
 
 u8 *
diff --git a/hicn-plugin/src/faces/face_cli.c b/hicn-plugin/src/faces/face_cli.c
index 20acefc5b..1c1501478 100644
--- a/hicn-plugin/src/faces/face_cli.c
+++ b/hicn-plugin/src/faces/face_cli.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Cisco and/or its affiliates.
+ * Copyright (c) 2021-2023 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -82,12 +82,12 @@ hicn_face_cli_show_command_fn (vlib_main_t *vm, unformat_input_t *main_input,
 		      HICN_FACE_CTRX_STRING[i]);
 
 	  if (n)
-	    _vec_len (n) = 0;
+	    vec_set_len (n, 0);
 	  n = format (n, "packets");
 	  s = format (s, "%U%-16v%16Ld", format_white_space,
 		      30 - strlen (HICN_FACE_CTRX_STRING[i]), n, v.packets);
 
-	  _vec_len (n) = 0;
+	  vec_set_len (n, 0);
 	  n = format (n, "bytes");
 	  s = format (s, "\n%U%-16v%16Ld\n", format_white_space, indent + 30,
 		      n, v.bytes);
@@ -120,13 +120,13 @@ hicn_face_cli_show_command_fn (vlib_main_t *vm, unformat_input_t *main_input,
 				      HICN_FACE_CTRX_STRING[i]);
 
 			  if (n)
-			    _vec_len (n) = 0;
+			    vec_set_len (n, 0);
 			  n = format (n, "packets");
 			  s = format (s, "%U%-16v%16Ld", format_white_space,
 				      30 - strlen (HICN_FACE_CTRX_STRING[i]),
 				      n, v.packets);
 
-			  _vec_len (n) = 0;
+			  vec_set_len (n, 0);
 			  n = format (n, "bytes");
 			  s =
 			    format (s, "\n%U%-16v%16Ld\n", format_white_space,
@@ -158,13 +158,13 @@ hicn_face_cli_show_command_fn (vlib_main_t *vm, unformat_input_t *main_input,
 				  HICN_FACE_CTRX_STRING[i]);
 
 		      if (n)
-			_vec_len (n) = 0;
+			vec_set_len (n, 0);
 		      n = format (n, "packets");
 		      s = format (s, "%U%-16v%16Ld", format_white_space,
 				  30 - strlen (HICN_FACE_CTRX_STRING[i]), n,
 				  v.packets);
 
-		      _vec_len (n) = 0;
+		      vec_set_len (n, 0);
 		      n = format (n, "bytes");
 		      s = format (s, "\n%U%-16v%16Ld\n", format_white_space,
 				  indent + 30, n, v.bytes);
diff --git a/hicn-plugin/src/route.c b/hicn-plugin/src/route.c
index 0c96e1412..a2e72b9c1 100644
--- a/hicn-plugin/src/route.c
+++ b/hicn-plugin/src/route.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Cisco and/or its affiliates.
+ * Copyright (c) 2021-2023 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -273,7 +273,7 @@ sync_hicn_fib_entry (hicn_dpo_ctx_t *fib_entry, hicn_face_id_t **pvec_faces)
 			    fib_entry->proto);
 	  ADD_FACE (nh);
 	  HICN_DEBUG ("Added new HICN face: %d because of route prefix %U",
-		      face_id, format_ip_prefix, &_fib_entry->fe_prefix);
+		      face_id, format_fib_prefix, &_fib_entry->fe_prefix);
 	}
       else if (dpo->dpoi_type == dpo_type_udp_ip4 ||
 	       dpo->dpoi_type == dpo_type_udp_ip6)
@@ -405,11 +405,10 @@ hicn_route_enable (fib_prefix_t *prefix, hicn_face_id_t **pvec_faces)
     {
       HICN_DEBUG (
 	"No route found for %U. Creating DPO and tracking fib prefix.",
-	format_ip_prefix, prefix);
+	format_fib_prefix, prefix);
       dpo_id_t dpo = DPO_INVALID;
-      index_t dpo_idx;
-      default_dpo.hicn_dpo_create (prefix->fp_proto, 0, NEXT_HOP_INVALID,
-				   &dpo_idx);
+      index_t dpo_idx = ~0;
+      default_dpo.hicn_dpo_create (prefix->fp_proto, 0, 0, &dpo_idx);
       HICN_DEBUG ("Created new DPO_MW_CTX_T: %d.", dpo_idx);
 
       /* the value we got when we registered */
@@ -534,8 +533,8 @@ hicn_route_disable (fib_prefix_t *prefix)
 
   if (fib_hicn_entry_index == FIB_NODE_INDEX_INVALID)
     {
-      HICN_ERROR ("Route %U not found", format_ip_prefix, prefix);
-      return HICN_ERROR_ROUTE_NOT_FOUND;
+      HICN_ERROR ("Route %U not found", format_fib_prefix, prefix);
+      ret = HICN_ERROR_ROUTE_NOT_FOUND;
     }
   else
     {
@@ -605,7 +604,7 @@ hicn_route_disable (fib_prefix_t *prefix)
       HICN_DEBUG (
 	"Calling fib_entry_untrack and fib_table_entry_special_remove "
 	"for route %U.",
-	format_ip_prefix, prefix);
+	format_fib_prefix, prefix);
 
       fib_entry_untrack (hicn_fib_entry->fib_entry_index,
 			 hicn_fib_entry->fib_sibling);
diff --git a/hicn-plugin/src/strategy_dpo_ctx.c b/hicn-plugin/src/strategy_dpo_ctx.c
index 2279ecc75..d43b7315b 100644
--- a/hicn-plugin/src/strategy_dpo_ctx.c
+++ b/hicn-plugin/src/strategy_dpo_ctx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 Cisco and/or its affiliates.
+ * Copyright (c) 2021-2023 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -21,7 +21,8 @@ hicn_dpo_ctx_t *hicn_strategy_dpo_ctx_pool;
 void
 hicn_strategy_init_dpo_ctx_pool ()
 {
-  // pool_init_fixed (hicn_strategy_dpo_ctx_pool, 256);
+  pool_alloc_aligned (hicn_strategy_dpo_ctx_pool, 256,
+		      2 * CLIB_CACHE_LINE_BYTES);
 }
 
 void
diff --git a/hicn-plugin/src/strategy_dpo_ctx.h b/hicn-plugin/src/strategy_dpo_ctx.h
index cb8ca4051..ae642a350 100644
--- a/hicn-plugin/src/strategy_dpo_ctx.h
+++ b/hicn-plugin/src/strategy_dpo_ctx.h
@@ -99,6 +99,7 @@ init_dpo_ctx (hicn_dpo_ctx_t *dpo_ctx, const hicn_face_id_t *next_hop,
 	      int nh_len, dpo_type_t dpo_type, dpo_proto_t proto)
 {
   hicn_face_id_t invalid = NEXT_HOP_INVALID;
+  int i = 0;
 
   dpo_ctx->entry_count = 0;
   dpo_ctx->locks = 0;
@@ -110,13 +111,13 @@ init_dpo_ctx (hicn_dpo_ctx_t *dpo_ctx, const hicn_face_id_t *next_hop,
 
   dpo_ctx->proto = (fib_protocol_t) proto;
 
-  for (int i = 0; i < HICN_PARAM_FIB_ENTRY_NHOPS_MAX && i < nh_len; i++)
+  for (i = 0; i < HICN_PARAM_FIB_ENTRY_NHOPS_MAX && i < nh_len; i++)
     {
       dpo_ctx->next_hops[i] = next_hop[i];
       dpo_ctx->entry_count++;
     }
 
-  for (int i = nh_len; i < HICN_PARAM_FIB_ENTRY_NHOPS_MAX; i++)
+  for (; i < HICN_PARAM_FIB_ENTRY_NHOPS_MAX; i++)
     {
       dpo_ctx->next_hops[i] = invalid;
     }