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.c
diff --git
a/src/vnet/bonding/node.c
b/src/vnet/bonding/node.c
index
a606d20
..
d49894f
100644
(file)
--- a/
src/vnet/bonding/node.c
+++ b/
src/vnet/bonding/node.c
@@
-136,40
+136,40
@@
bond_sw_if_idx_rewrite (vlib_main_t * vm, vlib_node_runtime_t * node,
static inline void
bond_update_next (vlib_main_t * vm, vlib_node_runtime_t * node,
static inline void
bond_update_next (vlib_main_t * vm, vlib_node_runtime_t * node,
- u32 * last_
slave_sw_if_index, u32 slave
_sw_if_index,
+ u32 * last_
member_sw_if_index, u32 member
_sw_if_index,
u32 * bond_sw_if_index, vlib_buffer_t * b,
u32 * next_index, vlib_error_t * error)
{
u32 * bond_sw_if_index, vlib_buffer_t * b,
u32 * next_index, vlib_error_t * error)
{
-
slave_if_t *s
if;
+
member_if_t *m
if;
bond_if_t *bif;
*next_index = BOND_INPUT_NEXT_DROP;
*error = 0;
bond_if_t *bif;
*next_index = BOND_INPUT_NEXT_DROP;
*error = 0;
- if (PREDICT_TRUE (*last_
slave_sw_if_index == slave
_sw_if_index))
+ if (PREDICT_TRUE (*last_
member_sw_if_index == member
_sw_if_index))
goto next;
goto next;
- *last_
slave_sw_if_index = slave
_sw_if_index;
+ *last_
member_sw_if_index = member
_sw_if_index;
-
sif = bond_get_slave_by_sw_if_index (slave
_sw_if_index);
- ALWAYS_ASSERT (
s
if);
+
mif = bond_get_member_by_sw_if_index (member
_sw_if_index);
+ ALWAYS_ASSERT (
m
if);
- bif = bond_get_
master_by_dev_instance (s
if->bif_dev_instance);
+ bif = bond_get_
bond_if_by_dev_instance (m
if->bif_dev_instance);
ALWAYS_ASSERT (bif);
ALWAYS_ASSERT (bif);
- ASSERT (vec_len (bif->
slave
s));
+ ASSERT (vec_len (bif->
member
s));
if (PREDICT_FALSE (bif->admin_up == 0))
{
if (PREDICT_FALSE (bif->admin_up == 0))
{
- *bond_sw_if_index =
slave
_sw_if_index;
+ *bond_sw_if_index =
member
_sw_if_index;
*error = node->errors[BOND_INPUT_ERROR_IF_DOWN];
}
if (PREDICT_FALSE ((bif->mode == BOND_MODE_ACTIVE_BACKUP) &&
*error = node->errors[BOND_INPUT_ERROR_IF_DOWN];
}
if (PREDICT_FALSE ((bif->mode == BOND_MODE_ACTIVE_BACKUP) &&
- vec_len (bif->active_
slave
s) &&
- (
slave_sw_if_index != bif->active_slave
s[0])))
+ vec_len (bif->active_
member
s) &&
+ (
member_sw_if_index != bif->active_member
s[0])))
{
{
- *bond_sw_if_index =
slave
_sw_if_index;
+ *bond_sw_if_index =
member
_sw_if_index;
*error = node->errors[BOND_INPUT_ERROR_PASSIVE_IF];
return;
}
*error = node->errors[BOND_INPUT_ERROR_PASSIVE_IF];
return;
}
@@
-202,7
+202,7
@@
VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b;
u32 sw_if_indices[VLIB_FRAME_SIZE], *sw_if_index;
u16 nexts[VLIB_FRAME_SIZE], *next;
vlib_buffer_t *bufs[VLIB_FRAME_SIZE], **b;
u32 sw_if_indices[VLIB_FRAME_SIZE], *sw_if_index;
u16 nexts[VLIB_FRAME_SIZE], *next;
- u32 last_
slave
_sw_if_index = ~0;
+ u32 last_
member
_sw_if_index = ~0;
u32 bond_sw_if_index = 0;
vlib_error_t error = 0;
u32 next_index = 0;
u32 bond_sw_if_index = 0;
vlib_error_t error = 0;
u32 next_index = 0;
@@
-242,17
+242,17
@@
VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
sw_if_index[2] = vnet_buffer (b[2])->sw_if_index[VLIB_RX];
sw_if_index[3] = vnet_buffer (b[3])->sw_if_index[VLIB_RX];
sw_if_index[2] = vnet_buffer (b[2])->sw_if_index[VLIB_RX];
sw_if_index[3] = vnet_buffer (b[3])->sw_if_index[VLIB_RX];
- x |= sw_if_index[0] ^ last_
slave
_sw_if_index;
- x |= sw_if_index[1] ^ last_
slave
_sw_if_index;
- x |= sw_if_index[2] ^ last_
slave
_sw_if_index;
- x |= sw_if_index[3] ^ last_
slave
_sw_if_index;
+ x |= sw_if_index[0] ^ last_
member
_sw_if_index;
+ x |= sw_if_index[1] ^ last_
member
_sw_if_index;
+ x |= sw_if_index[2] ^ last_
member
_sw_if_index;
+ x |= sw_if_index[3] ^ last_
member
_sw_if_index;
if (PREDICT_TRUE (x == 0))
{
/*
* Optimize to call update_next only if there is a feature arc
* after bond-input. Test feature count greater than 1 because
if (PREDICT_TRUE (x == 0))
{
/*
* Optimize to call update_next only if there is a feature arc
* after bond-input. Test feature count greater than 1 because
- * bond-input itself is a feature arc for this
slave
interface.
+ * bond-input itself is a feature arc for this
member
interface.
*/
ASSERT ((vnet_buffer (b[0])->feature_arc_index ==
vnet_buffer (b[1])->feature_arc_index) &&
*/
ASSERT ((vnet_buffer (b[0])->feature_arc_index ==
vnet_buffer (b[1])->feature_arc_index) &&
@@
-262,7
+262,7
@@
VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
vnet_buffer (b[3])->feature_arc_index));
if (PREDICT_FALSE (vnet_get_feature_count
(vnet_buffer (b[0])->feature_arc_index,
vnet_buffer (b[3])->feature_arc_index));
if (PREDICT_FALSE (vnet_get_feature_count
(vnet_buffer (b[0])->feature_arc_index,
- last_
slave
_sw_if_index) > 1))
+ last_
member
_sw_if_index) > 1))
bond_update_next_x4 (b[0], b[1], b[2], b[3]);
next[0] = next[1] = next[2] = next[3] = next_index;
bond_update_next_x4 (b[0], b[1], b[2], b[3]);
next[0] = next[1] = next[2] = next[3] = next_index;
@@
-287,8
+287,9
@@
VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
}
else
{
}
else
{
- bond_update_next (vm, node, &last_slave_sw_if_index, sw_if_index[0],
- &bond_sw_if_index, b[0], &next_index, &error);
+ bond_update_next (vm, node, &last_member_sw_if_index,
+ sw_if_index[0], &bond_sw_if_index, b[0],
+ &next_index, &error);
next[0] = next_index;
if (next_index == BOND_INPUT_NEXT_DROP)
b[0]->error = error;
next[0] = next_index;
if (next_index == BOND_INPUT_NEXT_DROP)
b[0]->error = error;
@@
-296,8
+297,9
@@
VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
bond_sw_if_idx_rewrite (vm, node, b[0], bond_sw_if_index,
&n_rx_packets, &n_rx_bytes);
bond_sw_if_idx_rewrite (vm, node, b[0], bond_sw_if_index,
&n_rx_packets, &n_rx_bytes);
- bond_update_next (vm, node, &last_slave_sw_if_index, sw_if_index[1],
- &bond_sw_if_index, b[1], &next_index, &error);
+ bond_update_next (vm, node, &last_member_sw_if_index,
+ sw_if_index[1], &bond_sw_if_index, b[1],
+ &next_index, &error);
next[1] = next_index;
if (next_index == BOND_INPUT_NEXT_DROP)
b[1]->error = error;
next[1] = next_index;
if (next_index == BOND_INPUT_NEXT_DROP)
b[1]->error = error;
@@
-305,8
+307,9
@@
VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
bond_sw_if_idx_rewrite (vm, node, b[1], bond_sw_if_index,
&n_rx_packets, &n_rx_bytes);
bond_sw_if_idx_rewrite (vm, node, b[1], bond_sw_if_index,
&n_rx_packets, &n_rx_bytes);
- bond_update_next (vm, node, &last_slave_sw_if_index, sw_if_index[2],
- &bond_sw_if_index, b[2], &next_index, &error);
+ bond_update_next (vm, node, &last_member_sw_if_index,
+ sw_if_index[2], &bond_sw_if_index, b[2],
+ &next_index, &error);
next[2] = next_index;
if (next_index == BOND_INPUT_NEXT_DROP)
b[2]->error = error;
next[2] = next_index;
if (next_index == BOND_INPUT_NEXT_DROP)
b[2]->error = error;
@@
-314,8
+317,9
@@
VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
bond_sw_if_idx_rewrite (vm, node, b[2], bond_sw_if_index,
&n_rx_packets, &n_rx_bytes);
bond_sw_if_idx_rewrite (vm, node, b[2], bond_sw_if_index,
&n_rx_packets, &n_rx_bytes);
- bond_update_next (vm, node, &last_slave_sw_if_index, sw_if_index[3],
- &bond_sw_if_index, b[3], &next_index, &error);
+ bond_update_next (vm, node, &last_member_sw_if_index,
+ sw_if_index[3], &bond_sw_if_index, b[3],
+ &next_index, &error);
next[3] = next_index;
if (next_index == BOND_INPUT_NEXT_DROP)
b[3]->error = error;
next[3] = next_index;
if (next_index == BOND_INPUT_NEXT_DROP)
b[3]->error = error;
@@
-339,7
+343,7
@@
VLIB_NODE_FN (bond_input_node) (vlib_main_t * vm,
while (n_left)
{
sw_if_index[0] = vnet_buffer (b[0])->sw_if_index[VLIB_RX];
while (n_left)
{
sw_if_index[0] = vnet_buffer (b[0])->sw_if_index[VLIB_RX];
- bond_update_next (vm, node, &last_
slave
_sw_if_index, sw_if_index[0],
+ bond_update_next (vm, node, &last_
member
_sw_if_index, sw_if_index[0],
&bond_sw_if_index, b[0], &next_index, &error);
next[0] = next_index;
if (next_index == BOND_INPUT_NEXT_DROP)
&bond_sw_if_index, b[0], &next_index, &error);
next[0] = next_index;
if (next_index == BOND_INPUT_NEXT_DROP)
@@
-430,22
+434,22
@@
static clib_error_t *
bond_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
{
bond_main_t *bm = &bond_main;
bond_sw_interface_up_down (vnet_main_t * vnm, u32 sw_if_index, u32 flags)
{
bond_main_t *bm = &bond_main;
-
slave_if_t *s
if;
+
member_if_t *m
if;
vlib_main_t *vm = bm->vlib_main;
vlib_main_t *vm = bm->vlib_main;
-
sif = bond_get_slave
_by_sw_if_index (sw_if_index);
- if (
s
if)
+
mif = bond_get_member
_by_sw_if_index (sw_if_index);
+ if (
m
if)
{
{
- if (
s
if->lacp_enabled)
+ if (
m
if->lacp_enabled)
return 0;
/* port_enabled is both admin up and hw link up */
return 0;
/* port_enabled is both admin up and hw link up */
-
s
if->port_enabled = ((flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) &&
+
m
if->port_enabled = ((flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP) &&
vnet_sw_interface_is_link_up (vnm, sw_if_index));
vnet_sw_interface_is_link_up (vnm, sw_if_index));
- if (
s
if->port_enabled == 0)
- bond_disable_collecting_distributing (vm,
s
if);
+ if (
m
if->port_enabled == 0)
+ bond_disable_collecting_distributing (vm,
m
if);
else
else
- bond_enable_collecting_distributing (vm,
s
if);
+ bond_enable_collecting_distributing (vm,
m
if);
}
return 0;
}
return 0;
@@
-457,25
+461,25
@@
static clib_error_t *
bond_hw_interface_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
{
bond_main_t *bm = &bond_main;
bond_hw_interface_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags)
{
bond_main_t *bm = &bond_main;
-
slave_if_t *s
if;
+
member_if_t *m
if;
vnet_sw_interface_t *sw;
vlib_main_t *vm = bm->vlib_main;
sw = vnet_get_hw_sw_interface (vnm, hw_if_index);
vnet_sw_interface_t *sw;
vlib_main_t *vm = bm->vlib_main;
sw = vnet_get_hw_sw_interface (vnm, hw_if_index);
-
sif = bond_get_slave
_by_sw_if_index (sw->sw_if_index);
- if (
s
if)
+
mif = bond_get_member
_by_sw_if_index (sw->sw_if_index);
+ if (
m
if)
{
{
- if (
s
if->lacp_enabled)
+ if (
m
if->lacp_enabled)
return 0;
/* port_enabled is both admin up and hw link up */
return 0;
/* port_enabled is both admin up and hw link up */
-
s
if->port_enabled = ((flags & VNET_HW_INTERFACE_FLAG_LINK_UP) &&
+
m
if->port_enabled = ((flags & VNET_HW_INTERFACE_FLAG_LINK_UP) &&
vnet_sw_interface_is_admin_up (vnm,
sw->sw_if_index));
vnet_sw_interface_is_admin_up (vnm,
sw->sw_if_index));
- if (
s
if->port_enabled == 0)
- bond_disable_collecting_distributing (vm,
s
if);
+ if (
m
if->port_enabled == 0)
+ bond_disable_collecting_distributing (vm,
m
if);
else
else
- bond_enable_collecting_distributing (vm,
s
if);
+ bond_enable_collecting_distributing (vm,
m
if);
}
return 0;
}
return 0;