[HICN-138] Added number of received/transmitted bytes and packets on each face

Change-Id: Icfe9cd84bdc72afef3d714064e695d1abef368f5
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>

3 files changed, 132 insertions, 27 deletions

diff --git a/hicn-plugin/src/faces/udp/face_udp.c b/hicn-plugin/src/faces/udp/face_udp.c
index 6f345925b..7858db644 100644
--- a/hicn-plugin/src/faces/udp/face_udp.c
+++ b/hicn-plugin/src/faces/udp/face_udp.c
@@ -81,15 +81,17 @@ hicn_face_udp_init (vlib_main_t * vm)
   /* Default Strategy has index 0 and it always exists */
   strategy_face_udp4_vlib_edge = vlib_node_add_next (vm,
 						     hicn_dpo_get_strategy_vft
-						     (default_dpo.hicn_dpo_get_type
-						      ())->get_strategy_node_index
+						     (default_dpo.
+						      hicn_dpo_get_type ())->
+						     get_strategy_node_index
 						     (),
-						     hicn_face_udp4_output_node.index);
+						     hicn_face_udp4_output_node.
+						     index);
   strategy_face_udp6_vlib_edge =
     vlib_node_add_next (vm,
-			hicn_dpo_get_strategy_vft
-			(default_dpo.hicn_dpo_get_type
-			 ())->get_strategy_node_index (),
+			hicn_dpo_get_strategy_vft (default_dpo.
+						   hicn_dpo_get_type ())->
+			get_strategy_node_index (),
 			hicn_face_udp6_output_node.index);
 
   /*
@@ -265,17 +267,31 @@ hicn_face_udp_add (const ip46_address_t * local_addr,
       return HICN_ERROR_IPS_ADDR_TYPE_NONUNIFORM;
     }
 
+  for (int i = 0; i < HICN_N_COUNTER; i++)
+    {
+      vlib_validate_combined_counter (&counters[(*pfaceid) * HICN_N_COUNTER],
+				      i);
+      vlib_zero_combined_counter (&counters[(*pfaceid) * HICN_N_COUNTER], i);
+    }
+
   retx_t *retx = vlib_process_signal_event_data (vlib_get_main (),
-						 hicn_mapme_eventmgr_process_node.index,
+						 hicn_mapme_eventmgr_process_node.
+						 index,
 						 HICN_MAPME_EVENT_FACE_ADD, 1,
 						 sizeof (retx_t));
+  /* *INDENT-OFF* */
   *retx = (retx_t)
   {
-    .prefix = 0,.dpo = (dpo_id_t)
+    .prefix = 0,
+    .dpo = (dpo_id_t)
     {
-    .dpoi_type = hicn_face_udp_type,.dpoi_proto =
-	dpo_proto,.dpoi_next_node = 0,.dpoi_index = *pfaceid,}
+      .dpoi_type = hicn_face_udp_type,
+      .dpoi_proto = dpo_proto,
+      .dpoi_next_node = 0,
+      .dpoi_index = *pfaceid,
+    }
   };
+  /* *INDENT-ON* */
 
   return ret;
 }
diff --git a/hicn-plugin/src/faces/udp/face_udp_node.c b/hicn-plugin/src/faces/udp/face_udp_node.c
index 5f19eb0af..df24c477f 100644
--- a/hicn-plugin/src/faces/udp/face_udp_node.c
+++ b/hicn-plugin/src/faces/udp/face_udp_node.c
@@ -161,6 +161,12 @@ typedef enum
 								    \
         vlib_buffer_advance(b0, sizeof(IP_HEADER_##ipv) +           \
                             sizeof(udp_header_t));                  \
+        vlib_increment_combined_counter (                           \
+                           &counters[hicnb0->face_dpo_id.dpoi_index \
+                                  * HICN_N_COUNTER], thread_index,  \
+                           HICN_FACE_COUNTERS_DATA_RX,              \
+                           1,                                       \
+                           vlib_buffer_length_in_chain(vm, b0));    \
       }                                                             \
 								    \
     if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&	    \
