#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") \
/* 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) \
#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;
typedef struct
{
u32 sw_if_index;
+ u32 id;
u8 interface_name[64];
u8 mode;
u8 lb;
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;
/* 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;
uword *port_number_bitmap;
u8 use_custom_mac;
u8 hw_address[6];
+
+ clib_spinlock_t lockp;
} bond_if_t;
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,
/* 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;
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 */
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
{
} 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;
{
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;
}