bonding: support custom interface IDs

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

diff --git a/src/vnet/bonding/node.h b/src/vnet/bonding/node.h
index 74f3b1a..1564007 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) \
+  (is_pow2 (a))
+
 #define foreach_bond_mode          \
   _ (1, ROUND_ROBIN, "round-robin") \
   _ (2, ACTIVE_BACKUP, "active-backup") \
@@ -48,13 +51,13 @@ typedef enum
 /* configurable load-balances */
 #define foreach_bond_lb          \
   _ (2, L23, "l23", l23)  \
-  _ (1, l34 , "l34", l34) \
+  _ (1, L34 , "l34", l34) \
   _ (0, L2, "l2", l2)
 
 /* load-balance functions implemented in bond-output */
 #define foreach_bond_lb_algo                    \
   _ (0, L2, "l2", l2)                            \
-  _ (1, l34 , "l34", l34)                        \
+  _ (1, L34 , "l34", l34)                        \
   _ (2, L23, "l23", l23)                         \
   _ (3, RR, "round-robin", round_robin)          \
   _ (4, BC, "broadcast", broadcast)              \
@@ -67,8 +70,14 @@ typedef enum
 #undef _
 } bond_load_balance_t;
 
+enum
+{
+  BOND_SEND_GARP_NA = 1,
+} bond_send_garp_na_process_event_t;
+
 typedef struct
 {
+  u32 id;
   u8 hw_addr_set;
   u8 hw_addr[6];
   u8 mode;
@@ -104,6 +113,7 @@ typedef struct
 typedef struct
 {
   u32 sw_if_index;
+  u32 id;
   u8 interface_name[64];
   u8 mode;
   u8 lb;
@@ -129,6 +139,18 @@ typedef CLIB_PACKED (struct
                     u8 state;
                     }) lacp_port_info_t;
 
+typedef struct
+{
+  CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+  u32 buffers[VLIB_FRAME_SIZE];
+  u32 n_buffers;
+} bond_per_port_queue_t;
+
+typedef struct
+{
+  bond_per_port_queue_t *per_port_queue;
+} bond_per_thread_data_t;
+
 typedef struct
 {
   u8 admin_up;
@@ -138,7 +160,12 @@ typedef struct
   /* the last slave index for the rr lb */
   u32 lb_rr_last_index;
 
+  /* Real device instance in interface vector */
   u32 dev_instance;
+
+  /* Interface ID being shown to user */
+  u32 id;
+
   u32 hw_if_index;
   u32 sw_if_index;
 
@@ -159,6 +186,8 @@ typedef struct
   uword *port_number_bitmap;
   u8 use_custom_mac;
   u8 hw_address[6];
+
+  clib_spinlock_t lockp;
 } bond_if_t;
 
 typedef struct
@@ -265,8 +294,6 @@ typedef struct
 
   /* bond mode */
   u8 mode;
-
-  clib_spinlock_t lockp;
 } slave_if_t;
 
 typedef void (*lacp_enable_disable_func) (vlib_main_t * vm, bond_if_t * bif,
@@ -277,11 +304,11 @@ typedef struct
   /* pool of bonding interfaces */
   bond_if_t *interfaces;
 
-  /* pool of lacp neighbors */
-  slave_if_t *neighbors;
+  /* record used interface IDs */
+  uword *id_used;
 
-  /* rapidly find a neighbor by vlib software interface index */
-  uword *neighbor_by_sw_if_index;
+  /* pool of slave interfaces */
+  slave_if_t *neighbors;
 
   /* rapidly find a bond by vlib software interface index */
   uword *bond_by_sw_if_index;
@@ -294,6 +321,10 @@ typedef struct
   u8 lacp_plugin_loaded;
 
   lacp_enable_disable_func lacp_enable_disable;
+
+  uword *slave_by_sw_if_index;
+
+  bond_per_thread_data_t *per_thread_data;
 } bond_main_t;
 
 /* bond packet trace capture */
@@ -306,7 +337,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
 {
@@ -314,6 +345,7 @@ typedef struct
 } bond_load_balance_func_t;
 
 extern vlib_node_registration_t bond_input_node;
+extern vlib_node_registration_t bond_process_node;
 extern vnet_device_class_t bond_dev_class;
 extern bond_main_t bond_main;
 
@@ -430,13 +462,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;
 }