net/ice/base: fix minor issues
1. clean flow entry's action structure after remove it. 2. initialized priority when add a new flow entry 3. remove RSS configuration before deleting the flow profile. Fixes: aa1cd410fa64 ("net/ice/base: add flow module") Fixes: 51d04e4933e3 ("net/ice/base: add flexible pipeline module") Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com> Reviewed-by: Qiming Yang <qiming.yang@intel.com> Reviewed-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
This commit is contained in:
parent
65a9131f9e
commit
182dda1e88
drivers/net/ice/base
@ -2467,7 +2467,7 @@ ice_find_prof_id(struct ice_hw *hw, enum ice_block blk,
|
||||
for (i = 0; i < es->count; i++) {
|
||||
off = i * es->fvw;
|
||||
|
||||
if (memcmp(&es->t[off], fv, es->fvw * 2))
|
||||
if (memcmp(&es->t[off], fv, es->fvw * sizeof(*fv)))
|
||||
continue;
|
||||
|
||||
*prof_id = i;
|
||||
|
@ -910,8 +910,11 @@ ice_flow_rem_entry_sync(struct ice_hw *hw, struct ice_flow_entry *entry)
|
||||
if (entry->entry)
|
||||
ice_free(hw, entry->entry);
|
||||
|
||||
if (entry->acts)
|
||||
if (entry->acts) {
|
||||
ice_free(hw, entry->acts);
|
||||
entry->acts = NULL;
|
||||
entry->acts_cnt = 0;
|
||||
}
|
||||
|
||||
ice_free(hw, entry);
|
||||
|
||||
@ -1306,6 +1309,7 @@ ice_flow_add_entry(struct ice_hw *hw, enum ice_block blk, u64 prof_id,
|
||||
e->id = entry_id;
|
||||
e->vsi_handle = vsi_handle;
|
||||
e->prof = prof;
|
||||
e->priority = prio;
|
||||
|
||||
switch (blk) {
|
||||
case ICE_BLK_RSS:
|
||||
@ -1852,11 +1856,14 @@ ice_rem_rss_cfg_sync(struct ice_hw *hw, u16 vsi_handle, u64 hashed_flds,
|
||||
if (status)
|
||||
goto out;
|
||||
|
||||
/* Remove RSS configuration from VSI context before deleting
|
||||
* the flow profile.
|
||||
*/
|
||||
ice_rem_rss_cfg_vsi_ctx(hw, vsi_handle, prof);
|
||||
|
||||
if (!ice_is_any_bit_set(prof->vsis, ICE_MAX_VSI))
|
||||
status = ice_flow_rem_prof_sync(hw, blk, prof);
|
||||
|
||||
ice_rem_rss_cfg_vsi_ctx(hw, vsi_handle, prof);
|
||||
|
||||
out:
|
||||
ice_free(hw, segs);
|
||||
return status;
|
||||
|
Loading…
x
Reference in New Issue
Block a user