ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

l2: L2/L3 mode swicth cleanup and l2-patch fix

Browse Source 
Cleanup L2/L3 mode switch to not redirect to/from ethernet-input node
as it is no longer necessary.
L2 patch should use sw_if_index for device feature enable/disable.

Type: fix

Signed-off-by: John Lo <loj@cisco.com>
Change-Id: I0f24161d027b07c188fd1e05276146f94c075710
(cherry picked from commit f415a3b53a51b261d08cc3312c25f250d6bc1bd6)
This commit is contained in:
John Lo
2020-05-14 15:02:16 -04:00
committed by Andrew Yourtchenko
parent 3c0ea3ddea
commit 3736bbbbf4
4 changed files with 16 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/vnet/bonding/cli.c
View File

@ -675,12 +675,11 @@ bond_enslave (vlib_main_t * vm, bond_enslave_args_t * args)
}
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);
}
else
ethernet_set_flags (vnm, sif_hw->hw_if_index,
/*ETHERNET_INTERFACE_FLAG_DEFAULT_L3 */ 0);
if (bif->mode == BOND_MODE_LACP)
{

8
src/vnet/bonding/device.c
View File

@ -99,9 +99,6 @@ bond_set_l2_mode_function (vnet_main_t * vnm,
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);
}
}
else if ((bif_hw->l2_if_count == 0) && (l2_if_adjust == -1))
@ -110,9 +107,8 @@ bond_set_l2_mode_function (vnet_main_t * vnm,
vec_foreach (sw_if_index, bif->slaves)
{
sif_hw = vnet_get_sup_hw_interface (vnm, *sw_if_index);
/* Allow ip packets to go directly to ip4-input etc */
ethernet_set_rx_redirect (vnm, sif_hw, 0);
ethernet_set_flags (vnm, sif_hw->hw_if_index,
/*ETHERNET_INTERFACE_FLAG_DEFAULT_L3 */ 0);
}
}

22
src/vnet/l2/l2_input.c
View File

@ -800,9 +800,6 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /* */
config->feature_bitmap &=
~(L2INPUT_FEAT_LEARN | L2INPUT_FEAT_FWD | L2INPUT_FEAT_FLOOD);
shg = 0; /* not used in xconnect */
/* Insure all packets go to ethernet-input */
ethernet_set_rx_redirect (vnet_main, hi, 1);
}
/* set up split-horizon group and set output feature bit */
@ -827,25 +824,18 @@ set_int_l2_mode (vlib_main_t * vm, vnet_main_t * vnet_main, /* */
{
if ((hi->l2_if_count == 1) && (l2_if_adjust == 1))
{
/* Just added first L2 interface on this port */
/* Set promiscuous mode on the l2 interface */
/* Just added first L2 interface on this port
* Set promiscuous mode on the l2 interface */
ethernet_set_flags (vnet_main, hi->hw_if_index,
ETHERNET_INTERFACE_FLAG_ACCEPT_ALL);
/* ensure all packets go to ethernet-input */
ethernet_set_rx_redirect (vnet_main, hi, 1);
}
else if ((hi->l2_if_count == 0) && (l2_if_adjust == -1))
{
/* Just removed only L2 subinterface on this port */
/* Just removed only L2 subinterface on this port
* Disable promiscuous mode on the l2 interface */
ethernet_set_flags (vnet_main, hi->hw_if_index,
/*ETHERNET_INTERFACE_FLAG_DEFAULT_L3 */ 0);
/* Disable promiscuous mode on the l2 interface */
ethernet_set_flags (vnet_main, hi->hw_if_index, 0);
/* Allow ip packets to go directly to ip4-input etc */
ethernet_set_rx_redirect (vnet_main, hi, 0);
}
}

6
src/vnet/l2/l2_patch.c
View File

@ -270,15 +270,15 @@ vnet_l2_patch_add_del (u32 rx_sw_if_index, u32 tx_sw_if_index, int is_add)
ETHERNET_INTERFACE_FLAG_ACCEPT_ALL);
vnet_feature_enable_disable ("device-input", "l2-patch",
rxhi->hw_if_index, 1, 0, 0);
rxhi->sw_if_index, 1, 0, 0);
}
else
{
ethernet_set_flags (l2pm->vnet_main, rxhi->hw_if_index,
0 /* disable promiscuous mode */ );
/*ETHERNET_INTERFACE_FLAG_DEFAULT_L3 */ 0);
vnet_feature_enable_disable ("device-input", "l2-patch",
rxhi->hw_if_index, 0, 0, 0);
rxhi->sw_if_index, 0, 0, 0);
if (vec_len (l2pm->tx_next_by_rx_sw_if_index) > rx_sw_if_index)
{
l2pm->tx_next_by_rx_sw_if_index[rx_sw_if_index] = ~0;