Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bonding lacp: replace slave string with member
[vpp.git]
/
src
/
vnet
/
bonding
/
node.h
diff --git
a/src/vnet/bonding/node.h
b/src/vnet/bonding/node.h
index
ae811a1
..
843c236
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 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") \
#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) \
/* configurable load-balances */
#define foreach_bond_lb \
_ (2, L23, "l23", l23) \
- _ (1,
l
34 , "l34", l34) \
+ _ (1,
L
34 , "l34", l34) \
_ (0, L2, "l2", l2)
/* load-balance functions implemented in bond-output */
#define foreach_bond_lb_algo \
_ (0, L2, "l2", l2) \
_ (0, L2, "l2", l2)
/* load-balance functions implemented in bond-output */
#define foreach_bond_lb_algo \
_ (0, L2, "l2", l2) \
- _ (1,
l
34 , "l34", l34) \
+ _ (1,
L
34 , "l34", l34) \
_ (2, L23, "l23", l23) \
_ (3, RR, "round-robin", round_robin) \
_ (4, BC, "broadcast", broadcast) \
_ (2, L23, "l23", l23) \
_ (3, RR, "round-robin", round_robin) \
_ (4, BC, "broadcast", broadcast) \
@@
-67,12
+70,20
@@
typedef enum
#undef _
} bond_load_balance_t;
#undef _
} bond_load_balance_t;
+typedef enum
+{
+ BOND_SEND_GARP_NA = 1,
+} bond_send_garp_na_process_event_t;
+
typedef struct
{
typedef struct
{
+ u32 id;
u8 hw_addr_set;
u8 hw_addr[6];
u8 mode;
u8 lb;
u8 hw_addr_set;
u8 hw_addr[6];
u8 mode;
u8 lb;
+ u8 numa_only;
+ u8 gso;
/* return */
u32 sw_if_index;
int rv;
/* return */
u32 sw_if_index;
int rv;
@@
-81,8
+92,8
@@
typedef struct
typedef struct
{
typedef struct
{
- /*
slave
's sw_if_index */
- u32
slave
;
+ /*
member
's sw_if_index */
+ u32
member
;
/* bond's sw_if_index */
u32 group;
u8 is_passive;
/* bond's sw_if_index */
u32 group;
u8 is_passive;
@@
-90,36
+101,49
@@
typedef struct
/* return */
int rv;
clib_error_t *error;
/* return */
int rv;
clib_error_t *error;
-} bond_enslave_args_t;
+} bond_add_member_args_t;
+
+typedef struct
+{
+ u32 member;
+ /* return */
+ int rv;
+ clib_error_t *error;
+} bond_detach_member_args_t;
typedef struct
{
typedef struct
{
- u32 slave;
+ u32 sw_if_index;
+ u32 weight;
/* return */
int rv;
clib_error_t *error;
/* return */
int rv;
clib_error_t *error;
-} bond_
detach_slave
_args_t;
+} bond_
set_intf_weight
_args_t;
/** BOND interface details struct */
typedef struct
{
u32 sw_if_index;
/** BOND interface details struct */
typedef struct
{
u32 sw_if_index;
+ u32 id;
u8 interface_name[64];
u8 interface_name[64];
- u8 mode;
- u8 lb;
- u32 active_slaves;
- u32 slaves;
+ u32 mode;
+ u32 lb;
+ u8 numa_only;
+ u32 active_members;
+ u32 members;
} bond_interface_details_t;
} bond_interface_details_t;
-/**
slave
interface details struct */
+/**
member
interface details struct */
typedef struct
{
u32 sw_if_index;
u8 interface_name[64];
u8 is_passive;
u8 is_long_timeout;
typedef struct
{
u32 sw_if_index;
u8 interface_name[64];
u8 is_passive;
u8 is_long_timeout;
- u32 active_slaves;
-} slave_interface_details_t;
+ u8 is_local_numa;
+ u32 weight;
+ u32 active_members;
+} member_interface_details_t;
typedef CLIB_PACKED (struct
{
typedef CLIB_PACKED (struct
{
@@
-131,9
+155,15
@@
typedef CLIB_PACKED (struct
typedef struct
{
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
{
typedef struct
{
@@
-141,33
+171,43
@@
typedef struct
u8 mode;
u8 lb;
u8 mode;
u8 lb;
- /* the last
slave
index for the rr lb */
+ /* the last
member
index for the rr lb */
u32 lb_rr_last_index;
u32 lb_rr_last_index;
+ /* Real device instance in interface vector */
u32 dev_instance;
u32 dev_instance;
+
+ /* Interface ID being shown to user */
+ u32 id;
+
u32 hw_if_index;
u32 sw_if_index;
u32 hw_if_index;
u32 sw_if_index;
- /* Configured slaves */
- u32 *slaves;
-
- /* Slaves that are in DISTRIBUTING state */
- u32 *active_slaves;
+ /* Configured members */
+ u32 *members;
- /*
rapidly find an active slav
e */
- u
word *active_slave_by_sw_if_index
;
+ /*
Members that are in DISTRIBUTING stat
e */
+ u
32 *active_members
;
lacp_port_info_t partner;
lacp_port_info_t actor;
u8 individual_aggregator;
lacp_port_info_t partner;
lacp_port_info_t actor;
u8 individual_aggregator;
+ /* If the flag numa_only is set, it means that only members
+ on local numa node works for lacp mode if have at least one,
+ otherwise it works as usual. */
+ u8 numa_only;
+ u8 gso;
+
+ /* How many members on local numa node are there in lacp mode? */
+ word n_numa_members;
+
u32 group;
uword *port_number_bitmap;
u8 use_custom_mac;
u8 hw_address[6];
clib_spinlock_t lockp;
u32 group;
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
} bond_if_t;
typedef struct
@@
-204,6
+244,9
@@
typedef struct
/* neighbor vlib hw_if_index */
u32 hw_if_index;
/* neighbor vlib hw_if_index */
u32 hw_if_index;
+ /* weight -- valid only for active backup */
+ u32 weight;
+
/* actor does not initiate the protocol exchange */
u8 is_passive;
/* actor does not initiate the protocol exchange */
u8 is_passive;
@@
-211,7
+254,7
@@
typedef struct
lacp_port_info_t partner;
lacp_port_info_t partner_admin;;
lacp_port_info_t partner;
lacp_port_info_t partner_admin;;
- /*
Partne
r port information */
+ /*
Acto
r port information */
lacp_port_info_t actor;
lacp_port_info_t actor_admin;
lacp_port_info_t actor;
lacp_port_info_t actor_admin;
@@
-246,7
+289,16
@@
typedef struct
f64 actor_churn_timer;
/* time last lacpdu was sent */
f64 actor_churn_timer;
/* time last lacpdu was sent */
- f64 last_lacpdu_time;
+ f64 last_lacpdu_sent_time;
+
+ /* time last lacpdu was received */
+ f64 last_lacpdu_recd_time;
+
+ /* time last marker pdu was sent */
+ f64 last_marker_pdu_sent_time;
+
+ /* time last marker pdu was received */
+ f64 last_marker_pdu_recd_time;
/* timer used to generate periodic transmission */
f64 periodic_timer;
/* timer used to generate periodic transmission */
f64 periodic_timer;
@@
-275,22
+327,47
@@
typedef struct
/* bond mode */
u8 mode;
/* bond mode */
u8 mode;
- clib_spinlock_t lockp;
-} slave_if_t;
+ /* good lacp pdu received */
+ u64 pdu_received;
+
+ /* bad lacp pdu received */
+ u64 bad_pdu_received;
+
+ /* pdu sent */
+ u64 pdu_sent;
+
+ /* good marker pdu received */
+ u64 marker_pdu_received;
+
+ /* bad marker pdu received */
+ u64 marker_bad_pdu_received;
+
+ /* pdu sent */
+ u64 marker_pdu_sent;
+
+ /* member is numa node */
+ u8 is_local_numa;
+} member_if_t;
typedef void (*lacp_enable_disable_func) (vlib_main_t * vm, bond_if_t * bif,
typedef void (*lacp_enable_disable_func) (vlib_main_t * vm, bond_if_t * bif,
- slave_if_t * sif, u8 enable);
+ member_if_t * mif, u8 enable);
+
+typedef struct
+{
+ u32 partner_state;
+ u32 actor_state;
+} lacp_stats_t;
typedef struct
{
/* pool of bonding interfaces */
bond_if_t *interfaces;
typedef struct
{
/* pool of bonding interfaces */
bond_if_t *interfaces;
- /*
pool of lacp neighbor
s */
-
slave_if_t *neighbors
;
+ /*
record used interface ID
s */
+
uword *id_used
;
- /*
rapidly find a neighbor by vlib software interface index
*/
-
uword *neighbor_by_sw_if_index
;
+ /*
pool of member interfaces
*/
+
member_if_t *neighbors
;
/* rapidly find a bond by vlib software interface index */
uword *bond_by_sw_if_index;
/* rapidly find a bond by vlib software interface index */
uword *bond_by_sw_if_index;
@@
-303,6
+380,12
@@
typedef struct
u8 lacp_plugin_loaded;
lacp_enable_disable_func lacp_enable_disable;
u8 lacp_plugin_loaded;
lacp_enable_disable_func lacp_enable_disable;
+
+ uword *member_by_sw_if_index;
+
+ bond_per_thread_data_t *per_thread_data;
+
+ lacp_stats_t **stats;
} bond_main_t;
/* bond packet trace capture */
} bond_main_t;
/* bond packet trace capture */
@@
-315,7
+398,7
@@
typedef struct
typedef u32 (*load_balance_func) (vlib_main_t * vm,
vlib_node_runtime_t * node, bond_if_t * bif,
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 member_count
);
typedef struct
{
typedef struct
{
@@
-323,21
+406,25
@@
typedef struct
} bond_load_balance_func_t;
extern vlib_node_registration_t bond_input_node;
} 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;
void bond_disable_collecting_distributing (vlib_main_t * vm,
extern vnet_device_class_t bond_dev_class;
extern bond_main_t bond_main;
void bond_disable_collecting_distributing (vlib_main_t * vm,
- slave_if_t * sif);
-void bond_enable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif);
+ member_if_t * mif);
+void bond_enable_collecting_distributing (vlib_main_t * vm,
+ member_if_t * mif);
u8 *format_bond_interface_name (u8 * s, va_list * args);
u8 *format_bond_interface_name (u8 * s, va_list * args);
+void bond_set_intf_weight (vlib_main_t * vm,
+ bond_set_intf_weight_args_t * args);
void bond_create_if (vlib_main_t * vm, bond_create_if_args_t * args);
int bond_delete_if (vlib_main_t * vm, u32 sw_if_index);
void bond_create_if (vlib_main_t * vm, bond_create_if_args_t * args);
int bond_delete_if (vlib_main_t * vm, u32 sw_if_index);
-void bond_
enslave (vlib_main_t * vm, bond_enslave
_args_t * args);
-void bond_detach_
slave (vlib_main_t * vm, bond_detach_slave
_args_t * args);
+void bond_
add_member (vlib_main_t * vm, bond_add_member
_args_t * args);
+void bond_detach_
member (vlib_main_t * vm, bond_detach_member
_args_t * args);
int bond_dump_ifs (bond_interface_details_t ** out_bondids);
int bond_dump_ifs (bond_interface_details_t ** out_bondids);
-int bond_dump_
slave_ifs (slave_interface_details_t ** out_slave
ids,
- u32 bond_sw_if_index);
+int bond_dump_
member_ifs (member_interface_details_t ** out_member
ids,
+
u32 bond_sw_if_index);
static inline uword
unformat_bond_mode (unformat_input_t * input, va_list * args)
static inline uword
unformat_bond_mode (unformat_input_t * input, va_list * args)
@@
-413,7
+500,7
@@
bond_register_callback (lacp_enable_disable_func func)
}
static inline bond_if_t *
}
static inline bond_if_t *
-bond_get_
master
_by_sw_if_index (u32 sw_if_index)
+bond_get_
bond_if
_by_sw_if_index (u32 sw_if_index)
{
bond_main_t *bm = &bond_main;
uword *p;
{
bond_main_t *bm = &bond_main;
uword *p;
@@
-427,26
+514,28
@@
bond_get_master_by_sw_if_index (u32 sw_if_index)
}
static inline bond_if_t *
}
static inline bond_if_t *
-bond_get_
master
_by_dev_instance (u32 dev_instance)
+bond_get_
bond_if
_by_dev_instance (u32 dev_instance)
{
bond_main_t *bm = &bond_main;
return pool_elt_at_index (bm->interfaces, dev_instance);
}
{
bond_main_t *bm = &bond_main;
return pool_elt_at_index (bm->interfaces, dev_instance);
}
-static inline
slave
_if_t *
-bond_get_
slave
_by_sw_if_index (u32 sw_if_index)
+static inline
member
_if_t *
+bond_get_
member
_by_sw_if_index (u32 sw_if_index)
{
bond_main_t *bm = &bond_main;
{
bond_main_t *bm = &bond_main;
-
slave_if_t *s
if = 0;
- uword
*
p;
+
member_if_t *m
if = 0;
+ uword p;
- p = hash_get (bm->neighbor_by_sw_if_index, sw_if_index);
- if (p)
+ if (sw_if_index < vec_len (bm->member_by_sw_if_index))
{
{
- sif = pool_elt_at_index (bm->neighbors, p[0]);
+ p = bm->member_by_sw_if_index[sw_if_index];
+ if (p)
+ mif = pool_elt_at_index (bm->neighbors, p >> 1);
}
}
- return sif;
+
+ return mif;
}
#endif /* __included_vnet_bonding_node_h__ */
}
#endif /* __included_vnet_bonding_node_h__ */