stats: add /if/<n>/<n>/state for lacp interface state

Add /if/lacp/<bond-sw_if_index>/<slave-sw_if_index>/state

<bond-sw_if_index> is a vector of the bond sw_if_index
<slave-sw_if_index> is a vector of the slave sw_if_index
Content is the integer value of the lacp actor state. The state is actually
a bitfield as described in the lacp protocol spec.

Type: feature

Signed-off-by: Steven Luong <sluong@cisco.com>
Change-Id: Ic6eca8ce2a1acd2d858e4e50b7eac1d000ea08e5
Signed-off-by: Ole Troan <ot@cisco.com>

2 files changed, 31 insertions, 2 deletions

diff --git a/src/vnet/bonding/cli.c b/src/vnet/bonding/cli.c
index f45a31ce99a..4e0d30aa598 100644
--- a/src/vnet/bonding/cli.c
+++ b/src/vnet/bonding/cli.c
@@ -20,6 +20,7 @@
 #include <vlib/unix/unix.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/bonding/node.h>
+#include <vpp/stats/stat_segment.h>
 
 void
 bond_disable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif)
@@ -96,7 +97,9 @@ bond_disable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif)
     }
   clib_spinlock_unlock_if_init (&bif->lockp);
 
-  return;
+  if (bif->mode == BOND_MODE_LACP)
+    stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
+				    [sif->sw_if_index], sif->actor.state);
 }
 
 void
@@ -165,7 +168,9 @@ bond_enable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif)
     }
   clib_spinlock_unlock_if_init (&bif->lockp);
 
-  return;
+  if (bif->mode == BOND_MODE_LACP)
+    stat_segment_set_state_counter (bm->stats[bif->sw_if_index]
+				    [sif->sw_if_index], sif->actor.state);
 }
 
 int
@@ -278,6 +283,10 @@ bond_delete_neighbor (vlib_main_t * vm, bond_if_t * bif, slave_if_t * sif)
   if ((bif->mode == BOND_MODE_LACP) && bm->lacp_enable_disable)
     (*bm->lacp_enable_disable) (vm, bif, sif, 0);
 
+  if (bif->mode == BOND_MODE_LACP)
+    stat_segment_deregister_state_counter
+      (bm->stats[bif->sw_if_index][sif->sw_if_index]);
+
   pool_put (bm->neighbors, sif);
 }
 
@@ -573,6 +582,24 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args)
 	clib_error_return (0, "bond interface cannot be enslaved");
       return;
     }
+  if (bif->mode == BOND_MODE_LACP)
+    {
+      u8 *name = format (0, "/if/lacp/%u/%u/state", bif->sw_if_index,
+			 args->slave);
+
+      vec_validate (bm->stats, bif->sw_if_index);
+      vec_validate (bm->stats[bif->sw_if_index], args->slave);
+
+      args->error = stat_segment_register_state_counter
+	(name, &bm->stats[bif->sw_if_index][args->slave]);
+      vec_free (name);
+      if (args->error != 0)
+	{
+	  args->rv = VNET_API_ERROR_INVALID_INTERFACE;
+	  return;
+	}
+    }
+
   pool_get (bm->neighbors, sif);
   clib_memset (sif, 0, sizeof (*sif));
   sw = pool_elt_at_index (im->sw_interfaces, args->slave);
diff --git a/src/vnet/bonding/node.h b/src/vnet/bonding/node.h
index 94b43dcd1d9..1ad19dec872 100644
--- a/src/vnet/bonding/node.h
+++ b/src/vnet/bonding/node.h
@@ -367,6 +367,8 @@ typedef struct
   uword *slave_by_sw_if_index;
 
   bond_per_thread_data_t *per_thread_data;
+
+  u32 **stats;
 } bond_main_t;
 
 /* bond packet trace capture */