LISP: make statistics thread safe

Change-Id: I056dc6246f79d887d69ad459a6b8b3092a099baa
Signed-off-by: Filip Tehlar <ftehlar@cisco.com>

5 files changed, 65 insertions, 41 deletions

diff --git a/src/vnet/lisp-gpe/lisp_gpe.c b/src/vnet/lisp-gpe/lisp_gpe.c
index 1241ab9caec..052410e27d6 100644
--- a/src/vnet/lisp-gpe/lisp_gpe.c
+++ b/src/vnet/lisp-gpe/lisp_gpe.c
@@ -426,6 +426,9 @@ lisp_gpe_init (vlib_main_t * vm)
 
   lgm->lisp_stats_index_by_key =
     hash_create_mem (0, sizeof (lisp_stats_key_t), sizeof (uword));
+  memset (&lgm->counters, 0, sizeof (lgm->counters));
+  lgm->counters.name = "LISP counters";
+
   return 0;
 }
 
diff --git a/src/vnet/lisp-gpe/lisp_gpe.h b/src/vnet/lisp-gpe/lisp_gpe.h
index b3821ac8cca..38d76997ce3 100644
--- a/src/vnet/lisp-gpe/lisp_gpe.h
+++ b/src/vnet/lisp-gpe/lisp_gpe.h
@@ -98,19 +98,13 @@ typedef struct
 
 typedef struct
 {
-  u32 pkt_count;
-  u32 bytes;
-} lisp_stats_t;
-
-typedef struct
-{
   u32 vni;
   dp_address_t deid;
   dp_address_t seid;
   ip_address_t loc_rloc;
   ip_address_t rmt_rloc;
 
-  lisp_stats_t stats;
+  vlib_counter_t counters;
 } lisp_api_stats_t;
 
 typedef enum gpe_encap_mode_e
@@ -165,8 +159,9 @@ typedef struct lisp_gpe_main
 
   gpe_encap_mode_t encap_mode;
 
-  lisp_stats_t *lisp_stats_pool;
+  u8 *dummy_stats_pool;
   uword *lisp_stats_index_by_key;
+  vlib_combined_counter_main_t counters;
 
   /** convenience */
   vlib_main_t *vlib_main;
@@ -313,7 +308,7 @@ int vnet_gpe_set_encap_mode (gpe_encap_mode_t mode);
 u8 vnet_lisp_stats_enable_disable_state (void);
 vnet_api_error_t vnet_lisp_stats_enable_disable (u8 enable);
 lisp_api_stats_t *vnet_lisp_get_stats (void);
-void vnet_lisp_flush_stats (void);
+int vnet_lisp_flush_stats (void);
 
 #endif /* included_vnet_lisp_gpe_h */
 
