bond: performance harvesting

[vpp.git] / src / vnet / bonding / node.h

diff --git a/src/vnet/bonding/node.h b/src/vnet/bonding/node.h
index 74f3b1a..5c6ff32 100644 (file)
--- a/src/vnet/bonding/node.h
+++ b/src/vnet/bonding/node.h
@@ -31,6 +31,9 @@
 #define MIN(x,y) (((x)<(y))?(x):(y))
 #endif
 
+#define BOND_MODULO_SHORTCUT(a) \
+  (((a) == 2) || ((a) == 4) || ((a) == 8) || ((a) == 16))
+
 #define foreach_bond_mode          \
   _ (1, ROUND_ROBIN, "round-robin") \
   _ (2, ACTIVE_BACKUP, "active-backup") \
@@ -129,6 +132,12 @@ typedef CLIB_PACKED (struct
                     u8 state;
                     }) lacp_port_info_t;
 
+typedef struct
+{
+  vlib_frame_t **frame;
+
+} bond_if_per_thread_t;
+
 typedef struct
 {
   u8 admin_up;
@@ -159,6 +168,9 @@ typedef struct
   uword *port_number_bitmap;
   u8 use_custom_mac;
   u8 hw_address[6];
+
+  clib_spinlock_t lockp;
+  bond_if_per_thread_t *per_thread_info;
 } bond_if_t;
 
 typedef struct
@@ -280,9 +292,6 @@ typedef struct
   /* pool of lacp neighbors */
   slave_if_t *neighbors;
 
-  /* rapidly find a neighbor by vlib software interface index */
-  uword *neighbor_by_sw_if_index;
-
   /* rapidly find a bond by vlib software interface index */
   uword *bond_by_sw_if_index;
 
@@ -294,6 +303,8 @@ typedef struct
   u8 lacp_plugin_loaded;
 
   lacp_enable_disable_func lacp_enable_disable;
+
+  uword *slave_by_sw_if_index;
 } bond_main_t;
 
 /* bond packet trace capture */
@@ -306,7 +317,7 @@ typedef struct
 
 typedef u32 (*load_balance_func) (vlib_main_t * vm,
                                  vlib_node_runtime_t * node, bond_if_t * bif,
-                                 vlib_buffer_t * b0);
+                                 vlib_buffer_t * b0, uword slave_count);
 
 typedef struct
 {
@@ -430,13 +441,15 @@ bond_get_slave_by_sw_if_index (u32 sw_if_index)
 {
   bond_main_t *bm = &bond_main;
   slave_if_t *sif = 0;
-  uword *p;
+  uword p;
 
-  p = hash_get (bm->neighbor_by_sw_if_index, sw_if_index);
-  if (p)
+  if (sw_if_index < vec_len (bm->slave_by_sw_if_index))
     {
-      sif = pool_elt_at_index (bm->neighbors, p[0]);
+      p = bm->slave_by_sw_if_index[sw_if_index];
+      if (p)
+       sif = pool_elt_at_index (bm->neighbors, p >> 1);
     }
+
   return sif;
 }