#define _GNU_SOURCE
#include <stdint.h>
-#include <vnet/ethernet/ethernet.h>
-#include <vnet/ip/ip4_packet.h>
-#include <vnet/ip/ip6_packet.h>
-#include <vnet/ip/ip6_hop_by_hop_packet.h>
+#include <vnet/ip-neighbor/ip4_neighbor.h>
+#include <vnet/ip-neighbor/ip6_neighbor.h>
#include <vnet/bonding/node.h>
-#include <vppinfra/lb_hash_hash.h>
-#include <vnet/ip/ip.h>
-#include <vnet/ip-neighbor/ip_neighbor.h>
-#define foreach_bond_tx_error \
- _(NONE, "no error") \
- _(IF_DOWN, "interface down") \
- _(NO_SLAVE, "no slave")
+#define foreach_bond_tx_error \
+ _ (NONE, "no error") \
+ _ (IF_DOWN, "interface down") \
+ _ (BAD_LB_MODE, "bad load balance mode") \
+ _ (NO_MEMBER, "no member")
typedef enum
{
{
bond_if_t *bif;
u32 *sw_if_index;
- struct vnet_hw_interface_t *sif_hw;
+ struct vnet_hw_interface_t *mif_hw;
- bif = bond_get_master_by_sw_if_index (bif_hw->sw_if_index);
+ bif = bond_get_bond_if_by_sw_if_index (bif_hw->sw_if_index);
if (!bif)
return 0;
if ((bif_hw->l2_if_count == 1) && (l2_if_adjust == 1))
{
/* Just added first L2 interface on this port */
- vec_foreach (sw_if_index, bif->slaves)
+ vec_foreach (sw_if_index, bif->members)
{
- sif_hw = vnet_get_sup_hw_interface (vnm, *sw_if_index);
- ethernet_set_flags (vnm, sif_hw->hw_if_index,
+ mif_hw = vnet_get_sup_hw_interface (vnm, *sw_if_index);
+ ethernet_set_flags (vnm, mif_hw->hw_if_index,
ETHERNET_INTERFACE_FLAG_ACCEPT_ALL);
}
}
else if ((bif_hw->l2_if_count == 0) && (l2_if_adjust == -1))
{
/* Just removed last L2 subinterface on this port */
- vec_foreach (sw_if_index, bif->slaves)
+ vec_foreach (sw_if_index, bif->members)
{
- sif_hw = vnet_get_sup_hw_interface (vnm, *sw_if_index);
- ethernet_set_flags (vnm, sif_hw->hw_if_index,
+ mif_hw = vnet_get_sup_hw_interface (vnm, *sw_if_index);
+ ethernet_set_flags (vnm, mif_hw->hw_if_index,
/*ETHERNET_INTERFACE_FLAG_DEFAULT_L3 */ 0);
}
}
bond_if_t *bif = pool_elt_at_index (bm->interfaces, hif->dev_instance);
bif->admin_up = is_up;
- if (is_up && vec_len (bif->active_slaves))
+ if (is_up)
vnet_hw_interface_set_flags (vnm, bif->hw_if_index,
VNET_HW_INTERFACE_FLAG_LINK_UP);
return 0;
int i;
- bif = bond_get_master_by_sw_if_index (hi->sw_if_index);
+ bif = bond_get_bond_if_by_sw_if_index (hi->sw_if_index);
if (!bif)
{
- return clib_error_return (0, "No bond master found for sw_if_index %u",
+ return clib_error_return (0,
+ "No bond interface found for sw_if_index %u",
hi->sw_if_index);
}
- /* Add/del address on each slave hw intf, they control the hardware */
- vec_foreach_index (i, bif->slaves)
+ /* Add/del address on each member hw intf, they control the hardware */
+ vec_foreach_index (i, bif->members)
{
- s_hi = vnet_get_sup_hw_interface (vnm, vec_elt (bif->slaves, i));
+ s_hi = vnet_get_sup_hw_interface (vnm, vec_elt (bif->members, i));
error = vnet_hw_interface_add_del_mac_address (vnm, s_hi->hw_if_index,
address, is_add);
/* undo any that were completed before the failure */
for (j = i - 1; j > -1; j--)
{
- s_hi = vnet_get_sup_hw_interface (vnm, vec_elt (bif->slaves, j));
+ s_hi = vnet_get_sup_hw_interface (vnm, vec_elt (bif->members, j));
vnet_hw_interface_add_del_mac_address (vnm, s_hi->hw_if_index,
address, !(is_add));
}
}
static_always_inline u32
-bond_lb_broadcast (vlib_main_t * vm,
- bond_if_t * bif, vlib_buffer_t * b0, uword n_slaves)
+bond_lb_broadcast (vlib_main_t *vm, bond_if_t *bif, vlib_buffer_t *b0,
+ uword n_members)
{
bond_main_t *bm = &bond_main;
vlib_buffer_t *c0;
bond_per_thread_data_t *ptd = vec_elt_at_index (bm->per_thread_data,
thread_index);
- for (port = 1; port < n_slaves; port++)
+ for (port = 1; port < n_members; port++)
{
- sw_if_index = *vec_elt_at_index (bif->active_slaves, port);
+ sw_if_index = *vec_elt_at_index (bif->active_members, port);
c0 = vlib_buffer_copy (vm, b0);
if (PREDICT_TRUE (c0 != 0))
{
}
static_always_inline u32
-bond_lb_l2 (vlib_buffer_t * b0)
+bond_lb_round_robin (bond_if_t *bif, vlib_buffer_t *b0, uword n_members)
{
- ethernet_header_t *eth = vlib_buffer_get_current (b0);
- u64 *dst = (u64 *) & eth->dst_address[0];
- u64 a = clib_mem_unaligned (dst, u64);
- u32 *src = (u32 *) & eth->src_address[2];
- u32 b = clib_mem_unaligned (src, u32);
-
- return lb_hash_hash_2_tuples (a, b);
-}
-
-static_always_inline u16 *
-bond_locate_ethertype (ethernet_header_t * eth)
-{
- u16 *ethertype_p;
- ethernet_vlan_header_t *vlan;
+ bif->lb_rr_last_index++;
+ if (bif->lb_rr_last_index >= n_members)
+ bif->lb_rr_last_index = 0;
- if (!ethernet_frame_is_tagged (clib_net_to_host_u16 (eth->type)))
- {
- ethertype_p = ð->type;
- }
- else
- {
- vlan = (void *) (eth + 1);
- ethertype_p = &vlan->type;
- if (*ethertype_p == ntohs (ETHERNET_TYPE_VLAN))
- {
- vlan++;
- ethertype_p = &vlan->type;
- }
- }
- return ethertype_p;
+ return bif->lb_rr_last_index;
}
-static_always_inline u32
-bond_lb_l23 (vlib_buffer_t * b0)
+static_always_inline void
+bond_tx_hash (vlib_main_t *vm, bond_per_thread_data_t *ptd, bond_if_t *bif,
+ vlib_buffer_t **b, u32 *h, u32 n_left)
{
- ethernet_header_t *eth = vlib_buffer_get_current (b0);
- u8 ip_version;
- ip4_header_t *ip4;
- u16 ethertype, *ethertype_p;
- u32 *mac1, *mac2, *mac3;
-
- ethertype_p = bond_locate_ethertype (eth);
- ethertype = clib_mem_unaligned (ethertype_p, u16);
+ u32 n_left_from = n_left;
+ void **data;
- if ((ethertype != htons (ETHERNET_TYPE_IP4)) &&
- (ethertype != htons (ETHERNET_TYPE_IP6)))
- return bond_lb_l2 (b0);
+ ASSERT (bif->hash_func != 0);
- ip4 = (ip4_header_t *) (ethertype_p + 1);
- ip_version = (ip4->ip_version_and_header_length >> 4);
-
- if (ip_version == 0x4)
- {
- u32 a, c;
-
- mac1 = (u32 *) & eth->dst_address[0];
- mac2 = (u32 *) & eth->dst_address[4];
- mac3 = (u32 *) & eth->src_address[2];
-
- a = clib_mem_unaligned (mac1, u32) ^ clib_mem_unaligned (mac2, u32) ^
- clib_mem_unaligned (mac3, u32);
- c =
- lb_hash_hash_2_tuples (clib_mem_unaligned (&ip4->address_pair, u64),
- a);
- return c;
- }
- else if (ip_version == 0x6)
+ vec_validate_aligned (ptd->data, n_left - 1, CLIB_CACHE_LINE_BYTES);
+ data = ptd->data;
+ while (n_left >= 8)
{
- u64 a;
- u32 c;
- ip6_header_t *ip6 = (ip6_header_t *) (eth + 1);
-
- mac1 = (u32 *) & eth->dst_address[0];
- mac2 = (u32 *) & eth->dst_address[4];
- mac3 = (u32 *) & eth->src_address[2];
-
- a = clib_mem_unaligned (mac1, u32) ^ clib_mem_unaligned (mac2, u32) ^
- clib_mem_unaligned (mac3, u32);
- c =
- lb_hash_hash (clib_mem_unaligned
- (&ip6->src_address.as_uword[0], uword),
- clib_mem_unaligned (&ip6->src_address.as_uword[1],
- uword),
- clib_mem_unaligned (&ip6->dst_address.as_uword[0],
- uword),
- clib_mem_unaligned (&ip6->dst_address.as_uword[1],
- uword), a);
- return c;
- }
- return bond_lb_l2 (b0);
-}
-
-static_always_inline u32
-bond_lb_l34 (vlib_buffer_t * b0)
-{
- ethernet_header_t *eth = vlib_buffer_get_current (b0);
- u8 ip_version;
- uword is_tcp_udp;
- ip4_header_t *ip4;
- u16 ethertype, *ethertype_p;
-
- ethertype_p = bond_locate_ethertype (eth);
- ethertype = clib_mem_unaligned (ethertype_p, u16);
-
- if ((ethertype != htons (ETHERNET_TYPE_IP4)) &&
- (ethertype != htons (ETHERNET_TYPE_IP6)))
- return (bond_lb_l2 (b0));
+ // Prefetch next iteration
+ vlib_prefetch_buffer_header (b[4], LOAD);
+ vlib_prefetch_buffer_header (b[5], LOAD);
+ vlib_prefetch_buffer_header (b[6], LOAD);
+ vlib_prefetch_buffer_header (b[7], LOAD);
- ip4 = (ip4_header_t *) (ethertype_p + 1);
- ip_version = (ip4->ip_version_and_header_length >> 4);
+ data[0] = vlib_buffer_get_current (b[0]);
+ data[1] = vlib_buffer_get_current (b[1]);
+ data[2] = vlib_buffer_get_current (b[2]);
+ data[3] = vlib_buffer_get_current (b[3]);
- if (ip_version == 0x4)
- {
- u32 a, t1, t2;
- tcp_header_t *tcp = (void *) (ip4 + 1);
-
- is_tcp_udp = (ip4->protocol == IP_PROTOCOL_TCP) ||
- (ip4->protocol == IP_PROTOCOL_UDP);
- t1 = is_tcp_udp ? clib_mem_unaligned (&tcp->src, u16) : 0;
- t2 = is_tcp_udp ? clib_mem_unaligned (&tcp->dst, u16) : 0;
- a = t1 ^ t2;
- return
- lb_hash_hash_2_tuples (clib_mem_unaligned (&ip4->address_pair, u64),
- a);
- }
- else if (ip_version == 0x6)
- {
- u64 a;
- u32 c, t1, t2;
- ip6_header_t *ip6 = (ip6_header_t *) (eth + 1);
- tcp_header_t *tcp = (void *) (ip6 + 1);
-
- is_tcp_udp = 0;
- if (PREDICT_TRUE ((ip6->protocol == IP_PROTOCOL_TCP) ||
- (ip6->protocol == IP_PROTOCOL_UDP)))
- {
- is_tcp_udp = 1;
- tcp = (void *) (ip6 + 1);
- }
- else if (ip6->protocol == IP_PROTOCOL_IP6_HOP_BY_HOP_OPTIONS)
- {
- ip6_hop_by_hop_header_t *hbh =
- (ip6_hop_by_hop_header_t *) (ip6 + 1);
- if ((hbh->protocol == IP_PROTOCOL_TCP)
- || (hbh->protocol == IP_PROTOCOL_UDP))
- {
- is_tcp_udp = 1;
- tcp = (tcp_header_t *) ((u8 *) hbh + ((hbh->length + 1) << 3));
- }
- }
- t1 = is_tcp_udp ? clib_mem_unaligned (&tcp->src, u16) : 0;
- t2 = is_tcp_udp ? clib_mem_unaligned (&tcp->dst, u16) : 0;
- a = t1 ^ t2;
- c =
- lb_hash_hash (clib_mem_unaligned
- (&ip6->src_address.as_uword[0], uword),
- clib_mem_unaligned (&ip6->src_address.as_uword[1],
- uword),
- clib_mem_unaligned (&ip6->dst_address.as_uword[0],
- uword),
- clib_mem_unaligned (&ip6->dst_address.as_uword[1],
- uword), a);
- return c;
+ n_left -= 4;
+ b += 4;
+ data += 4;
}
- return bond_lb_l2 (b0);
-}
+ while (n_left > 0)
+ {
+ data[0] = vlib_buffer_get_current (b[0]);
-static_always_inline u32
-bond_lb_round_robin (bond_if_t * bif, vlib_buffer_t * b0, uword n_slaves)
-{
- bif->lb_rr_last_index++;
- if (bif->lb_rr_last_index >= n_slaves)
- bif->lb_rr_last_index = 0;
+ n_left -= 1;
+ b += 1;
+ data += 1;
+ }
- return bif->lb_rr_last_index;
+ bif->hash_func (ptd->data, h, n_left_from);
+ vec_reset_length (ptd->data);
}
static_always_inline void
-bond_tx_inline (vlib_main_t * vm, bond_if_t * bif, vlib_buffer_t ** b,
- u32 * h, u32 n_left, uword n_slaves, u32 lb_alg)
+bond_tx_no_hash (vlib_main_t *vm, bond_if_t *bif, vlib_buffer_t **b, u32 *h,
+ u32 n_left, uword n_members, u32 lb_alg)
{
- while (n_left >= 4)
+ while (n_left >= 8)
{
// Prefetch next iteration
- if (n_left >= 8)
- {
- vlib_buffer_t **pb = b + 4;
-
- vlib_prefetch_buffer_header (pb[0], LOAD);
- vlib_prefetch_buffer_header (pb[1], LOAD);
- vlib_prefetch_buffer_header (pb[2], LOAD);
- vlib_prefetch_buffer_header (pb[3], LOAD);
+ vlib_prefetch_buffer_header (b[4], LOAD);
+ vlib_prefetch_buffer_header (b[5], LOAD);
+ vlib_prefetch_buffer_header (b[6], LOAD);
+ vlib_prefetch_buffer_header (b[7], LOAD);
- CLIB_PREFETCH (pb[0]->data, CLIB_CACHE_LINE_BYTES, LOAD);
- CLIB_PREFETCH (pb[1]->data, CLIB_CACHE_LINE_BYTES, LOAD);
- CLIB_PREFETCH (pb[2]->data, CLIB_CACHE_LINE_BYTES, LOAD);
- CLIB_PREFETCH (pb[3]->data, CLIB_CACHE_LINE_BYTES, LOAD);
- }
+ clib_prefetch_load (b[4]->data);
+ clib_prefetch_load (b[5]->data);
+ clib_prefetch_load (b[6]->data);
+ clib_prefetch_load (b[7]->data);
- VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[0]);
- VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[1]);
- VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[2]);
- VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[3]);
-
- if (lb_alg == BOND_LB_L2)
- {
- h[0] = bond_lb_l2 (b[0]);
- h[1] = bond_lb_l2 (b[1]);
- h[2] = bond_lb_l2 (b[2]);
- h[3] = bond_lb_l2 (b[3]);
- }
- else if (lb_alg == BOND_LB_L34)
- {
- h[0] = bond_lb_l34 (b[0]);
- h[1] = bond_lb_l34 (b[1]);
- h[2] = bond_lb_l34 (b[2]);
- h[3] = bond_lb_l34 (b[3]);
- }
- else if (lb_alg == BOND_LB_L23)
+ if (lb_alg == BOND_LB_RR)
{
- h[0] = bond_lb_l23 (b[0]);
- h[1] = bond_lb_l23 (b[1]);
- h[2] = bond_lb_l23 (b[2]);
- h[3] = bond_lb_l23 (b[3]);
- }
- else if (lb_alg == BOND_LB_RR)
- {
- h[0] = bond_lb_round_robin (bif, b[0], n_slaves);
- h[1] = bond_lb_round_robin (bif, b[1], n_slaves);
- h[2] = bond_lb_round_robin (bif, b[2], n_slaves);
- h[3] = bond_lb_round_robin (bif, b[3], n_slaves);
+ h[0] = bond_lb_round_robin (bif, b[0], n_members);
+ h[1] = bond_lb_round_robin (bif, b[1], n_members);
+ h[2] = bond_lb_round_robin (bif, b[2], n_members);
+ h[3] = bond_lb_round_robin (bif, b[3], n_members);
}
else if (lb_alg == BOND_LB_BC)
{
- h[0] = bond_lb_broadcast (vm, bif, b[0], n_slaves);
- h[1] = bond_lb_broadcast (vm, bif, b[1], n_slaves);
- h[2] = bond_lb_broadcast (vm, bif, b[2], n_slaves);
- h[3] = bond_lb_broadcast (vm, bif, b[3], n_slaves);
+ h[0] = bond_lb_broadcast (vm, bif, b[0], n_members);
+ h[1] = bond_lb_broadcast (vm, bif, b[1], n_members);
+ h[2] = bond_lb_broadcast (vm, bif, b[2], n_members);
+ h[3] = bond_lb_broadcast (vm, bif, b[3], n_members);
}
else
{
while (n_left > 0)
{
- VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b[0]);
-
- if (bif->lb == BOND_LB_L2)
- h[0] = bond_lb_l2 (b[0]);
- else if (bif->lb == BOND_LB_L34)
- h[0] = bond_lb_l34 (b[0]);
- else if (bif->lb == BOND_LB_L23)
- h[0] = bond_lb_l23 (b[0]);
- else if (bif->lb == BOND_LB_RR)
- h[0] = bond_lb_round_robin (bif, b[0], n_slaves);
+ if (bif->lb == BOND_LB_RR)
+ h[0] = bond_lb_round_robin (bif, b[0], n_members);
else if (bif->lb == BOND_LB_BC)
- h[0] = bond_lb_broadcast (vm, bif, b[0], n_slaves);
+ h[0] = bond_lb_broadcast (vm, bif, b[0], n_members);
else
{
ASSERT (0);
}
static_always_inline void
-bond_hash_to_port (u32 * h, u32 n_left, u32 n_slaves, int use_modulo_shortcut)
+bond_hash_to_port (u32 * h, u32 n_left, u32 n_members,
+ int use_modulo_shortcut)
{
- u32 mask = n_slaves - 1;
-
-#ifdef CLIB_HAVE_VEC256
- /* only lower 16 bits of hash due to single precision fp arithmetic */
- u32x8 mask8, sc8u, h8a, h8b;
- f32x8 sc8f;
-
- if (use_modulo_shortcut)
- {
- mask8 = u32x8_splat (mask);
- }
- else
- {
- mask8 = u32x8_splat (0xffff);
- sc8u = u32x8_splat (n_slaves);
- sc8f = f32x8_from_u32x8 (sc8u);
- }
-
- while (n_left > 16)
- {
- h8a = u32x8_load_unaligned (h) & mask8;
- h8b = u32x8_load_unaligned (h + 8) & mask8;
-
- if (use_modulo_shortcut == 0)
- {
- h8a -= sc8u * u32x8_from_f32x8 (f32x8_from_u32x8 (h8a) / sc8f);
- h8b -= sc8u * u32x8_from_f32x8 (f32x8_from_u32x8 (h8b) / sc8f);
- }
-
- u32x8_store_unaligned (h8a, h);
- u32x8_store_unaligned (h8b, h + 8);
- n_left -= 16;
- h += 16;
- }
-#endif
+ u32 mask = n_members - 1;
while (n_left > 4)
{
}
else
{
- h[0] %= n_slaves;
- h[1] %= n_slaves;
- h[2] %= n_slaves;
- h[3] %= n_slaves;
+ h[0] %= n_members;
+ h[1] %= n_members;
+ h[2] %= n_members;
+ h[3] %= n_members;
}
n_left -= 4;
h += 4;
if (use_modulo_shortcut)
h[0] &= mask;
else
- h[0] %= n_slaves;
+ h[0] %= n_members;
n_left -= 1;
h += 1;
}
u32 sw_if_index = data[0];
u32 *h = data;
- while (n_left >= 4)
+ while (n_left >= 8)
{
// Prefetch next iteration
- if (n_left >= 8)
- {
- vlib_buffer_t **pb = b + 4;
- vlib_prefetch_buffer_header (pb[0], LOAD);
- vlib_prefetch_buffer_header (pb[1], LOAD);
- vlib_prefetch_buffer_header (pb[2], LOAD);
- vlib_prefetch_buffer_header (pb[3], LOAD);
- }
+ vlib_prefetch_buffer_header (b[4], LOAD);
+ vlib_prefetch_buffer_header (b[5], LOAD);
+ vlib_prefetch_buffer_header (b[6], LOAD);
+ vlib_prefetch_buffer_header (b[7], LOAD);
if (PREDICT_FALSE (single_sw_if_index))
{
}
else
{
- u32 sw_if_index[4];
-
- sw_if_index[0] = *vec_elt_at_index (bif->active_slaves, h[0]);
- sw_if_index[1] = *vec_elt_at_index (bif->active_slaves, h[1]);
- sw_if_index[2] = *vec_elt_at_index (bif->active_slaves, h[2]);
- sw_if_index[3] = *vec_elt_at_index (bif->active_slaves, h[3]);
-
- vnet_buffer (b[0])->sw_if_index[VLIB_TX] = sw_if_index[0];
- vnet_buffer (b[1])->sw_if_index[VLIB_TX] = sw_if_index[1];
- vnet_buffer (b[2])->sw_if_index[VLIB_TX] = sw_if_index[2];
- vnet_buffer (b[3])->sw_if_index[VLIB_TX] = sw_if_index[3];
+ vnet_buffer (b[0])->sw_if_index[VLIB_TX] =
+ *vec_elt_at_index (bif->active_members, h[0]);
+ vnet_buffer (b[1])->sw_if_index[VLIB_TX] =
+ *vec_elt_at_index (bif->active_members, h[1]);
+ vnet_buffer (b[2])->sw_if_index[VLIB_TX] =
+ *vec_elt_at_index (bif->active_members, h[2]);
+ vnet_buffer (b[3])->sw_if_index[VLIB_TX] =
+ *vec_elt_at_index (bif->active_members, h[3]);
bond_tx_add_to_queue (ptd, h[0], bi[0]);
bond_tx_add_to_queue (ptd, h[1], bi[1]);
}
else
{
- u32 sw_if_index0 = *vec_elt_at_index (bif->active_slaves, h[0]);
-
- vnet_buffer (b[0])->sw_if_index[VLIB_TX] = sw_if_index0;
+ vnet_buffer (b[0])->sw_if_index[VLIB_TX] =
+ *vec_elt_at_index (bif->active_members, h[0]);
bond_tx_add_to_queue (ptd, h[0], bi[0]);
}
while (n_trace > 0 && n_left > 0)
{
- bond_packet_trace_t *t0;
- ethernet_header_t *eth;
- u32 next0 = 0;
-
- vlib_trace_buffer (vm, node, next0, b[0], 0 /* follow_chain */ );
- vlib_set_trace_count (vm, node, --n_trace);
- t0 = vlib_add_trace (vm, node, b[0], sizeof (*t0));
- eth = vlib_buffer_get_current (b[0]);
- t0->ethernet = *eth;
- t0->sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_TX];
- if (!h)
- {
- t0->bond_sw_if_index = *vec_elt_at_index (bif->active_slaves, 0);
- }
- else
+ if (PREDICT_TRUE
+ (vlib_trace_buffer (vm, node, 0, b[0], 0 /* follow_chain */ )))
{
- t0->bond_sw_if_index = *vec_elt_at_index (bif->active_slaves, h[0]);
- h++;
+ bond_packet_trace_t *t0;
+ ethernet_header_t *eth;
+
+ vlib_set_trace_count (vm, node, --n_trace);
+ t0 = vlib_add_trace (vm, node, b[0], sizeof (*t0));
+ eth = vlib_buffer_get_current (b[0]);
+ t0->ethernet = *eth;
+ t0->sw_if_index = vnet_buffer (b[0])->sw_if_index[VLIB_TX];
+ if (!h)
+ {
+ t0->bond_sw_if_index =
+ *vec_elt_at_index (bif->active_members, 0);
+ }
+ else
+ {
+ t0->bond_sw_if_index =
+ *vec_elt_at_index (bif->active_members, h[0]);
+ h++;
+ }
}
b++;
n_left--;
bond_main_t *bm = &bond_main;
u16 thread_index = vm->thread_index;
bond_if_t *bif = pool_elt_at_index (bm->interfaces, rund->dev_instance);
- uword n_slaves;
+ uword n_members;
vlib_buffer_t *bufs[VLIB_FRAME_SIZE];
u32 *from = vlib_frame_vector_args (frame);
u32 n_left = frame->n_vectors;
return frame->n_vectors;
}
- n_slaves = vec_len (bif->active_slaves);
- if (PREDICT_FALSE (n_slaves == 0))
+ n_members = vec_len (bif->active_members);
+ if (PREDICT_FALSE (n_members == 0))
{
vlib_buffer_free (vm, vlib_frame_vector_args (frame), frame->n_vectors);
vlib_increment_simple_counter (vnet_main.interface_main.sw_if_counters +
VNET_INTERFACE_COUNTER_DROP,
thread_index, bif->sw_if_index,
frame->n_vectors);
- vlib_error_count (vm, node->node_index, BOND_TX_ERROR_NO_SLAVE,
+ vlib_error_count (vm, node->node_index, BOND_TX_ERROR_NO_MEMBER,
frame->n_vectors);
return frame->n_vectors;
}
vlib_get_buffers (vm, from, bufs, n_left);
/* active-backup mode, ship everything to first sw if index */
- if ((bif->lb == BOND_LB_AB) || PREDICT_FALSE (n_slaves == 1))
+ if ((bif->lb == BOND_LB_AB) || PREDICT_FALSE (n_members == 1))
{
- sw_if_index = *vec_elt_at_index (bif->active_slaves, 0);
+ sw_if_index = *vec_elt_at_index (bif->active_members, 0);
bond_tx_trace (vm, node, bif, bufs, frame->n_vectors, 0);
bond_update_sw_if_index (ptd, bif, from, bufs, &sw_if_index, n_left,
if (bif->lb == BOND_LB_BC)
{
- sw_if_index = *vec_elt_at_index (bif->active_slaves, 0);
+ sw_if_index = *vec_elt_at_index (bif->active_members, 0);
- bond_tx_inline (vm, bif, bufs, hashes, n_left, n_slaves, BOND_LB_BC);
+ bond_tx_no_hash (vm, bif, bufs, hashes, n_left, n_members, BOND_LB_BC);
bond_tx_trace (vm, node, bif, bufs, frame->n_vectors, 0);
bond_update_sw_if_index (ptd, bif, from, bufs, &sw_if_index, n_left,
/* single_sw_if_index */ 1);
goto done;
}
- /* if have at least one slave on local numa node, only slaves on local numa
+ /* if have at least one member on local numa node, only members on local numa
node will transmit pkts when bif->local_numa_only is enabled */
- if (bif->n_numa_slaves >= 1)
- n_slaves = bif->n_numa_slaves;
-
- if (bif->lb == BOND_LB_L2)
- bond_tx_inline (vm, bif, bufs, hashes, n_left, n_slaves, BOND_LB_L2);
- else if (bif->lb == BOND_LB_L34)
- bond_tx_inline (vm, bif, bufs, hashes, n_left, n_slaves, BOND_LB_L34);
- else if (bif->lb == BOND_LB_L23)
- bond_tx_inline (vm, bif, bufs, hashes, n_left, n_slaves, BOND_LB_L23);
- else if (bif->lb == BOND_LB_RR)
- bond_tx_inline (vm, bif, bufs, hashes, n_left, n_slaves, BOND_LB_RR);
+ if (bif->n_numa_members >= 1)
+ n_members = bif->n_numa_members;
+
+ if (bif->lb == BOND_LB_RR)
+ bond_tx_no_hash (vm, bif, bufs, hashes, n_left, n_members, BOND_LB_RR);
else
- ASSERT (0);
+ bond_tx_hash (vm, ptd, bif, bufs, hashes, n_left);
/* calculate port out of hash */
h = hashes;
- if (BOND_MODULO_SHORTCUT (n_slaves))
- bond_hash_to_port (h, frame->n_vectors, n_slaves, 1);
+ if (BOND_MODULO_SHORTCUT (n_members))
+ bond_hash_to_port (h, frame->n_vectors, n_members, 1);
else
- bond_hash_to_port (h, frame->n_vectors, n_slaves, 0);
+ bond_hash_to_port (h, frame->n_vectors, n_members, 0);
bond_tx_trace (vm, node, bif, bufs, frame->n_vectors, h);
/* single_sw_if_index */ 0);
done:
- for (p = 0; p < n_slaves; p++)
+ for (p = 0; p < n_members; p++)
{
vlib_frame_t *f;
u32 *to_next;
- sw_if_index = *vec_elt_at_index (bif->active_slaves, p);
+ sw_if_index = *vec_elt_at_index (bif->active_members, p);
if (PREDICT_TRUE (ptd->per_port_queue[p].n_buffers))
{
f = vnet_get_frame_to_sw_interface (vnm, sw_if_index);
{
bond_main_t *bm = &bond_main;
- ip_neighbor_advertise (bm->vlib_main, IP46_TYPE_BOTH, NULL, sw_if_index);
+ ip4_neighbor_advertise (bm->vlib_main, bm->vnet_main, sw_if_index, NULL);
+ ip6_neighbor_advertise (bm->vlib_main, bm->vnet_main, sw_if_index, NULL);
return (WALK_CONTINUE);
}
/* *INDENT-ON* */
static clib_error_t *
-bond_slave_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
+bond_member_interface_add_del (vnet_main_t * vnm, u32 sw_if_index, u32 is_add)
{
bond_main_t *bm = &bond_main;
- slave_if_t *sif;
- bond_detach_slave_args_t args = { 0 };
+ member_if_t *mif;
+ bond_detach_member_args_t args = { 0 };
if (is_add)
return 0;
- sif = bond_get_slave_by_sw_if_index (sw_if_index);
- if (!sif)
+ mif = bond_get_member_by_sw_if_index (sw_if_index);
+ if (!mif)
return 0;
- args.slave = sw_if_index;
- bond_detach_slave (bm->vlib_main, &args);
+ args.member = sw_if_index;
+ bond_detach_member (bm->vlib_main, &args);
return args.error;
}
-VNET_SW_INTERFACE_ADD_DEL_FUNCTION (bond_slave_interface_add_del);
+VNET_SW_INTERFACE_ADD_DEL_FUNCTION (bond_member_interface_add_del);
/*
* fd.io coding-style-patch-verification: ON