Commit a9d45c22 authored by Dave Ertman's avatar Dave Ertman Committed by Tony Nguyen
Browse files

ice: Avoid detrimental cleanup for bond during interface stop



When the user issues an administrative down to an interface that is the
primary for an aggregate bond, the prune lists are being purged. This
breaks communication to the secondary interface, which shares a prune
list on the main switch block while bonded together.

For the primary interface of an aggregate, avoid deleting these prune
lists during stop, and since they are hardcoded to specific values for
the default vlan and QinQ vlans, the attempt to re-add them during the
up phase will quietly fail without any additional problem.

Fixes: 1e0f9881 ("ice: Flesh out implementation of support for SRIOV on bonded interface")
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Reviewed-by: default avatarMarcin Szycik <marcin.szycik@linux.intel.com>
Signed-off-by: default avatarDave Ertman <david.m.ertman@intel.com>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 8439016c
Loading
Loading
Loading
Loading
+17 −8
Original line number Diff line number Diff line
@@ -3809,22 +3809,31 @@ int ice_vsi_add_vlan_zero(struct ice_vsi *vsi)
int ice_vsi_del_vlan_zero(struct ice_vsi *vsi)
{
	struct ice_vsi_vlan_ops *vlan_ops = ice_get_compat_vsi_vlan_ops(vsi);
	struct ice_pf *pf = vsi->back;
	struct ice_vlan vlan;
	int err;

	if (pf->lag && pf->lag->primary) {
		dev_dbg(ice_pf_to_dev(pf), "Interface is primary in aggregate - not deleting prune list\n");
	} else {
		vlan = ICE_VLAN(0, 0, 0);
		err = vlan_ops->del_vlan(vsi, &vlan);
		if (err && err != -EEXIST)
			return err;
	}

	/* in SVM both VLAN 0 filters are identical */
	if (!ice_is_dvm_ena(&vsi->back->hw))
		return 0;

	if (pf->lag && pf->lag->primary) {
		dev_dbg(ice_pf_to_dev(pf), "Interface is primary in aggregate - not deleting QinQ prune list\n");
	} else {
		vlan = ICE_VLAN(ETH_P_8021Q, 0, 0);
		err = vlan_ops->del_vlan(vsi, &vlan);
		if (err && err != -EEXIST)
			return err;
	}

	/* when deleting the last VLAN filter, make sure to disable the VLAN
	 * promisc mode so the filter isn't left by accident