[re]Enable per-Adjacency/neighbour counters

Change-Id: I953b3888bbc6d8a5f53f684a5edc8742b382f323
Signed-off-by: Neale Ranns <nranns@cisco.com>

5 files changed, 65 insertions, 52 deletions

diff --git a/src/vnet/adj/adj.c b/src/vnet/adj/adj.c
index e740c4cb79b..d0be0f0eaff 100644
--- a/src/vnet/adj/adj.c
+++ b/src/vnet/adj/adj.c
@@ -122,6 +122,10 @@ format_ip_adjacency (u8 * s, va_list * args)
 
     if (fiaf & FORMAT_IP_ADJACENCY_DETAIL)
     {
+        vlib_counter_t counts;
+
+        vlib_get_combined_counter(&adjacency_counters, adj_index, &counts);
+        s = format (s, "\n counts:[%Ld:%Ld]", counts.packets, counts.bytes);
 	s = format (s, "\n locks:%d", adj->ia_node.fn_locks);
 	s = format (s, " node:[%d]:%U",
 		    adj->rewrite_header.node_index,
diff --git a/src/vnet/adj/adj_l2.c b/src/vnet/adj/adj_l2.c
index 4d2dd7082f1..5a083643302 100644
--- a/src/vnet/adj/adj_l2.c
+++ b/src/vnet/adj/adj_l2.c
@@ -94,11 +94,11 @@ adj_l2_rewrite_inline (vlib_main_t * vm,
 	    rw_len0 = adj0[0].rewrite_header.data_bytes;
 	    vnet_buffer(p0)->ip.save_rewrite_length = rw_len0;
 
-	    vlib_increment_combined_counter
-		(&adjacency_counters,
-		 cpu_index, adj_index0,
-		 /* packet increment */ 0,
-		 /* byte increment */ rw_len0-sizeof(ethernet_header_t));
+	    vlib_increment_combined_counter(&adjacency_counters,
+                                            cpu_index,
+                                            adj_index0,
+                                            /* packet increment */ 0,
+                                            /* byte increment */ rw_len0);
 
 	    /* Check MTU of outgoing interface. */
 	    if (PREDICT_TRUE((vlib_buffer_length_in_chain (vm, p0)  <=
diff --git a/src/vnet/ip/ip4_forward.c b/src/vnet/ip/ip4_forward.c
index 6e91b9e91e1..87b345bd3f5 100644
--- a/src/vnet/ip/ip4_forward.c
+++ b/src/vnet/ip/ip4_forward.c
@@ -2402,19 +2402,12 @@ ip4_rewrite_inline (vlib_main_t * vm,
 	     error1);
 
 	  /*
-	   * We've already accounted for an ethernet_header_t elsewhere
+	   * pre-fetch the per-adjacency counters
 	   */
-	  if (PREDICT_FALSE (rw_len0 > sizeof (ethernet_header_t)))
-	    vlib_increment_combined_counter
-	      (&adjacency_counters, cpu_index, adj_index0,
-	       /* packet increment */ 0,
-	       /* byte increment */ rw_len0 - sizeof (ethernet_header_t));
-
-	  if (PREDICT_FALSE (rw_len1 > sizeof (ethernet_header_t)))
-	    vlib_increment_combined_counter
-	      (&adjacency_counters, cpu_index, adj_index1,
-	       /* packet increment */ 0,
-	       /* byte increment */ rw_len1 - sizeof (ethernet_header_t));
+	  vlib_prefetch_combined_counter (&adjacency_counters,
+					  cpu_index, adj_index0);
+	  vlib_prefetch_combined_counter (&adjacency_counters,
+					  cpu_index, adj_index1);
 
 	  /* Don't adjust the buffer for ttl issue; icmp-error node wants
 	   * to see the IP headerr */
@@ -2446,6 +2439,19 @@ ip4_rewrite_inline (vlib_main_t * vm,
 	  vnet_rewrite_two_headers (adj0[0], adj1[0],
 				    ip0, ip1, sizeof (ethernet_header_t));
 
+	  /*
+	   * Bump the per-adjacency counters
+	   */
+	  vlib_increment_combined_counter
+	    (&adjacency_counters,
+	     cpu_index,
+	     adj_index0, 1, vlib_buffer_length_in_chain (vm, p0) + rw_len0);
+
+	  vlib_increment_combined_counter
+	    (&adjacency_counters,
+	     cpu_index,
+	     adj_index1, 1, vlib_buffer_length_in_chain (vm, p1) + rw_len1);
+
 	  if (is_midchain)
 	    {
 	      adj0->sub_type.midchain.fixup_func (vm, adj0, p0);
@@ -2519,6 +2525,9 @@ ip4_rewrite_inline (vlib_main_t * vm,
 	      p0->flags &= ~VNET_BUFFER_LOCALLY_ORIGINATED;
 	    }
 
+	  vlib_prefetch_combined_counter (&adjacency_counters,
+					  cpu_index, adj_index0);
+
 	  /* Guess we are only writing on simple Ethernet header. */
 	  vnet_rewrite_one_header (adj0[0], ip0, sizeof (ethernet_header_t));
 
@@ -2526,11 +2535,10 @@ ip4_rewrite_inline (vlib_main_t * vm,
 	  rw_len0 = adj0[0].rewrite_header.data_bytes;
 	  vnet_buffer (p0)->ip.save_rewrite_length = rw_len0;
 
-	  if (PREDICT_FALSE (rw_len0 > sizeof (ethernet_header_t)))
-	    vlib_increment_combined_counter
-	      (&adjacency_counters, cpu_index, adj_index0,
-	       /* packet increment */ 0,
-	       /* byte increment */ rw_len0 - sizeof (ethernet_header_t));
+	  vlib_increment_combined_counter
+	    (&adjacency_counters,
+	     cpu_index,
+	     adj_index0, 1, vlib_buffer_length_in_chain (vm, p0) + rw_len0);
 
 	  /* Check MTU of outgoing interface. */
 	  error0 = (vlib_buffer_length_in_chain (vm, p0)
diff --git a/src/vnet/ip/ip6_forward.c b/src/vnet/ip/ip6_forward.c
index 197a9b7925d..232f72833fd 100644
--- a/src/vnet/ip/ip6_forward.c
+++ b/src/vnet/ip/ip6_forward.c
@@ -2108,14 +2108,14 @@ ip6_rewrite_inline (vlib_main_t * vm,
 	  vnet_buffer (p0)->ip.save_rewrite_length = rw_len0;
 	  vnet_buffer (p1)->ip.save_rewrite_length = rw_len1;
 
-	  vlib_increment_combined_counter (&adjacency_counters,
-					   cpu_index, adj_index0,
-					   /* packet increment */ 0,
-					   /* byte increment */ rw_len0);
-	  vlib_increment_combined_counter (&adjacency_counters,
-					   cpu_index, adj_index1,
-					   /* packet increment */ 0,
-					   /* byte increment */ rw_len1);
+	  vlib_increment_combined_counter
+	    (&adjacency_counters,
+	     cpu_index,
+	     adj_index0, 1, vlib_buffer_length_in_chain (vm, p0) + rw_len0);
+	  vlib_increment_combined_counter
+	    (&adjacency_counters,
+	     cpu_index, adj_index1,
+	     1, vlib_buffer_length_in_chain (vm, p1) + rw_len1);
 
 	  /* Check MTU of outgoing interface. */
 	  error0 =
@@ -2233,10 +2233,10 @@ ip6_rewrite_inline (vlib_main_t * vm,
 	  rw_len0 = adj0[0].rewrite_header.data_bytes;
 	  vnet_buffer (p0)->ip.save_rewrite_length = rw_len0;
 
-	  vlib_increment_combined_counter (&adjacency_counters,
-					   cpu_index, adj_index0,
-					   /* packet increment */ 0,
-					   /* byte increment */ rw_len0);
+	  vlib_increment_combined_counter
+	    (&adjacency_counters,
+	     cpu_index,
+	     adj_index0, 1, vlib_buffer_length_in_chain (vm, p0) + rw_len0);
 
 	  /* Check MTU of outgoing interface. */
 	  error0 =
diff --git a/src/vnet/mpls/mpls_output.c b/src/vnet/mpls/mpls_output.c
index 8292a0cb3d2..c06cf917b88 100644
--- a/src/vnet/mpls/mpls_output.c
+++ b/src/vnet/mpls/mpls_output.c
@@ -128,18 +128,19 @@ mpls_output_inline (vlib_main_t * vm,
           rw_len0 = adj0[0].rewrite_header.data_bytes;
           rw_len1 = adj1[0].rewrite_header.data_bytes;
 
-          if (PREDICT_FALSE (rw_len0 > sizeof(ethernet_header_t)))
-              vlib_increment_combined_counter
-                  (&adjacency_counters,
-                   cpu_index, adj_index0,
-                   /* packet increment */ 0,
-                   /* byte increment */ rw_len0-sizeof(ethernet_header_t));
-          if (PREDICT_FALSE (rw_len1 > sizeof(ethernet_header_t)))
-              vlib_increment_combined_counter
-                  (&adjacency_counters,
-                   cpu_index, adj_index1,
-                   /* packet increment */ 0,
-                   /* byte increment */ rw_len1-sizeof(ethernet_header_t));
+          /* Bump the adj counters for packet and bytes */
+          vlib_increment_combined_counter
+              (&adjacency_counters,
+               cpu_index,
+               adj_index0,
+               1,
+               vlib_buffer_length_in_chain (vm, p0) + rw_len0);
+          vlib_increment_combined_counter
+              (&adjacency_counters,
+               cpu_index,
+               adj_index1,
+               1,
+               vlib_buffer_length_in_chain (vm, p1) + rw_len1);
 
           /* Check MTU of outgoing interface. */
           if (PREDICT_TRUE(vlib_buffer_length_in_chain (vm, p0) <=
@@ -234,12 +235,12 @@ mpls_output_inline (vlib_main_t * vm,
           /* Update packet buffer attributes/set output interface. */
           rw_len0 = adj0[0].rewrite_header.data_bytes;
           
-          if (PREDICT_FALSE (rw_len0 > sizeof(ethernet_header_t)))
-              vlib_increment_combined_counter 
-                  (&adjacency_counters,
-                   cpu_index, adj_index0, 
-                   /* packet increment */ 0,
-                   /* byte increment */ rw_len0-sizeof(ethernet_header_t));
+          vlib_increment_combined_counter
+              (&adjacency_counters,
+               cpu_index,
+               adj_index0,
+               1,
+               vlib_buffer_length_in_chain (vm, p0) + rw_len0);
           
           /* Check MTU of outgoing interface. */
           if (PREDICT_TRUE(vlib_buffer_length_in_chain (vm, p0) <=