@@ -266,6 +272,12 @@ typedef enum
 								    \
         vlib_buffer_advance(b0, sizeof(IP_HEADER_##ipv) +           \
                             sizeof(udp_header_t));                  \
+        vlib_increment_combined_counter (                           \
+                        &counters[hicnb0->face_dpo_id.dpoi_index    \
+                                  * HICN_N_COUNTER], thread_index,  \
+                        HICN_FACE_COUNTERS_DATA_RX,                 \
+                        1,                                          \
+                        vlib_buffer_length_in_chain(vm, b0));       \
       }                                                             \
                                                                     \
     if ( PREDICT_FALSE(ret1 != HICN_ERROR_NONE) )                   \
@@ -280,6 +292,12 @@ typedef enum
 								    \
         vlib_buffer_advance(b1, sizeof(IP_HEADER_##ipv) +           \
                             sizeof(udp_header_t));                  \
+        vlib_increment_combined_counter (                           \
+                          &counters[hicnb1->face_dpo_id.dpoi_index  \
+                                    * HICN_N_COUNTER], thread_index,\
+                          HICN_FACE_COUNTERS_DATA_RX,               \
+                          1,                                        \
+                          vlib_buffer_length_in_chain(vm, b1));     \
       }                                                             \
                                                                     \
     if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&      \
@@ -325,6 +343,7 @@ hicn_face_udp4_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   n_left_from = frame->n_vectors;
   next_index = node->cached_next_index;
   vl_api_hicn_api_node_stats_get_reply_t stats = { 0 };
+  u32 thread_index = vm->thread_index;
 
   while (n_left_from > 0)
     {
@@ -363,8 +382,9 @@ hicn_face_udp4_input_format_trace (u8 * s, va_list * args)
   s =
     format (s, "FACE_UDP4_INPUT: pkt: %d, sw_if_index %d, next index %d\n%U",
 	    (int) t->pkt_type, t->sw_if_index, t->next_index,
-	    (t->packet_data[0] & 0xf0) == 0x40 ? format_ip4_header : format_ip6_header,
-	    t->packet_data, sizeof (t->packet_data));
+	    (t->packet_data[0] & 0xf0) ==
+	    0x40 ? format_ip4_header : format_ip6_header, t->packet_data,
+	    sizeof (t->packet_data));
   return (s);
 }
 
@@ -403,6 +423,7 @@ hicn_face_udp6_input_node_fn (vlib_main_t * vm, vlib_node_runtime_t * node,
   n_left_from = frame->n_vectors;
   next_index = node->cached_next_index;
   vl_api_hicn_api_node_stats_get_reply_t stats = { 0 };
+  u32 thread_index = vm->thread_index;
 
   while (n_left_from > 0)
     {
@@ -444,8 +465,9 @@ hicn_face_udp6_input_format_trace (u8 * s, va_list * args)
   s =
     format (s, "FACE_UDP6_INPUT: pkt: %d, sw_if_index %d, next index %d\n%U",
 	    (int) t->pkt_type, t->sw_if_index, t->next_index,
-	    (t->packet_data[0] & 0xf0) == 0x40 ? format_ip4_header : format_ip6_header,
-	    t->packet_data, sizeof (t->packet_data));
+	    (t->packet_data[0] & 0xf0) ==
+	    0x40 ? format_ip4_header : format_ip6_header, t->packet_data,
+	    sizeof (t->packet_data));
   return (s);
 }
 
@@ -618,8 +640,9 @@ hicn_face_udp6_output_trace_t;
   n_left_from -= 1;                                                 \
                                                                     \
   b0 = vlib_get_buffer (vm, bi0);                                       \
+  hicn_face_id_t face_id = vnet_buffer (b0)->ip.adj_index[VLIB_TX];     \
   face =                                                                \
