X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Fbonding%2Fcli.c;h=14c52f70b0beb67c4048b397303c80d77f2c2ec1;hb=609e121;hp=b2d66f9f1c868e62fd0b68e0bca7f3ecd1f39b87;hpb=9cd2d7a5a4fafadb65d772c48109d55d1e19d425;p=vpp.git diff --git a/src/vnet/bonding/cli.c b/src/vnet/bonding/cli.c index b2d66f9f1c8..14c52f70b0b 100644 --- a/src/vnet/bonding/cli.c +++ b/src/vnet/bonding/cli.c @@ -24,35 +24,58 @@ void bond_disable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif) { + bond_main_t *bm = &bond_main; bond_if_t *bif; int i; uword p; + u8 switching_active = 0; bif = bond_get_master_by_dev_instance (sif->bif_dev_instance); + clib_spinlock_lock_if_init (&bif->lockp); vec_foreach_index (i, bif->active_slaves) { p = *vec_elt_at_index (bif->active_slaves, i); if (p == sif->sw_if_index) { + /* Are we disabling the very 1st slave? */ + if (sif->sw_if_index == *vec_elt_at_index (bif->active_slaves, 0)) + switching_active = 1; + vec_del1 (bif->active_slaves, i); hash_unset (bif->active_slave_by_sw_if_index, sif->sw_if_index); + + /* We got a new slave just becoming active? */ + if ((vec_len (bif->active_slaves) >= 1) && + (bif->mode == BOND_MODE_ACTIVE_BACKUP) && switching_active) + vlib_process_signal_event (bm->vlib_main, bond_process_node.index, + BOND_SEND_GARP_NA, bif->hw_if_index); break; } } + clib_spinlock_unlock_if_init (&bif->lockp); } void bond_enable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif) { bond_if_t *bif; + bond_main_t *bm = &bond_main; bif = bond_get_master_by_dev_instance (sif->bif_dev_instance); + clib_spinlock_lock_if_init (&bif->lockp); if (!hash_get (bif->active_slave_by_sw_if_index, sif->sw_if_index)) { hash_set (bif->active_slave_by_sw_if_index, sif->sw_if_index, sif->sw_if_index); vec_add1 (bif->active_slaves, sif->sw_if_index); + + /* First slave becomes active? */ + if ((vec_len (bif->active_slaves) == 1) && + (bif->mode == BOND_MODE_ACTIVE_BACKUP)) + vlib_process_signal_event (bm->vlib_main, bond_process_node.index, + BOND_SEND_GARP_NA, bif->hw_if_index); } + clib_spinlock_unlock_if_init (&bif->lockp); } int @@ -68,7 +91,7 @@ bond_dump_ifs (bond_interface_details_t ** out_bondifs) /* *INDENT-OFF* */ pool_foreach (bif, bm->interfaces, vec_add2(r_bondifs, bondif, 1); - memset (bondif, 0, sizeof (*bondif)); + clib_memset (bondif, 0, sizeof (*bondif)); bondif->sw_if_index = bif->sw_if_index; hi = vnet_get_hw_interface (vnm, bif->hw_if_index); clib_memcpy(bondif->interface_name, hi->name, @@ -106,7 +129,7 @@ bond_dump_slave_ifs (slave_interface_details_t ** out_slaveifs, vec_foreach (sw_if_index, bif->slaves) { vec_add2 (r_slaveifs, slaveif, 1); - memset (slaveif, 0, sizeof (*slaveif)); + clib_memset (slaveif, 0, sizeof (*slaveif)); sif = bond_get_slave_by_sw_if_index (*sw_if_index); if (sif) { @@ -131,12 +154,14 @@ bond_delete_neighbor (vlib_main_t * vm, bond_if_t * bif, slave_if_t * sif) bond_main_t *bm = &bond_main; vnet_main_t *vnm = vnet_get_main (); int i; - vnet_hw_interface_t *hw; + vnet_hw_interface_t *sif_hw; + + sif_hw = vnet_get_sup_hw_interface (vnm, sif->sw_if_index); bif->port_number_bitmap = clib_bitmap_set (bif->port_number_bitmap, ntohs (sif->actor_admin.port_number) - 1, 0); - hash_unset (bm->neighbor_by_sw_if_index, sif->sw_if_index); + bm->slave_by_sw_if_index[sif->sw_if_index] = 0; vec_free (sif->last_marker_pkt); vec_free (sif->last_rx_pkt); vec_foreach_index (i, bif->slaves) @@ -151,15 +176,17 @@ bond_delete_neighbor (vlib_main_t * vm, bond_if_t * bif, slave_if_t * sif) bond_disable_collecting_distributing (vm, sif); + vnet_feature_enable_disable ("device-input", "bond-input", + sif_hw->hw_if_index, 0, 0, 0); + /* Put back the old mac */ - hw = vnet_get_sup_hw_interface (vnm, sif->sw_if_index); - vnet_hw_interface_change_mac_address (vnm, hw->hw_if_index, + vnet_hw_interface_change_mac_address (vnm, sif_hw->hw_if_index, sif->persistent_hw_address); - pool_put (bm->neighbors, sif); - if ((bif->mode == BOND_MODE_LACP) && bm->lacp_enable_disable) (*bm->lacp_enable_disable) (vm, bif, sif, 0); + + pool_put (bm->neighbors, sif); } int @@ -171,6 +198,8 @@ bond_delete_if (vlib_main_t * vm, u32 sw_if_index) slave_if_t *sif; vnet_hw_interface_t *hw; u32 *sif_sw_if_index; + u32 **s_list = 0; + u32 i; hw = vnet_get_sup_hw_interface (vnm, sw_if_index); if (hw == NULL || bond_dev_class.index != hw->dev_class_index) @@ -180,11 +209,20 @@ bond_delete_if (vlib_main_t * vm, u32 sw_if_index) vec_foreach (sif_sw_if_index, bif->slaves) { - sif = bond_get_slave_by_sw_if_index (*sif_sw_if_index); - if (sif) - bond_delete_neighbor (vm, bif, sif); + vec_add1 (s_list, sif_sw_if_index); } + for (i = 0; i < vec_len (s_list); i++) + { + sif_sw_if_index = s_list[i]; + sif = bond_get_slave_by_sw_if_index (*sif_sw_if_index); + if (sif) + bond_delete_neighbor (vm, bif, sif); + } + + if (s_list) + vec_free (s_list); + /* bring down the interface */ vnet_hw_interface_set_flags (vnm, bif->hw_if_index, 0); vnet_sw_interface_set_flags (vnm, bif->sw_if_index, 0); @@ -193,7 +231,7 @@ bond_delete_if (vlib_main_t * vm, u32 sw_if_index) clib_bitmap_free (bif->port_number_bitmap); hash_unset (bm->bond_by_sw_if_index, bif->sw_if_index); - memset (bif, 0, sizeof (*bif)); + clib_memset (bif, 0, sizeof (*bif)); pool_put (bm->interfaces, bif); return 0; @@ -226,7 +264,7 @@ bond_create_if (vlib_main_t * vm, bond_create_if_args_t * args) return; } pool_get (bm->interfaces, bif); - memset (bif, 0, sizeof (*bif)); + clib_memset (bif, 0, sizeof (*bif)); bif->dev_instance = bif - bm->interfaces; bif->lb = args->lb; bif->mode = args->mode; @@ -236,6 +274,8 @@ bond_create_if (vlib_main_t * vm, bond_create_if_args_t * args) bif->lb = BOND_LB_RR; else if (bif->mode == BOND_MODE_BROADCAST) bif->lb = BOND_LB_BC; + else if (bif->mode == BOND_MODE_ACTIVE_BACKUP) + bif->lb = BOND_LB_AB; bif->use_custom_mac = args->hw_addr_set; if (!args->hw_addr_set) @@ -265,6 +305,8 @@ bond_create_if (vlib_main_t * vm, bond_create_if_args_t * args) sw = vnet_get_hw_sw_interface (vnm, bif->hw_if_index); bif->sw_if_index = sw->sw_if_index; bif->group = bif->sw_if_index; + if (vlib_get_thread_main ()->n_vlib_mains > 1) + clib_spinlock_init (&bif->lockp); vnet_hw_interface_set_flags (vnm, bif->hw_if_index, VNET_HW_INTERFACE_FLAG_LINK_UP); @@ -379,8 +421,10 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args) bond_if_t *bif; slave_if_t *sif; vnet_interface_main_t *im = &vnm->interface_main; - vnet_hw_interface_t *hw, *hw2; + vnet_hw_interface_t *bif_hw, *sif_hw; vnet_sw_interface_t *sw; + u32 thread_index; + u32 sif_if_index; bif = bond_get_master_by_sw_if_index (args->group); if (!bif) @@ -396,8 +440,8 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args) args->error = clib_error_return (0, "interface was already enslaved"); return; } - hw = vnet_get_sup_hw_interface (vnm, args->slave); - if (hw->dev_class_index == bond_dev_class.index) + sif_hw = vnet_get_sup_hw_interface (vnm, args->slave); + if (sif_hw->dev_class_index == bond_dev_class.index) { args->rv = VNET_API_ERROR_INVALID_INTERFACE; args->error = @@ -405,8 +449,7 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args) return; } pool_get (bm->neighbors, sif); - memset (sif, 0, sizeof (*sif)); - clib_spinlock_init (&sif->lockp); + clib_memset (sif, 0, sizeof (*sif)); sw = pool_elt_at_index (im->sw_interfaces, args->slave); sif->port_enabled = sw->flags & VNET_SW_INTERFACE_FLAG_ADMIN_UP; sif->sw_if_index = sw->sw_if_index; @@ -423,16 +466,25 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args) else sif->ttl_in_seconds = LACP_SHORT_TIMOUT_TIME; - hash_set (bm->neighbor_by_sw_if_index, sif->sw_if_index, - sif - bm->neighbors); + vec_validate_aligned (bm->slave_by_sw_if_index, sif->sw_if_index, + CLIB_CACHE_LINE_BYTES); + /* + * sif - bm->neighbors may be 0 + * Left shift it by 1 bit to distinguish the valid entry that we actually + * store from the null entries + */ + bm->slave_by_sw_if_index[sif->sw_if_index] = + (uword) (((sif - bm->neighbors) << 1) | 1); vec_add1 (bif->slaves, sif->sw_if_index); - hw = vnet_get_sup_hw_interface (vnm, sif->sw_if_index); + sif_hw = vnet_get_sup_hw_interface (vnm, sif->sw_if_index); + /* Save the old mac */ - memcpy (sif->persistent_hw_address, hw->hw_address, 6); + memcpy (sif->persistent_hw_address, sif_hw->hw_address, 6); + bif_hw = vnet_get_sup_hw_interface (vnm, bif->sw_if_index); if (bif->use_custom_mac) { - vnet_hw_interface_change_mac_address (vnm, hw->hw_if_index, + vnet_hw_interface_change_mac_address (vnm, sif_hw->hw_if_index, bif->hw_address); } else @@ -440,19 +492,26 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args) // bond interface gets the mac address from the first slave if (vec_len (bif->slaves) == 1) { - memcpy (bif->hw_address, hw->hw_address, 6); - hw2 = vnet_get_sup_hw_interface (vnm, bif->sw_if_index); - vnet_hw_interface_change_mac_address (vnm, hw2->hw_if_index, - hw->hw_address); + memcpy (bif->hw_address, sif_hw->hw_address, 6); + vnet_hw_interface_change_mac_address (vnm, bif_hw->hw_if_index, + sif_hw->hw_address); } else { // subsequent slaves gets the mac address of the bond interface - vnet_hw_interface_change_mac_address (vnm, hw->hw_if_index, + vnet_hw_interface_change_mac_address (vnm, sif_hw->hw_if_index, bif->hw_address); } } + if (bif_hw->l2_if_count) + { + 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); + } + if ((bif->mode == BOND_MODE_LACP) && bm->lacp_enable_disable) { (*bm->lacp_enable_disable) (vm, bif, sif, 1); @@ -462,8 +521,22 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args) bond_enable_collecting_distributing (vm, sif); } + vec_foreach_index (thread_index, bm->per_thread_data) + { + bond_per_thread_data_t *ptd = vec_elt_at_index (bm->per_thread_data, + thread_index); + + vec_validate_aligned (ptd->per_port_queue, vec_len (bif->slaves) - 1, + CLIB_CACHE_LINE_BYTES); + + vec_foreach_index (sif_if_index, ptd->per_port_queue) + { + ptd->per_port_queue[sif_if_index].n_buffers = 0; + } + } + args->rv = vnet_feature_enable_disable ("device-input", "bond-input", - hw->hw_if_index, 1, 0, 0); + sif_hw->hw_if_index, 1, 0, 0); if (args->rv) { @@ -489,12 +562,10 @@ enslave_interface_command_fn (vlib_main_t * vm, unformat_input_t * input, args.group = ~0; while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "interface %U", + if (unformat (line_input, "%U %U", + unformat_vnet_sw_interface, vnm, &args.group, unformat_vnet_sw_interface, vnm, &args.slave)) ; - else if (unformat (line_input, "to %U", unformat_vnet_sw_interface, vnm, - &args.group)) - ; else if (unformat (line_input, "passive")) args.is_passive = 1; else if (unformat (line_input, "long-timeout")) @@ -513,7 +584,7 @@ enslave_interface_command_fn (vlib_main_t * vm, unformat_input_t * input, if (args.group == ~0) return clib_error_return (0, "Missing bond interface"); if (args.slave == ~0) - return clib_error_return (0, "please specify valid interface name"); + return clib_error_return (0, "please specify valid slave interface name"); bond_enslave (vm, &args); @@ -522,8 +593,9 @@ enslave_interface_command_fn (vlib_main_t * vm, unformat_input_t * input, /* *INDENT-OFF* */ VLIB_CLI_COMMAND (enslave_interface_command, static) = { - .path = "enslave", - .short_help = "enslave interface to [passive] [long-timeout]", + .path = "bond add", + .short_help = "bond add " + "[passive] [long-timeout]", .function = enslave_interface_command_fn, }; /* *INDENT-ON* */ @@ -560,7 +632,7 @@ detach_interface_command_fn (vlib_main_t * vm, unformat_input_t * input, args.slave = ~0; while (unformat_check_input (line_input) != UNFORMAT_END_OF_INPUT) { - if (unformat (line_input, "interface %U", + if (unformat (line_input, "%U", unformat_vnet_sw_interface, vnm, &args.slave)) ; else @@ -575,7 +647,7 @@ detach_interface_command_fn (vlib_main_t * vm, unformat_input_t * input, if (args.error) return args.error; if (args.slave == ~0) - return clib_error_return (0, "please specify valid interface name"); + return clib_error_return (0, "please specify valid slave interface name"); bond_detach_slave (vm, &args); @@ -584,8 +656,8 @@ detach_interface_command_fn (vlib_main_t * vm, unformat_input_t * input, /* *INDENT-OFF* */ VLIB_CLI_COMMAND (detach_interface_command, static) = { - .path = "detach", - .short_help = "detach interface ", + .path = "bond del", + .short_help = "bond del ", .function = detach_interface_command_fn, }; /* *INDENT-ON* */ @@ -596,14 +668,14 @@ show_bond (vlib_main_t * vm) bond_main_t *bm = &bond_main; bond_if_t *bif; - vlib_cli_output (vm, "%-16s %-12s %-12s %-13s %-14s %s", + vlib_cli_output (vm, "%-16s %-12s %-13s %-13s %-14s %s", "interface name", "sw_if_index", "mode", "load balance", "active slaves", "slaves"); /* *INDENT-OFF* */ pool_foreach (bif, bm->interfaces, ({ - vlib_cli_output (vm, "%-16U %-12d %-12U %-13U %-14u %u", + vlib_cli_output (vm, "%-16U %-12d %-13U %-13U %-14u %u", format_bond_interface_name, bif->dev_instance, bif->sw_if_index, format_bond_mode, bif->mode, format_bond_load_balance, bif->lb, @@ -690,7 +762,10 @@ bond_cli_init (vlib_main_t * vm) bm->vlib_main = vm; bm->vnet_main = vnet_get_main (); - bm->neighbor_by_sw_if_index = hash_create (0, sizeof (uword)); + vec_validate_aligned (bm->slave_by_sw_if_index, 1, CLIB_CACHE_LINE_BYTES); + vec_validate_aligned (bm->per_thread_data, + vlib_get_thread_main ()->n_vlib_mains - 1, + CLIB_CACHE_LINE_BYTES); return 0; }