diff --git a/src/vnet/lisp-gpe/lisp_gpe_adjacency.c b/src/vnet/lisp-gpe/lisp_gpe_adjacency.c
index 79b2a07f7cd..d5f3a28ac9d 100644
--- a/src/vnet/lisp-gpe/lisp_gpe_adjacency.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_adjacency.c
@@ -250,7 +250,6 @@ lisp_gpe_increment_stats_counters (lisp_cp_main_t * lcm, ip_adjacency_t * adj,
   index_t lai;
   u32 si, di;
   gid_address_t src, dst;
-  lisp_stats_t *stats;
   uword *feip;
 
   ip46_address_to_ip_address (&adj->sub_type.nbr.next_hop, &rloc);
@@ -299,23 +298,12 @@ lisp_gpe_increment_stats_counters (lisp_cp_main_t * lcm, ip_adjacency_t * adj,
   key.tunnel_index = ladj->tunnel_index;
 
   uword *p = hash_get_mem (lgm->lisp_stats_index_by_key, &key);
-  if (p)
-    {
-      stats = pool_elt_at_index (lgm->lisp_stats_pool, p[0]);
-    }
-  else
-    {
-      pool_get (lgm->lisp_stats_pool, stats);
-      memset (stats, 0, sizeof (*stats));
+  ASSERT (p);
 
-      lisp_stats_key_t *key_copy = clib_mem_alloc (sizeof (*key_copy));
-      memcpy (key_copy, &key, sizeof (*key_copy));
-      hash_set_mem (lgm->lisp_stats_index_by_key, key_copy,
-		    stats - lgm->lisp_stats_pool);
-    }
-  stats->pkt_count++;
   /* compute payload length starting after GPE */
-  stats->bytes += b->current_length - (lisp_data - b->data - b->current_data);
+  u32 bytes = b->current_length - (lisp_data - b->data - b->current_data);
+  vlib_increment_combined_counter (&lgm->counters, os_get_cpu_number (),
+				   p[0], 1, bytes);
 }
 
 static void
diff --git a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
index d2954e9649a..6d400f75489 100644
--- a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
+++ b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.c
@@ -410,6 +410,43 @@ lisp_gpe_fwd_entry_mk_paths (lisp_gpe_fwd_entry_t * lfe,
   vec_sort_with_function (lfe->paths, lisp_gpe_fwd_entry_path_sort);
 }
 
+void
+vnet_lisp_gpe_add_fwd_counters (vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
+				u32 fwd_entry_index)
+{
+  const lisp_gpe_adjacency_t *ladj;
+  lisp_fwd_path_t *path;
+  lisp_gpe_main_t *lgm = vnet_lisp_gpe_get_main ();
+  u8 *dummy_elt;
+  lisp_gpe_fwd_entry_t *lfe;
+  lisp_gpe_fwd_entry_key_t fe_key;
+  lisp_stats_key_t key;
+
+  lfe = find_fwd_entry (lgm, a, &fe_key);
+
+  if (LISP_GPE_FWD_ENTRY_TYPE_NORMAL != lfe->type)
+    return;
+
+  memset (&key, 0, sizeof (key));
+  key.fwd_entry_index = fwd_entry_index;
+
+  vec_foreach (path, lfe->paths)
+  {
+    ladj = lisp_gpe_adjacency_get (path->lisp_adj);
+    key.tunnel_index = ladj->tunnel_index;
+    lisp_stats_key_t *key_copy = clib_mem_alloc (sizeof (*key_copy));
+    memcpy (key_copy, &key, sizeof (*key_copy));
+    pool_get (lgm->dummy_stats_pool, dummy_elt);
+    hash_set_mem (lgm->lisp_stats_index_by_key, key_copy,
+		  dummy_elt - lgm->dummy_stats_pool);
+
+    vlib_validate_combined_counter (&lgm->counters,
+				    dummy_elt - lgm->dummy_stats_pool);
+    vlib_zero_combined_counter (&lgm->counters,
+				dummy_elt - lgm->dummy_stats_pool);
+  }
+}
+
 /**
  * @brief Add/Delete LISP IP forwarding entry.
  *
@@ -1172,19 +1209,17 @@ vnet_lisp_gpe_add_del_fwd_entry (vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
     }
 }
 
-void
+int
 vnet_lisp_flush_stats (void)
 {
   lisp_gpe_main_t *lgm = vnet_lisp_gpe_get_main ();
-  lisp_stats_t *stat;
+  vlib_combined_counter_main_t *cm = &lgm->counters;
+  u32 i;
 
-  /* *INDENT-OFF* */
-  pool_foreach (stat, lgm->lisp_stats_pool,
-  {
-    stat->pkt_count = 0;
-    stat->bytes = 0;
-  });
-  /* *INDENT-ON* */
+  for (i = 0; i < vlib_combined_counter_n_counters (cm); i++)
+    vlib_zero_combined_counter (cm, i);
+
+  return 0;
 }
 
 static void
@@ -1194,7 +1229,7 @@ lisp_del_adj_stats (lisp_gpe_main_t * lgm, u32 fwd_entry_index, u32 ti)
   lisp_stats_key_t key;
   void *key_copy;
   uword *p;
-  lisp_stats_t *s;
+  u8 *s;
 
   memset (&key, 0, sizeof (key));
   key.fwd_entry_index = fwd_entry_index;
@@ -1203,18 +1238,18 @@ lisp_del_adj_stats (lisp_gpe_main_t * lgm, u32 fwd_entry_index, u32 ti)
   p = hash_get_mem (lgm->lisp_stats_index_by_key, &key);
   if (p)
     {
-      s = pool_elt_at_index (lgm->lisp_stats_pool, p[0]);
+      s = pool_elt_at_index (lgm->dummy_stats_pool, p[0]);
       hp = hash_get_pair (lgm->lisp_stats_index_by_key, &key);
       key_copy = (void *) (hp->key);
       hash_unset_mem (lgm->lisp_stats_index_by_key, &key);
       clib_mem_free (key_copy);
-      pool_put (lgm->lisp_stats_pool, s);
+      pool_put (lgm->dummy_stats_pool, s);
     }
 }
 
 void
-vnet_lisp_del_fwd_stats (vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
-			 u32 fwd_entry_index)
+vnet_lisp_gpe_del_fwd_counters (vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
+				u32 fwd_entry_index)
 {
   lisp_gpe_main_t *lgm = &lisp_gpe_main;
   lisp_gpe_fwd_entry_key_t fe_key;
diff --git a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h
index 92e18526604..b9d9c98359b 100644
--- a/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h
+++ b/src/vnet/lisp-gpe/lisp_gpe_fwd_entry.h
@@ -212,8 +212,11 @@ extern u32 lisp_l2_fib_lookup (lisp_gpe_main_t * lgm,
 extern const dpo_id_t *lisp_nsh_fib_lookup (lisp_gpe_main_t * lgm,
 					    u32 spi_si);
 extern void
-vnet_lisp_del_fwd_stats (vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
-			 u32 fwd_entry_index);
+vnet_lisp_gpe_del_fwd_counters (vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
+				u32 fwd_entry_index);
+extern void
+vnet_lisp_gpe_add_fwd_counters (vnet_lisp_gpe_add_del_fwd_entry_args_t * a,
+				u32 fwd_entry_index);
 #endif
 
 /*