-    hicn_dpoi_get_from_idx(vnet_buffer (b0)->ip.adj_index[VLIB_TX]);    \
+    hicn_dpoi_get_from_idx(face_id);                                    \
                                                                         \
   if (PREDICT_TRUE(face != NULL))                                       \
     {                                                                   \
@@ -631,6 +654,12 @@ hicn_face_udp6_output_trace_t;
       HICN_FACE_UDP_ENCAP_IP##ipv                                       \
         (vm, b0, face, &next0);						\
       stats.pkts_interest_count += 1;					\
+      vlib_increment_combined_counter (                                 \
+                                   &counters[face_id * HICN_N_COUNTER], \
+                                   thread_index,                        \
+                                   HICN_FACE_COUNTERS_INTEREST_TX,      \
+                                   1,                                   \
+                                   vlib_buffer_length_in_chain(vm, b0));\
     }                                                                   \
                                                                         \
                                                                         \
@@ -692,6 +721,8 @@ hicn_face_udp6_output_trace_t;
     b0 = vlib_get_buffer (vm, bi0);                                     \
     b1 = vlib_get_buffer (vm, bi1);                                     \
                                                                         \
+    hicn_face_id_t face_id0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];  \
+    hicn_face_id_t face_id1 = vnet_buffer (b1)->ip.adj_index[VLIB_TX];  \
     face0 =                                                             \
       hicn_dpoi_get_from_idx(vnet_buffer (b0)->ip.adj_index[VLIB_TX]);  \
     face1 =                                                             \
@@ -707,6 +738,12 @@ hicn_face_udp6_output_trace_t;
         HICN_FACE_UDP_ENCAP_IP##ipv                                     \
           (vm, b0, face0, &next0);					\
 	stats.pkts_interest_count += 1;					\
+        vlib_increment_combined_counter (                               \
+                                  &counters[face_id0 * HICN_N_COUNTER], \
+                                  thread_index,                         \
+                                  HICN_FACE_COUNTERS_INTEREST_TX,       \
+                                  1,                                    \
+                                  vlib_buffer_length_in_chain(vm, b0)); \
       }                                                                 \
                                                                         \
     if (PREDICT_TRUE(face1 != NULL))                                    \
@@ -719,6 +756,12 @@ hicn_face_udp6_output_trace_t;
         HICN_FACE_UDP_ENCAP_IP##ipv                                     \
           (vm, b1, face1, &next1);					\
 	stats.pkts_interest_count += 1;					\
+        vlib_increment_combined_counter (                               \
+                                  &counters[face_id1 * HICN_N_COUNTER], \
+                                  thread_index,                         \
+                                  HICN_FACE_COUNTERS_INTEREST_TX,       \
+                                  1,                                    \
+                                  vlib_buffer_length_in_chain(vm, b1)); \
       }                                                                 \
                                                                         \
                                                                         \
@@ -764,6 +807,7 @@ hicn_face_udp4_output_node_fn (vlib_main_t * vm,
 {
   u32 n_left_from, *from, *to_next, next_index;
   vl_api_hicn_api_node_stats_get_reply_t stats = { 0 };
+  u32 thread_index = vm->thread_index;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -807,8 +851,9 @@ hicn_face_udp4_output_format_trace (u8 * s, va_list * args)
   s =
     format (s, "FACE_UDP4_OUTPUT: pkt: %d, sw_if_index %d, next index %d\n%U",
 	    (int) t->pkt_type, t->sw_if_index, t->next_index,
-	    (t->packet_data[0] & 0xf0) == 0x40 ? format_ip4_header : format_ip6_header,
-	    t->packet_data, sizeof (t->packet_data));
+	    (t->packet_data[0] & 0xf0) ==
+	    0x40 ? format_ip4_header : format_ip6_header, t->packet_data,
+	    sizeof (t->packet_data));
   return (s);
 }
 
