X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbonding%2Fdevice.c;h=53123dd7c4f1041fd04e5fb7f146868d4d1aefa4;hb=067cd6229a47ea3ba8b59a2a04090e80afb5bd2c;hp=8f9b3a95591d01ca738feebcf3d64c98aa3e00bf;hpb=9cd2d7a5a4fafadb65d772c48109d55d1e19d425;p=vpp.git diff --git a/src/vnet/bonding/device.c b/src/vnet/bonding/device.c index 8f9b3a95591..53123dd7c4f 100644 --- a/src/vnet/bonding/device.c +++ b/src/vnet/bonding/device.c @@ -22,6 +22,9 @@ #include #include #include +#include +#include +#include #define foreach_bond_tx_error \ _(NONE, "no error") \ @@ -73,6 +76,36 @@ format_bond_interface_name (u8 * s, va_list * args) return s; } +static __clib_unused clib_error_t * +bond_set_l2_mode_function (vnet_main_t * vnm, + struct vnet_hw_interface_t *bif_hw, + i32 l2_if_adjust) +{ + bond_if_t *bif; + u32 *sw_if_index; + struct vnet_hw_interface_t *sif_hw; + + bif = bond_get_master_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) + { + sif_hw = vnet_get_sup_hw_interface (vnm, *sw_if_index); + ethernet_set_flags (vnm, sif_hw->hw_if_index, + ETHERNET_INTERFACE_FLAG_ACCEPT_ALL); + + /* ensure all packets go to ethernet-input */ + ethernet_set_rx_redirect (vnm, sif_hw, 1); + } + } + + return 0; +} + static __clib_unused clib_error_t * bond_subif_add_del_function (vnet_main_t * vnm, u32 hw_if_index, struct vnet_sw_interface_t *st, int is_add) @@ -96,22 +129,26 @@ bond_interface_admin_up_down (vnet_main_t * vnm, u32 hw_if_index, u32 flags) return 0; } -static inline u32 +static_always_inline u32 bond_load_balance_broadcast (vlib_main_t * vm, vlib_node_runtime_t * node, - bond_if_t * bif, vlib_buffer_t * b0) + bond_if_t * bif, vlib_buffer_t * b0, + uword slave_count) { vnet_main_t *vnm = vnet_get_main (); vlib_buffer_t *c0; - int i; + int port; u32 *to_next = 0; u32 sw_if_index; vlib_frame_t *f; + u16 thread_index = vm->thread_index; - - for (i = 1; i < vec_len (bif->active_slaves); i++) + for (port = 1; port < slave_count; port++) { - sw_if_index = *vec_elt_at_index (bif->active_slaves, i); - f = vnet_get_frame_to_sw_interface (vnm, sw_if_index); + sw_if_index = *vec_elt_at_index (bif->active_slaves, port); + if (bif->per_thread_info[thread_index].frame[port] == 0) + bif->per_thread_info[thread_index].frame[port] = + vnet_get_frame_to_sw_interface (vnm, sw_if_index); + f = bif->per_thread_info[thread_index].frame[port]; to_next = vlib_frame_vector_args (f); to_next += f->n_vectors; c0 = vlib_buffer_copy (vm, b0); @@ -120,36 +157,32 @@ bond_load_balance_broadcast (vlib_main_t * vm, vlib_node_runtime_t * node, vnet_buffer (c0)->sw_if_index[VLIB_TX] = sw_if_index; to_next[0] = vlib_get_buffer_index (vm, c0); f->n_vectors++; - vnet_put_frame_to_sw_interface (vnm, sw_if_index, f); } } return 0; } -static inline u32 +static_always_inline u32 bond_load_balance_l2 (vlib_main_t * vm, vlib_node_runtime_t * node, - bond_if_t * bif, vlib_buffer_t * b0) + bond_if_t * bif, vlib_buffer_t * b0, uword slave_count) { ethernet_header_t *eth = (ethernet_header_t *) vlib_buffer_get_current (b0); - u32 a = 0, b = 0, c = 0, t1, t2; - u16 t11, t22; + u32 c; + 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); - memcpy (&t1, eth->src_address, sizeof (t1)); - memcpy (&t11, ð->src_address[4], sizeof (t11)); - a = t1 ^ t11; + c = lb_hash_hash_2_tuples (a, b); - memcpy (&t2, eth->dst_address, sizeof (t2)); - memcpy (&t22, ð->dst_address[4], sizeof (t22)); - b = t2 ^ t22; - - hash_v3_mix32 (a, b, c); - hash_v3_finalize32 (a, b, c); - - return c % vec_len (bif->active_slaves); + if (BOND_MODULO_SHORTCUT (slave_count)) + return (c & (slave_count - 1)); + else + return c % slave_count; } -static inline u16 * +static_always_inline u16 * bond_locate_ethertype (ethernet_header_t * eth) { u16 *ethertype_p; @@ -172,109 +205,119 @@ bond_locate_ethertype (ethernet_header_t * eth) return ethertype_p; } -static inline u32 +static_always_inline u32 bond_load_balance_l23 (vlib_main_t * vm, vlib_node_runtime_t * node, - bond_if_t * bif, vlib_buffer_t * b0) + bond_if_t * bif, vlib_buffer_t * b0, uword slave_count) { ethernet_header_t *eth = (ethernet_header_t *) 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 = *ethertype_p; + ethertype = clib_mem_unaligned (ethertype_p, u16); if ((ethertype != htons (ETHERNET_TYPE_IP4)) && (ethertype != htons (ETHERNET_TYPE_IP6))) - return (bond_load_balance_l2 (vm, node, bif, b0)); + return (bond_load_balance_l2 (vm, node, bif, b0, slave_count)); ip4 = (ip4_header_t *) (ethertype_p + 1); ip_version = (ip4->ip_version_and_header_length >> 4); if (ip_version == 0x4) { - u16 t11, t22; - u32 a = 0, b = 0, c = 0, t1, t2; - - memcpy (&t1, eth->src_address, sizeof (t1)); - memcpy (&t11, ð->src_address[4], sizeof (t11)); - a = t1 ^ t11; - - memcpy (&t2, eth->dst_address, sizeof (t2)); - memcpy (&t22, ð->dst_address[4], sizeof (t22)); - b = t2 ^ t22; - - c = ip4->src_address.data_u32 ^ ip4->dst_address.data_u32; - - hash_v3_mix32 (a, b, c); - hash_v3_finalize32 (a, b, c); - - return c % vec_len (bif->active_slaves); + 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); + if (BOND_MODULO_SHORTCUT (slave_count)) + return (c & (slave_count - 1)); + else + return c % slave_count; } else if (ip_version == 0x6) { - u64 a, b, c; - u64 t1 = 0, t2 = 0; + u64 a; + u32 c; ip6_header_t *ip6 = (ip6_header_t *) (eth + 1); - memcpy (&t1, eth->src_address, sizeof (eth->src_address)); - memcpy (&t2, eth->dst_address, sizeof (eth->dst_address)); - a = t1 ^ t2; - - b = (ip6->src_address.as_u64[0] ^ ip6->src_address.as_u64[1]); - c = (ip6->dst_address.as_u64[0] ^ ip6->dst_address.as_u64[1]); - - hash_mix64 (a, b, c); - return c % vec_len (bif->active_slaves); + 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); + if (BOND_MODULO_SHORTCUT (slave_count)) + return (c & (slave_count - 1)); + else + return c % slave_count; } - return (bond_load_balance_l2 (vm, node, bif, b0)); + return (bond_load_balance_l2 (vm, node, bif, b0, slave_count)); } -static inline u32 +static_always_inline u32 bond_load_balance_l34 (vlib_main_t * vm, vlib_node_runtime_t * node, - bond_if_t * bif, vlib_buffer_t * b0) + bond_if_t * bif, vlib_buffer_t * b0, uword slave_count) { ethernet_header_t *eth = (ethernet_header_t *) vlib_buffer_get_current (b0); u8 ip_version; - uword is_tcp_udp = 0; + uword is_tcp_udp; ip4_header_t *ip4; u16 ethertype, *ethertype_p; ethertype_p = bond_locate_ethertype (eth); - ethertype = *ethertype_p; + ethertype = clib_mem_unaligned (ethertype_p, u16); if ((ethertype != htons (ETHERNET_TYPE_IP4)) && (ethertype != htons (ETHERNET_TYPE_IP6))) - return (bond_load_balance_l2 (vm, node, bif, b0)); + return (bond_load_balance_l2 (vm, node, bif, b0, slave_count)); ip4 = (ip4_header_t *) (ethertype_p + 1); ip_version = (ip4->ip_version_and_header_length >> 4); if (ip_version == 0x4) { - u32 a = 0, b = 0, c = 0, t1, t2; + u32 a, c, t1, t2; tcp_header_t *tcp = (void *) (ip4 + 1); + is_tcp_udp = (ip4->protocol == IP_PROTOCOL_TCP) || (ip4->protocol == IP_PROTOCOL_UDP); - - a = ip4->src_address.data_u32 ^ ip4->dst_address.data_u32; - - t1 = is_tcp_udp ? tcp->src : 0; - t2 = is_tcp_udp ? tcp->dst : 0; - b = t1 + (t2 << 16); - - hash_v3_mix32 (a, b, c); - hash_v3_finalize32 (a, b, c); - - return c % vec_len (bif->active_slaves); + 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_2_tuples (clib_mem_unaligned (&ip4->address_pair, u64), + a); + if (BOND_MODULO_SHORTCUT (slave_count)) + return (c & (slave_count - 1)); + else + return c % slave_count; } else if (ip_version == 0x6) { - u64 a, b, c; - u64 t1, t2; + 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))) { @@ -292,35 +335,47 @@ bond_load_balance_l34 (vlib_main_t * vm, vlib_node_runtime_t * node, tcp = (tcp_header_t *) ((u8 *) hbh + ((hbh->length + 1) << 3)); } } - a = (ip6->src_address.as_u64[0] ^ ip6->src_address.as_u64[1]); - b = (ip6->dst_address.as_u64[0] ^ ip6->dst_address.as_u64[1]); - - t1 = is_tcp_udp ? tcp->src : 0; - t2 = is_tcp_udp ? tcp->dst : 0; - c = (t2 << 16) | t1; - hash_mix64 (a, b, c); - - return c % vec_len (bif->active_slaves); + 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); + if (BOND_MODULO_SHORTCUT (slave_count)) + return (c & (slave_count - 1)); + else + return c % slave_count; } - return (bond_load_balance_l2 (vm, node, bif, b0)); + return (bond_load_balance_l2 (vm, node, bif, b0, slave_count)); } -static inline u32 +static_always_inline u32 bond_load_balance_round_robin (vlib_main_t * vm, vlib_node_runtime_t * node, - bond_if_t * bif, vlib_buffer_t * b0) + bond_if_t * bif, vlib_buffer_t * b0, + uword slave_count) { bif->lb_rr_last_index++; - bif->lb_rr_last_index %= vec_len (bif->active_slaves); + if (BOND_MODULO_SHORTCUT (slave_count)) + bif->lb_rr_last_index &= slave_count - 1; + else + bif->lb_rr_last_index %= slave_count; return bif->lb_rr_last_index; } -static inline u32 +static_always_inline u32 bond_load_balance_active_backup (vlib_main_t * vm, vlib_node_runtime_t * node, - bond_if_t * bif, vlib_buffer_t * b0) + bond_if_t * bif, vlib_buffer_t * b0, + uword slave_count) { /* First interface is the active, the rest is backup */ return 0; @@ -344,16 +399,16 @@ bond_tx_fn (vlib_main_t * vm, vlib_node_runtime_t * node, u32 *from = vlib_frame_vector_args (frame); u32 n_left_from; ethernet_header_t *eth; - u32 next0 = 0, next1 = 0, next2 = 0, next3 = 0; - u32 port, port1, port2, port3; + u32 port; u32 sw_if_index, sw_if_index1, sw_if_index2, sw_if_index3; bond_packet_trace_t *t0; uword n_trace = vlib_get_trace_count (vm, node); - u16 thread_index = vlib_get_thread_index (); + u16 thread_index = vm->thread_index; vnet_main_t *vnm = vnet_get_main (); - u32 *to_next, *to_next1, *to_next2, *to_next3; + u32 *to_next; u32 sif_if_index, sif_if_index1, sif_if_index2, sif_if_index3; - vlib_frame_t *f, *f1, *f2, *f3; + vlib_frame_t *f; + uword slave_count; if (PREDICT_FALSE (bif->admin_up == 0)) { @@ -367,7 +422,9 @@ bond_tx_fn (vlib_main_t * vm, vlib_node_runtime_t * node, return frame->n_vectors; } - if (PREDICT_FALSE (vec_len (bif->active_slaves) == 0)) + clib_spinlock_lock_if_init (&bif->lockp); + slave_count = vec_len (bif->active_slaves); + if (PREDICT_FALSE (slave_count == 0)) { bi0 = from[0]; b0 = vlib_get_buffer (vm, bi0); @@ -383,209 +440,314 @@ bond_tx_fn (vlib_main_t * vm, vlib_node_runtime_t * node, frame->n_vectors); vlib_error_count (vm, node->node_index, BOND_TX_ERROR_NO_SLAVE, frame->n_vectors); + clib_spinlock_unlock_if_init (&bif->lockp); return frame->n_vectors; } + vec_validate_aligned (bif->per_thread_info[thread_index].frame, slave_count, + CLIB_CACHE_LINE_BYTES); + /* Number of buffers / pkts */ n_left_from = frame->n_vectors; - while (n_left_from >= 8) + while (n_left_from > 0) { - // Prefetch next iteration - { - vlib_buffer_t *p4, *p5, *p6, *p7; - - p4 = vlib_get_buffer (vm, from[4]); - p5 = vlib_get_buffer (vm, from[5]); - p6 = vlib_get_buffer (vm, from[6]); - p7 = vlib_get_buffer (vm, from[7]); - - vlib_prefetch_buffer_header (p4, STORE); - vlib_prefetch_buffer_header (p5, STORE); - vlib_prefetch_buffer_header (p6, STORE); - vlib_prefetch_buffer_header (p7, STORE); - - CLIB_PREFETCH (p4->data, CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (p5->data, CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (p6->data, CLIB_CACHE_LINE_BYTES, LOAD); - CLIB_PREFETCH (p7->data, CLIB_CACHE_LINE_BYTES, LOAD); - } + while (n_left_from >= 4) + { + u32 next0 = 0, next1 = 0, next2 = 0, next3 = 0; + u32 port0 = 0, port1 = 0, port2 = 0, port3 = 0; - bi0 = from[0]; - bi1 = from[1]; - bi2 = from[2]; - bi3 = from[3]; + // Prefetch next iteration + if (n_left_from >= 8) + { + vlib_buffer_t *p4, *p5, *p6, *p7; + + p4 = vlib_get_buffer (vm, from[4]); + p5 = vlib_get_buffer (vm, from[5]); + p6 = vlib_get_buffer (vm, from[6]); + p7 = vlib_get_buffer (vm, from[7]); + + vlib_prefetch_buffer_header (p4, LOAD); + vlib_prefetch_buffer_header (p5, LOAD); + vlib_prefetch_buffer_header (p6, LOAD); + vlib_prefetch_buffer_header (p7, LOAD); + + CLIB_PREFETCH (p4->data, CLIB_CACHE_LINE_BYTES, LOAD); + CLIB_PREFETCH (p5->data, CLIB_CACHE_LINE_BYTES, LOAD); + CLIB_PREFETCH (p6->data, CLIB_CACHE_LINE_BYTES, LOAD); + CLIB_PREFETCH (p7->data, CLIB_CACHE_LINE_BYTES, LOAD); + } - b0 = vlib_get_buffer (vm, bi0); - b1 = vlib_get_buffer (vm, bi1); - b2 = vlib_get_buffer (vm, bi2); - b3 = vlib_get_buffer (vm, bi3); - - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0); - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b1); - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b2); - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b3); - - sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX]; - sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_TX]; - sw_if_index2 = vnet_buffer (b2)->sw_if_index[VLIB_TX]; - sw_if_index3 = vnet_buffer (b3)->sw_if_index[VLIB_TX]; - - port = - (bond_load_balance_table[bif->lb]).load_balance (vm, node, bif, b0); - port1 = - (bond_load_balance_table[bif->lb]).load_balance (vm, node, bif, b1); - port2 = - (bond_load_balance_table[bif->lb]).load_balance (vm, node, bif, b2); - port3 = - (bond_load_balance_table[bif->lb]).load_balance (vm, node, bif, b3); - - sif_if_index = *vec_elt_at_index (bif->active_slaves, port); - sif_if_index1 = *vec_elt_at_index (bif->active_slaves, port1); - sif_if_index2 = *vec_elt_at_index (bif->active_slaves, port2); - sif_if_index3 = *vec_elt_at_index (bif->active_slaves, port3); - - vnet_buffer (b0)->sw_if_index[VLIB_TX] = sif_if_index; - vnet_buffer (b1)->sw_if_index[VLIB_TX] = sif_if_index1; - vnet_buffer (b2)->sw_if_index[VLIB_TX] = sif_if_index2; - vnet_buffer (b3)->sw_if_index[VLIB_TX] = sif_if_index3; - - f = vnet_get_frame_to_sw_interface (vnm, sif_if_index); - f1 = vnet_get_frame_to_sw_interface (vnm, sif_if_index1); - f2 = vnet_get_frame_to_sw_interface (vnm, sif_if_index2); - f3 = vnet_get_frame_to_sw_interface (vnm, sif_if_index3); + bi0 = from[0]; + bi1 = from[1]; + bi2 = from[2]; + bi3 = from[3]; - to_next = vlib_frame_vector_args (f); - to_next1 = vlib_frame_vector_args (f1); - to_next2 = vlib_frame_vector_args (f2); - to_next3 = vlib_frame_vector_args (f3); + b0 = vlib_get_buffer (vm, bi0); + b1 = vlib_get_buffer (vm, bi1); + b2 = vlib_get_buffer (vm, bi2); + b3 = vlib_get_buffer (vm, bi3); - to_next += f->n_vectors; - to_next1 += f1->n_vectors; - to_next2 += f2->n_vectors; - to_next3 += f3->n_vectors; - - to_next[0] = vlib_get_buffer_index (vm, b0); - to_next1[0] = vlib_get_buffer_index (vm, b1); - to_next2[0] = vlib_get_buffer_index (vm, b2); - to_next3[0] = vlib_get_buffer_index (vm, b3); - - f->n_vectors++; - f1->n_vectors++; - f2->n_vectors++; - f3->n_vectors++; - - vnet_put_frame_to_sw_interface (vnm, sif_if_index, f); - vnet_put_frame_to_sw_interface (vnm, sif_if_index1, f1); - vnet_put_frame_to_sw_interface (vnm, sif_if_index2, f2); - vnet_put_frame_to_sw_interface (vnm, sif_if_index3, f3); - - if (PREDICT_FALSE (n_trace > 0)) - { - vlib_trace_buffer (vm, node, next0, b0, 0 /* follow_chain */ ); - vlib_set_trace_count (vm, node, --n_trace); - t0 = vlib_add_trace (vm, node, b0, sizeof (*t0)); - eth = (ethernet_header_t *) vlib_buffer_get_current (b0); - t0->ethernet = *eth; - t0->sw_if_index = sw_if_index; - t0->bond_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX]; - - if (PREDICT_TRUE (n_trace > 0)) + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0); + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b1); + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b2); + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b3); + + sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX]; + sw_if_index1 = vnet_buffer (b1)->sw_if_index[VLIB_TX]; + sw_if_index2 = vnet_buffer (b2)->sw_if_index[VLIB_TX]; + sw_if_index3 = vnet_buffer (b3)->sw_if_index[VLIB_TX]; + + if (PREDICT_TRUE (slave_count != 1)) { - vlib_trace_buffer (vm, node, next1, b1, 0 /* follow_chain */ ); + port0 = + (bond_load_balance_table[bif->lb]).load_balance (vm, node, + bif, b0, + slave_count); + port1 = + (bond_load_balance_table[bif->lb]).load_balance (vm, node, + bif, b1, + slave_count); + port2 = + (bond_load_balance_table[bif->lb]).load_balance (vm, node, + bif, b2, + slave_count); + port3 = + (bond_load_balance_table[bif->lb]).load_balance (vm, node, + bif, b3, + slave_count); + } + + sif_if_index = *vec_elt_at_index (bif->active_slaves, port0); + sif_if_index1 = *vec_elt_at_index (bif->active_slaves, port1); + sif_if_index2 = *vec_elt_at_index (bif->active_slaves, port2); + sif_if_index3 = *vec_elt_at_index (bif->active_slaves, port3); + + vnet_buffer (b0)->sw_if_index[VLIB_TX] = sif_if_index; + vnet_buffer (b1)->sw_if_index[VLIB_TX] = sif_if_index1; + vnet_buffer (b2)->sw_if_index[VLIB_TX] = sif_if_index2; + vnet_buffer (b3)->sw_if_index[VLIB_TX] = sif_if_index3; + + if (PREDICT_FALSE ((bif->per_thread_info[thread_index].frame[port0] + == 0))) + bif->per_thread_info[thread_index].frame[port0] = + vnet_get_frame_to_sw_interface (vnm, sif_if_index); + + if (PREDICT_FALSE ((bif->per_thread_info[thread_index].frame[port1] + == 0))) + bif->per_thread_info[thread_index].frame[port1] = + vnet_get_frame_to_sw_interface (vnm, sif_if_index1); + + if (PREDICT_FALSE ((bif->per_thread_info[thread_index].frame[port2] + == 0))) + bif->per_thread_info[thread_index].frame[port2] = + vnet_get_frame_to_sw_interface (vnm, sif_if_index2); + + if (PREDICT_FALSE ((bif->per_thread_info[thread_index].frame[port3] + == 0))) + bif->per_thread_info[thread_index].frame[port3] = + vnet_get_frame_to_sw_interface (vnm, sif_if_index3); + + f = bif->per_thread_info[thread_index].frame[port0]; + to_next = vlib_frame_vector_args (f); + to_next += f->n_vectors; + to_next[0] = vlib_get_buffer_index (vm, b0); + f->n_vectors++; + + f = bif->per_thread_info[thread_index].frame[port1]; + to_next = vlib_frame_vector_args (f); + to_next += f->n_vectors; + to_next[0] = vlib_get_buffer_index (vm, b1); + f->n_vectors++; + + f = bif->per_thread_info[thread_index].frame[port2]; + to_next = vlib_frame_vector_args (f); + to_next += f->n_vectors; + to_next[0] = vlib_get_buffer_index (vm, b2); + f->n_vectors++; + + f = bif->per_thread_info[thread_index].frame[port3]; + to_next = vlib_frame_vector_args (f); + to_next += f->n_vectors; + to_next[0] = vlib_get_buffer_index (vm, b3); + f->n_vectors++; + + if (PREDICT_FALSE (n_trace > 0)) + { + vlib_trace_buffer (vm, node, next0, b0, 0 /* follow_chain */ ); vlib_set_trace_count (vm, node, --n_trace); - t0 = vlib_add_trace (vm, node, b1, sizeof (*t0)); - eth = (ethernet_header_t *) vlib_buffer_get_current (b1); + t0 = vlib_add_trace (vm, node, b0, sizeof (*t0)); + eth = (ethernet_header_t *) vlib_buffer_get_current (b0); t0->ethernet = *eth; - t0->sw_if_index = sw_if_index1; - t0->bond_sw_if_index = vnet_buffer (b1)->sw_if_index[VLIB_TX]; + t0->sw_if_index = sw_if_index; + t0->bond_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX]; if (PREDICT_TRUE (n_trace > 0)) { - vlib_trace_buffer (vm, node, next2, b2, + vlib_trace_buffer (vm, node, next1, b1, 0 /* follow_chain */ ); vlib_set_trace_count (vm, node, --n_trace); - t0 = vlib_add_trace (vm, node, b2, sizeof (*t0)); - eth = (ethernet_header_t *) vlib_buffer_get_current (b2); + t0 = vlib_add_trace (vm, node, b1, sizeof (*t0)); + eth = (ethernet_header_t *) vlib_buffer_get_current (b1); t0->ethernet = *eth; - t0->sw_if_index = sw_if_index2; + t0->sw_if_index = sw_if_index1; t0->bond_sw_if_index = - vnet_buffer (b2)->sw_if_index[VLIB_TX]; + vnet_buffer (b1)->sw_if_index[VLIB_TX]; if (PREDICT_TRUE (n_trace > 0)) { - vlib_trace_buffer (vm, node, next3, b3, + vlib_trace_buffer (vm, node, next2, b2, 0 /* follow_chain */ ); vlib_set_trace_count (vm, node, --n_trace); - t0 = vlib_add_trace (vm, node, b3, sizeof (*t0)); + t0 = vlib_add_trace (vm, node, b2, sizeof (*t0)); eth = - (ethernet_header_t *) vlib_buffer_get_current (b3); + (ethernet_header_t *) vlib_buffer_get_current (b2); t0->ethernet = *eth; - t0->sw_if_index = sw_if_index3; + t0->sw_if_index = sw_if_index2; t0->bond_sw_if_index = - vnet_buffer (b3)->sw_if_index[VLIB_TX]; + vnet_buffer (b2)->sw_if_index[VLIB_TX]; + + if (PREDICT_TRUE (n_trace > 0)) + { + vlib_trace_buffer (vm, node, next3, b3, + 0 /* follow_chain */ ); + vlib_set_trace_count (vm, node, --n_trace); + t0 = vlib_add_trace (vm, node, b3, sizeof (*t0)); + eth = + (ethernet_header_t *) + vlib_buffer_get_current (b3); + t0->ethernet = *eth; + t0->sw_if_index = sw_if_index3; + t0->bond_sw_if_index = + vnet_buffer (b3)->sw_if_index[VLIB_TX]; + } } } } + from += 4; + n_left_from -= 4; } - from += 4; - n_left_from -= 4; - } - - while (n_left_from > 0) - { - // Prefetch next iteration - if (n_left_from > 1) + while (n_left_from > 0) { - vlib_buffer_t *p2; - - p2 = vlib_get_buffer (vm, from[1]); - vlib_prefetch_buffer_header (p2, STORE); - CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, LOAD); - } - - bi0 = from[0]; - b0 = vlib_get_buffer (vm, bi0); + u32 next0 = 0; + u32 port0 = 0; - VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0); + // Prefetch next iteration + if (n_left_from > 1) + { + vlib_buffer_t *p2; - sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX]; + p2 = vlib_get_buffer (vm, from[1]); + vlib_prefetch_buffer_header (p2, LOAD); + CLIB_PREFETCH (p2->data, CLIB_CACHE_LINE_BYTES, LOAD); + } - port = - (bond_load_balance_table[bif->lb]).load_balance (vm, node, bif, b0); - sif_if_index = *vec_elt_at_index (bif->active_slaves, port); - vnet_buffer (b0)->sw_if_index[VLIB_TX] = sif_if_index; - f = vnet_get_frame_to_sw_interface (vnm, sif_if_index); - to_next = vlib_frame_vector_args (f); - to_next += f->n_vectors; + bi0 = from[0]; + b0 = vlib_get_buffer (vm, bi0); + + VLIB_BUFFER_TRACE_TRAJECTORY_INIT (b0); + + sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX]; + + if (PREDICT_TRUE (slave_count != 1)) + port0 = + (bond_load_balance_table[bif->lb]).load_balance (vm, node, bif, + b0, + slave_count); + sif_if_index = *vec_elt_at_index (bif->active_slaves, port0); + vnet_buffer (b0)->sw_if_index[VLIB_TX] = sif_if_index; + if (PREDICT_FALSE + ((bif->per_thread_info[thread_index].frame[port0] == 0))) + bif->per_thread_info[thread_index].frame[port0] = + vnet_get_frame_to_sw_interface (vnm, sif_if_index); + f = bif->per_thread_info[thread_index].frame[port0]; + to_next = vlib_frame_vector_args (f); + to_next += f->n_vectors; + to_next[0] = vlib_get_buffer_index (vm, b0); + f->n_vectors++; - to_next[0] = vlib_get_buffer_index (vm, b0); - f->n_vectors++; - vnet_put_frame_to_sw_interface (vnm, sif_if_index, f); + if (PREDICT_FALSE (n_trace > 0)) + { + vlib_trace_buffer (vm, node, next0, b0, 0 /* follow_chain */ ); + vlib_set_trace_count (vm, node, --n_trace); + t0 = vlib_add_trace (vm, node, b0, sizeof (*t0)); + eth = (ethernet_header_t *) vlib_buffer_get_current (b0); + t0->ethernet = *eth; + t0->sw_if_index = sw_if_index; + t0->bond_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX]; + } - if (PREDICT_FALSE (n_trace > 0)) - { - vlib_trace_buffer (vm, node, next0, b0, 0 /* follow_chain */ ); - vlib_set_trace_count (vm, node, --n_trace); - t0 = vlib_add_trace (vm, node, b0, sizeof (*t0)); - eth = (ethernet_header_t *) vlib_buffer_get_current (b0); - t0->ethernet = *eth; - t0->sw_if_index = sw_if_index; - t0->bond_sw_if_index = vnet_buffer (b0)->sw_if_index[VLIB_TX]; + from += 1; + n_left_from -= 1; } + } + + for (port = 0; port < slave_count; port++) + { + f = bif->per_thread_info[thread_index].frame[port]; + if (f == 0) + continue; - from += 1; - n_left_from -= 1; + sw_if_index = *vec_elt_at_index (bif->active_slaves, port); + vnet_put_frame_to_sw_interface (vnm, sw_if_index, f); + bif->per_thread_info[thread_index].frame[port] = 0; } vlib_increment_simple_counter (vnet_main.interface_main.sw_if_counters + VNET_INTERFACE_COUNTER_TX, thread_index, bif->sw_if_index, frame->n_vectors); + clib_spinlock_unlock_if_init (&bif->lockp); return frame->n_vectors; } +static walk_rc_t +bond_active_interface_switch_cb (vnet_main_t * vnm, u32 sw_if_index, + void *arg) +{ + bond_main_t *bm = &bond_main; + + send_ip4_garp (bm->vlib_main, sw_if_index); + send_ip6_na (bm->vlib_main, sw_if_index); + + return (WALK_CONTINUE); +} + +static uword +bond_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f) +{ + vnet_main_t *vnm = vnet_get_main (); + uword event_type, *event_data = 0; + + while (1) + { + u32 i; + u32 hw_if_index; + + vlib_process_wait_for_event (vm); + event_type = vlib_process_get_events (vm, &event_data); + ASSERT (event_type == BOND_SEND_GARP_NA); + for (i = 0; i < vec_len (event_data); i++) + { + hw_if_index = event_data[i]; + /* walk hw interface to process all subinterfaces */ + vnet_hw_interface_walk_sw (vnm, hw_if_index, + bond_active_interface_switch_cb, 0); + } + vec_reset_length (event_data); + } + return 0; +} + +/* *INDENT-OFF* */ +VLIB_REGISTER_NODE (bond_process_node) = { + .function = bond_process, + .type = VLIB_NODE_TYPE_PROCESS, + .name = "bond-process", +}; +/* *INDENT-ON* */ + /* *INDENT-OFF* */ VNET_DEVICE_CLASS (bond_dev_class) = { .name = "bond", @@ -593,6 +755,7 @@ VNET_DEVICE_CLASS (bond_dev_class) = { .tx_function_n_errors = BOND_TX_N_ERROR, .tx_function_error_strings = bond_tx_error_strings, .format_device_name = format_bond_interface_name, + .set_l2_mode_function = bond_set_l2_mode_function, .admin_up_down_function = bond_interface_admin_up_down, .subif_add_del_function = bond_subif_add_del_function, .format_tx_trace = format_bond_tx_trace,