#endif
#define BOND_MODULO_SHORTCUT(a) \
- (((a) == 2) || ((a) == 4) || ((a) == 8) || ((a) == 16))
+ (is_pow2 (a))
#define foreach_bond_mode \
_ (1, ROUND_ROBIN, "round-robin") \
/* 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
+typedef 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;
typedef struct
{
- vlib_frame_t **frame;
+ CLIB_CACHE_LINE_ALIGN_MARK (cacheline0);
+ u32 buffers[VLIB_FRAME_SIZE];
+ u32 n_buffers;
+} bond_per_port_queue_t;
-} bond_if_per_thread_t;
+typedef struct
+{
+ bond_per_port_queue_t *per_port_queue;
+} bond_per_thread_data_t;
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;
u8 hw_address[6];
clib_spinlock_t lockp;
- bond_if_per_thread_t *per_thread_info;
} 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 */
+ /* record used interface IDs */
+ uword *id_used;
+
+ /* pool of slave interfaces */
slave_if_t *neighbors;
/* rapidly find a bond by vlib software interface index */
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 */