Commit ca6e1d0a authored by Patryk Małek's avatar Patryk Małek Committed by Jeff Kirsher

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: default avatarPatryk Małek <patryk.malek@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent f34e308b
...@@ -3939,19 +3939,19 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi, ...@@ -3939,19 +3939,19 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi,
input->flex_offset = userdef.flex_offset; 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 /* Add the input filter to the fdir_input_list, possibly replacing
* a previous filter. Do not free the input structure after adding it * a previous filter. Do not free the input structure after adding it
* to the list as this would cause a use-after-free bug. * to the list as this would cause a use-after-free bug.
*/ */
i40e_update_ethtool_fdir_entry(vsi, input, fsp->location, NULL); 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; return 0;
free_input: remove_sw_rule:
hlist_del(&input->fdir_node);
pf->fdir_pf_active_filters--;
kfree(input); kfree(input);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment