renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 22:24:09 +08:00
Code

i40e: Fix a bug in the update logic for FDIR SB filter.

Browse Source 
The update filter logic was causing a kernel panic in the original code.
We need to compare the input set to decide whether or not to delete a
filter since we do not have a hash stored. This new design helps fix the issue.

Change-ID: I2462b108e58ca4833312804cda730b4660cc18c9
Signed-off-by: Anjali Singhai Jain <anjali.singhai@intel.com>
Signed-off-by: Catherine Sullivan <catherine.sullivan@intel.com>
Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Anjali Singhai Jain 2014-02-11 08:24:09 +00:00 committed by Jeff Kirsher
parent a486659709
commit 43fddb7576
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1356,6 +1356,24 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc)
return 0; return 0;
} }
/**
* i40e_match_fdir_input_set - Match a new filter against an existing one
* @rule: The filter already added
* @input: The new filter to comapre against
*
* Returns true if the two input set match
**/
static bool i40e_match_fdir_input_set(struct i40e_fdir_filter *rule,
struct i40e_fdir_filter *input)
{
if ((rule->dst_ip[0] != input->dst_ip[0]) ||
(rule->src_ip[0] != input->src_ip[0]) ||
(rule->dst_port != input->dst_port) ||
(rule->src_port != input->src_port))
return false;
return true;
}
/** /**
* i40e_update_ethtool_fdir_entry - Updates the fdir filter entry * i40e_update_ethtool_fdir_entry - Updates the fdir filter entry
* @vsi: Pointer to the targeted VSI * @vsi: Pointer to the targeted VSI
@ -1391,11 +1409,10 @@ static int i40e_update_ethtool_fdir_entry(struct i40e_vsi *vsi,
/* if there is an old rule occupying our place remove it */ /* if there is an old rule occupying our place remove it */
if (rule && (rule->fd_id == sw_idx)) { if (rule && (rule->fd_id == sw_idx)) {
if (!input || (rule->fd_id != input->fd_id)) { if (input && !i40e_match_fdir_input_set(rule, input))
cmd->fs.flow_type = rule->flow_type; err = i40e_add_del_fdir(vsi, rule, false);
err = i40e_add_del_fdir_ethtool(vsi, cmd, false); else if (!input)
} err = i40e_add_del_fdir(vsi, rule, false);
hlist_del(&rule->fdir_node); hlist_del(&rule->fdir_node);
kfree(rule); kfree(rule);
pf->fdir_pf_active_filters--; pf->fdir_pf_active_filters--;