@@ -841,6 +886,7 @@ hicn_face_udp6_output_node_fn (vlib_main_t * vm,
 {
   u32 n_left_from, *from, *to_next, next_index;
   vl_api_hicn_api_node_stats_get_reply_t stats = { 0 };
+  u32 thread_index = vm->thread_index;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -883,8 +929,9 @@ hicn_face_udp6_output_format_trace (u8 * s, va_list * args)
   s =
     format (s, "FACE_UDP6_OUTPUT: pkt: %d, sw_if_index %d, next index %d\n%u",
 	    (int) t->pkt_type, t->sw_if_index, t->next_index,
-	    (t->packet_data[0] & 0xf0) == 0x40 ? format_ip4_header : format_ip6_header,
-	    t->packet_data, sizeof (t->packet_data));
+	    (t->packet_data[0] & 0xf0) ==
+	    0x40 ? format_ip4_header : format_ip6_header, t->packet_data,
+	    sizeof (t->packet_data));
   return (s);
 }
 
diff --git a/hicn-plugin/src/faces/udp/iface_udp_node.c b/hicn-plugin/src/faces/udp/iface_udp_node.c
index 9558ebfce..4dc267f85 100644
--- a/hicn-plugin/src/faces/udp/iface_udp_node.c
+++ b/hicn-plugin/src/faces/udp/iface_udp_node.c
@@ -39,13 +39,11 @@ hicn_iface_udp_init (vlib_main_t * vm)
 {
   data_fwd_face_udp4_vlib_edge = vlib_node_add_next (vm,
 						     hicn_data_fwd_node.index,
-						     hicn_iface_udp4_output_node.
-						     index);
+						     hicn_iface_udp4_output_node.index);
 
   data_fwd_face_udp6_vlib_edge = vlib_node_add_next (vm,
 						     hicn_data_fwd_node.index,
-						     hicn_iface_udp6_output_node.
-						     index);
+						     hicn_iface_udp6_output_node.index);
 
   u32 temp_index4 = vlib_node_add_next (vm,
 					hicn_interest_hitcs_node.index,
@@ -205,6 +203,13 @@ typedef enum
 			vlib_buffer_get_current (b0),			\
 			sizeof (t->packet_data));			\
       }									\
+                                                                        \
+    vlib_increment_combined_counter (                                   \
+                              &counters[hicnb0->face_dpo_id.dpoi_index  \
+                                        * HICN_N_COUNTER], thread_index,\
+                              HICN_FACE_COUNTERS_INTEREST_RX,           \
+                              1,                                        \
+                              vlib_buffer_length_in_chain(vm, b0));     \
 									\
 									\
     /* Verify speculative enqueue, maybe switch current next frame */	\
@@ -326,6 +331,19 @@ typedef enum
 			  sizeof (t->packet_data));			\
       }									\
 									\
