From 9f781d84b0943b03af2a9fd0b7c4cef721d1d4c6 Mon Sep 17 00:00:00 2001 From: Steven Date: Tue, 5 Jun 2018 11:09:32 -0700 Subject: bond: send gratuitous arp when the active slave went down in active-backup mode - Modify the API send_ip6_na and send_ip4_garp to take sw_if_index instead of vnet_hw_interface_t and add call to build_ethernet_rewrite to support subinterface/vlan - Add code to bonding driver to send an event to bond_process when the first interface becomes active or when the active interface is down - Create a bond_process to walk the interface and the corresponding subinterfaces to send garp/ip6_na when an event is received. - Minor cleanup in bonding/node.c Note: dpdk bonding driver does not send garp/ip6_na for subinterfaces. There is no attempt to fix it here. But the infra is now done and should be easy to add the support. Change-Id: If3ecc4cd0fb3051330f7fa11ca0dab3e18557ce1 Signed-off-by: Steven --- src/vnet/bonding/cli.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/vnet/bonding/cli.c') diff --git a/src/vnet/bonding/cli.c b/src/vnet/bonding/cli.c index 2799bb88b99..91c6e2cdb7d 100644 --- a/src/vnet/bonding/cli.c +++ b/src/vnet/bonding/cli.c @@ -24,9 +24,11 @@ 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); @@ -35,8 +37,18 @@ bond_disable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif) 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; } } @@ -47,6 +59,7 @@ 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); @@ -55,6 +68,12 @@ bond_enable_collecting_distributing (vlib_main_t * vm, slave_if_t * sif) 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); } -- cgit 1.2.3-korg