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: add support for numa-only in lacp mode
[vpp.git]
/
src
/
vnet
/
bonding
/
node.h
diff --git
a/src/vnet/bonding/node.h
b/src/vnet/bonding/node.h
index
3a01abe
..
94b43dc
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,19
@@
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;
/* return */
u32 sw_if_index;
int rv;
/* return */
u32 sw_if_index;
int rv;
@@
-104,9
+114,11
@@
typedef struct
typedef struct
{
u32 sw_if_index;
typedef struct
{
u32 sw_if_index;
+ u32 id;
u8 interface_name[64];
u8 mode;
u8 lb;
u8 interface_name[64];
u8 mode;
u8 lb;
+ u8 numa_only;
u32 active_slaves;
u32 slaves;
} bond_interface_details_t;
u32 active_slaves;
u32 slaves;
} bond_interface_details_t;
@@
-131,9
+143,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,10
+159,20
@@
typedef struct
u8 mode;
u8 lb;
u8 mode;
u8 lb;
+ /* This flag works for active-backup mode only
+ and marks if the working port is local numa. */
+ u8 is_local_numa;
+ /* current working sw_if_index in active-bakeup mode. */
+ u32 sw_if_index_working;
/* the last slave index for the rr lb */
u32 lb_rr_last_index;
/* the last slave index for the rr lb */
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;
@@
-161,13
+189,20
@@
typedef struct
lacp_port_info_t actor;
u8 individual_aggregator;
lacp_port_info_t actor;
u8 individual_aggregator;
+ /* If the flag numa_only is set, it means that only slaves
+ on local numa node works for lacp mode if have at least one,
+ otherwise it works as usual. */
+ u8 numa_only;
+
+ /* How many slaves on local numa node are there in lacp mode? */
+ word n_numa_slaves;
+
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
@@
-211,7
+246,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
+281,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,7
+319,23
@@
typedef struct
/* bond mode */
u8 mode;
/* bond mode */
u8 mode;
- clib_spinlock_t lockp;
+ /* 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;
} slave_if_t;
typedef void (*lacp_enable_disable_func) (vlib_main_t * vm, bond_if_t * bif,
} slave_if_t;
typedef void (*lacp_enable_disable_func) (vlib_main_t * vm, bond_if_t * bif,
@@
-286,11
+346,11
@@
typedef struct
/* pool of bonding interfaces */
bond_if_t *interfaces;
/* 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 slave interfaces
*/
+
slave_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
+363,10
@@
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 *slave_by_sw_if_index;
+
+ bond_per_thread_data_t *per_thread_data;
} bond_main_t;
/* bond packet trace capture */
} bond_main_t;
/* bond packet trace capture */
@@
-323,6
+387,7
@@
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;
extern vnet_device_class_t bond_dev_class;
extern bond_main_t bond_main;
@@
-439,13
+504,15
@@
bond_get_slave_by_sw_if_index (u32 sw_if_index)
{
bond_main_t *bm = &bond_main;
slave_if_t *sif = 0;
{
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;
}
return sif;
}