i40e: delete filter after adding its replacement when converting

Orabug: 24568124

Fix a subtle issue with the code for converting VID=-1 filters into VID=0
filters when adding a new VLAN. Previously the code deleted the VID=-1
filter, and then added a new VID=0 filter. In the rare case that the
addition fails due to -ENOMEM, we end up completely deleting the filter
which prevents recovery if memory pressure subsides. While it is not
strictly an issue because it is likely that memory issues would result
in many other problems, we shouldn't delete the filter until after the
addition succeeds.

Change-ID: Icba07ddd04ecc6a3b27c2e29f2c1c8673d266826
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
(cherry picked from commit 756970255a58c0f5ff9f9c5bba6fb47c70804077)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 413ae82890e8d692b26568c4c8d0fb67c5f29040..7f7544fcc5b5c8cb03c9c18166d98459fdeff868 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -2471,7 +2471,6 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)
                                                 I40E_VLAN_ANY);
                        if (!del_f)
                                continue;
-                       __i40e_del_filter(vsi, del_f);
                        add_f = i40e_add_filter(vsi, f->macaddr, 0);
                        if (!add_f) {
                                dev_info(&vsi->back->pdev->dev,
@@ -2480,6 +2479,7 @@ int i40e_vsi_add_vlan(struct i40e_vsi *vsi, s16 vid)
                                spin_unlock_bh(&vsi->mac_filter_hash_lock);
                                return -ENOMEM;
                        }
+                       __i40e_del_filter(vsi, del_f);
                }
        }