+    vlib_increment_combined_counter (                                   \
+                              &counters[hicnb0->face_dpo_id.dpoi_index  \
+                                        * HICN_N_COUNTER], thread_index,\
+                              HICN_FACE_COUNTERS_INTEREST_RX,           \
+                              1,                                        \
+                              vlib_buffer_length_in_chain(vm, b0));     \
+                                                                        \
+    vlib_increment_combined_counter (                                   \
+                              &counters[hicnb1->face_dpo_id.dpoi_index  \
+                                        * HICN_N_COUNTER], thread_index,\
+                              HICN_FACE_COUNTERS_INTEREST_RX,           \
+                              1,                                        \
+                              vlib_buffer_length_in_chain(vm, b1));     \
     									\
     /* Verify speculative enqueue, maybe switch current next frame */	\
     vlib_validate_buffer_enqueue_x2 (vm, node, next_index,		\
@@ -341,6 +359,7 @@ hicn_iface_udp4_input_node_fn (vlib_main_t * vm,
 {
   u32 n_left_from, *from, *to_next, next_index;
   vl_api_hicn_api_node_stats_get_reply_t stats = { 0 };
+  u32 thread_index = vm->thread_index;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -422,7 +441,7 @@ hicn_iface_udp6_input_node_fn (vlib_main_t * vm,
 {
   u32 n_left_from, *from, *to_next, next_index;
   vl_api_hicn_api_node_stats_get_reply_t stats = { 0 };
-
+  u32 thread_index = vm->thread_index;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -657,8 +676,9 @@ typedef enum
   								    \
   b0 = vlib_get_buffer (vm, bi0);                                       \
 									\
+  hicn_face_id_t face_id = vnet_buffer (b0)->ip.adj_index[VLIB_TX];     \
   face =                                                                \
-    hicn_dpoi_get_from_idx(vnet_buffer (b0)->ip.adj_index[VLIB_TX]);    \
+    hicn_dpoi_get_from_idx(face_id);                                    \
                                                                         \
   if (PREDICT_TRUE(face != NULL))                                       \
     {                                                                   \
@@ -666,6 +686,12 @@ typedef enum
         (vm, b0, face);                                                 \
       next0 = NEXT_LOOKUP_UDP##ipv;                                     \
       stats.pkts_data_count += 1;					\
+      vlib_increment_combined_counter (                                 \
+                                  &counters[face_id * HICN_N_COUNTER],  \
+                                  thread_index,                         \
+                                  HICN_FACE_COUNTERS_DATA_TX,           \
+                                  1,                                    \
+                                  vlib_buffer_length_in_chain(vm, b0)); \
     }                                                                   \
                                                                         \
   if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&            \
@@ -720,10 +746,12 @@ typedef enum
     b0 = vlib_get_buffer (vm, bi0);					\
     b1 = vlib_get_buffer (vm, bi1);					\
 									\
+    hicn_face_id_t face_id0 = vnet_buffer (b0)->ip.adj_index[VLIB_TX];  \
+    hicn_face_id_t face_id1 = vnet_buffer (b1)->ip.adj_index[VLIB_TX];  \
     face0 =								\
-      hicn_dpoi_get_from_idx(vnet_buffer (b0)->ip.adj_index[VLIB_TX]);	\
+      hicn_dpoi_get_from_idx(face_id0);                                 \
     face1 =								\
-      hicn_dpoi_get_from_idx(vnet_buffer (b1)->ip.adj_index[VLIB_TX]);	\
+      hicn_dpoi_get_from_idx(face_id1);                                 \
                                                                         \
     if (PREDICT_TRUE(face0 != NULL))					\
       {									\
@@ -731,6 +759,12 @@ typedef enum
 	  (vm, b0, face0);						\
 	next0 = NEXT_LOOKUP_UDP##ipv;					\
 	stats.pkts_data_count += 1;					\
+        vlib_increment_combined_counter (                               \
+                                  &counters[face_id0 * HICN_N_COUNTER], \
+                                  thread_index,                         \
+                                  HICN_FACE_COUNTERS_DATA_TX,           \
+                                  1,                                    \
+                                  vlib_buffer_length_in_chain(vm, b0)); \
       }									\
 									\
     if (PREDICT_TRUE(face1 != NULL))					\
@@ -739,6 +773,12 @@ typedef enum
 	  (vm, b1, face1);						\
 	next1 = NEXT_LOOKUP_UDP##ipv;					\
 	stats.pkts_data_count += 1;					\
+        vlib_increment_combined_counter (                               \
+                                  &counters[face_id1 * HICN_N_COUNTER], \
+                                  thread_index,                         \
+                                  HICN_FACE_COUNTERS_DATA_TX,           \
+                                  1,                                    \
+                                  vlib_buffer_length_in_chain(vm, b1)); \
       }									\
 									\
     if (PREDICT_FALSE ((node->flags & VLIB_NODE_FLAG_TRACE) &&		\
@@ -784,6 +824,7 @@ hicn_iface_udp4_output_node_fn (vlib_main_t * vm,
 {
   u32 n_left_from, *from, *to_next, next_index;
   vl_api_hicn_api_node_stats_get_reply_t stats = { 0 };
+  u32 thread_index = vm->thread_index;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;
@@ -864,6 +905,7 @@ hicn_iface_udp6_output_node_fn (vlib_main_t * vm,
 {
   u32 n_left_from, *from, *to_next, next_index;
   vl_api_hicn_api_node_stats_get_reply_t stats = { 0 };
+  u32 thread_index = vm->thread_index;
 
   from = vlib_frame_vector_args (frame);
   n_left_from = frame->n_vectors;