openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Patryk Małek 2017-12-27 07:32:31 -05:00 committed by Jeff Kirsher
parent f34e308b67
commit ca6e1d0abe
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/intel/i40e/i40e_ethtool.c
View File

@ -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;
} }