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: 1e0f9881ef79 ("ice: Flesh out implementation of support for SRIOV on bonded interface")
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Reviewed-by: Marcin Szycik <marcin.szycik@linux.intel.com>
Signed-off-by: Dave Ertman <david.m.ertman@intel.com>
Tested-by: Rinitha S <sx.rinitha@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/ice_lib.c b/drivers/net/ethernet/intel/ice/ice_lib.c
index 9ebbe1bff214e09f9f9e22f269b734cfb10b1bc3..98010354db155ec42d99cfb4620d9aea096b1aa6 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_lib.c
+++ b/drivers/net/ethernet/intel/ice/ice_lib.c
@@ -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;
 
-       vlan = ICE_VLAN(0, 0, 0);
-       err = vlan_ops->del_vlan(vsi, &vlan);
-       if (err && err != -EEXIST)
-               return 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;
 
-       vlan = ICE_VLAN(ETH_P_8021Q, 0, 0);
-       err = vlan_ops->del_vlan(vsi, &vlan);
-       if (err && err != -EEXIST)
-               return err;
+       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