i40e: Fix for adding multiple ethtool filters on the same location

This patch reorders i40e_add_del_fdir and i40e_update_ethtool_fdir_entry
calls so that we first remove an already existing filter (inside
i40e_update_ethtool_fdir_entry using i40e_add_del_fdir) and then
we add a new one with i40e_add_del_fdir.
After applying this patch, creating multiple identical filters (with
the same location) one after another doesn't revert their behavior
but behaves correctly.

Signed-off-by: Patryk Małek <patryk.malek@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
index 34173f821fd90c6dd5b63c0aead27391eada268c..2cbd564e437ac03cf3ccd073d08be157aa470b34 100644 (file)
--- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -3939,19 +3939,19 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi,
                input->flex_offset = userdef.flex_offset;
        }
 
-       ret = i40e_add_del_fdir(vsi, input, true);
-       if (ret)
-               goto free_input;
-
        /* Add the input filter to the fdir_input_list, possibly replacing
         * a previous filter. Do not free the input structure after adding it
         * to the list as this would cause a use-after-free bug.
         */
        i40e_update_ethtool_fdir_entry(vsi, input, fsp->location, NULL);
-
+       ret = i40e_add_del_fdir(vsi, input, true);
+       if (ret)
+               goto remove_sw_rule;
        return 0;
 
-free_input:
+remove_sw_rule:
+       hlist_del(&input->fdir_node);
+       pf->fdir_pf_active_filters--;
        kfree(input);
        return ret;
 }