diff mbox series

[7/7] net/ice/base: free flow profile entries

Message ID 20190115125658.15421-8-qi.z.zhang@intel.com (mailing list archive)
State Changes Requested, archived
Delegated to: Ferruh Yigit
Headers
Series net/ice: update share code |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Qi Zhang Jan. 15, 2019, 12:56 p.m. UTC 
  Free flow profile entries when free hw tables.

Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>
---
 drivers/net/ice/base/ice_flex_pipe.c | 38 ++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

Comments

Ferruh Yigit Jan. 16, 2019, 12:15 p.m. UTC | #1 
On 1/15/2019 12:56 PM, Qi Zhang wrote:
> Free flow profile entries when free hw tables.
> 
> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> Signed-off-by: Paul M Stillwell Jr <paul.m.stillwell.jr@intel.com>

<...>

>  /**
> + * ice_free_flow_profs - free flow profile entries
> + * @hw: pointer to the hardware structure
> + */
> +static void ice_free_flow_profs(struct ice_hw *hw)
> +{
> +	u8 i;
> +
> +	for (i = 0; i < ICE_BLK_COUNT; i++) {
> +		struct ice_flow_prof *p, *tmp;
> +
> +		if (!&hw->fl_profs[i])
> +			continue;
> +
> +		/* This call is being made as part of resource deallocation
> +		 * during unload. Lock acquire and release will not be
> +		 * necessary here.
> +		 */
> +		LIST_FOR_EACH_ENTRY_SAFE(p, tmp, &hw->fl_profs[i],
> +					 ice_flow_prof, l_entry) {
> +			struct ice_flow_entry *e, *t;
> +
> +			LIST_FOR_EACH_ENTRY_SAFE(e, t, &p->entries,
> +						 ice_flow_entry, l_entry)
> +				ice_flow_rem_entry(hw, ICE_FLOW_ENTRY_HNDL(e));

Same 32-bits build error here for ICE_FLOW_ENTRY_HNDL usage.
diff mbox series

Patch

diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c
index 0b8376d31..479b8bded 100644
--- a/drivers/net/ice/base/ice_flex_pipe.c
+++ b/drivers/net/ice/base/ice_flex_pipe.c
@@ -3034,6 +3034,42 @@  static void ice_fill_blk_tbls(struct ice_hw *hw, enum ice_block block_id)
 }
 
 /**
+ * ice_free_flow_profs - free flow profile entries
+ * @hw: pointer to the hardware structure
+ */
+static void ice_free_flow_profs(struct ice_hw *hw)
+{
+	u8 i;
+
+	for (i = 0; i < ICE_BLK_COUNT; i++) {
+		struct ice_flow_prof *p, *tmp;
+
+		if (!&hw->fl_profs[i])
+			continue;
+
+		/* This call is being made as part of resource deallocation
+		 * during unload. Lock acquire and release will not be
+		 * necessary here.
+		 */
+		LIST_FOR_EACH_ENTRY_SAFE(p, tmp, &hw->fl_profs[i],
+					 ice_flow_prof, l_entry) {
+			struct ice_flow_entry *e, *t;
+
+			LIST_FOR_EACH_ENTRY_SAFE(e, t, &p->entries,
+						 ice_flow_entry, l_entry)
+				ice_flow_rem_entry(hw, ICE_FLOW_ENTRY_HNDL(e));
+
+			LIST_DEL(&p->l_entry);
+			if (p->acts)
+				ice_free(hw, p->acts);
+			ice_free(hw, p);
+		}
+
+		ice_destroy_lock(&hw->fl_profs_locks[i]);
+	}
+}
+
+/**
  * ice_free_prof_map - frees the profile map
  * @hw: pointer to the hardware structure
  * @blk: the hw block which contains the profile map to be freed
@@ -3096,6 +3132,8 @@  void ice_free_hw_tbls(struct ice_hw *hw)
 	}
 
 	ice_memset(hw->blk, 0, sizeof(hw->blk), ICE_NONDMA_MEM);
+
+	ice_free_flow_profs(hw);
 }
 
 /**