diff mbox series

[27/31] net/bnxt: check filter type before clearing it

Message ID	20180619213058.12273-28-ajit.khaparde@broadcom.com (mailing list archive)
State	Changes Requested, archived
Delegated to:	Ferruh Yigit
Headers	From: Ajit Khaparde <ajit.khaparde@broadcom.com> To: dev@dpdk.org Cc: ferruh.yigit@intel.com Date: Tue, 19 Jun 2018 14:30:54 -0700 Message-Id: <20180619213058.12273-28-ajit.khaparde@broadcom.com> In-Reply-To: <20180619213058.12273-1-ajit.khaparde@broadcom.com> References: <20180619213058.12273-1-ajit.khaparde@broadcom.com> Subject: [dpdk-dev] [PATCH 27/31] net/bnxt: check filter type before clearing it Precedence: list Errors-To: dev-bounces@dpdk.org Sender: "dev" <dev-bounces@dpdk.org>
Series	bnxt patchset \| [00/31] bnxt patchset [01/31] net/bnxt: fix clear port stats [02/31] net/bnxt: add Tx batching support [03/31] net/bnxt: Rx processing optimization [04/31] net/bnxt: set min and max descriptor count for Tx and Rx rings [05/31] net/bnxt: fix dev close operation [06/31] net/bnxt: set ring coalesce parameters for Stratus NIC [07/31] net/bnxt: fix HW Tx checksum offload check [08/31] net/bnxt: add support for VF id 0xd800 [09/31] net/bnxt: fix rx/tx queue start/stop operations [10/31] net/bnxt: code cleanup style of bnxt cpr [11/31] net/bnxt: code cleanup style of bnxt rxr [12/31] net/bnxt: code cleanup style of rte pmd bnxt file [13/31] net/bnxt: code cleanup style of bnxt stats [14/31] net/bnxt: code cleanup style of bnxt vnic [15/31] net/bnxt: code cleanup style of bnxt txq [16/31] net/bnxt: code cleanup style of bnxt rxq [17/31] net/bnxt: code cleanup style of bnxt vnic [18/31] net/bnxt: code cleanup style of bnxt txr [19/31] net/bnxt: code cleanup style of bnxt ring [20/31] net/bnxt: code cleanup style of bnxt ethdev [21/31] net/bnxt: move function check zero bytes to bnxt util.h [22/31] net/bnxt: filter/flow refactoring [23/31] net/bnxt: check for invalid vnic id [24/31] net/bnxt: update HWRM API to v1.9.2.9 [25/31] net/bnxt: fix Tx with multiple mbuf [26/31] net/bnxt: Revert reset of L2 filter id in clear_ntuple_filter [27/31] net/bnxt: check filter type before clearing it [28/31] net/bnxt: fix set MTU [29/31] net/bnxt: fix incorrect IO address handling in Tx [30/31] net/bnxt: allocate RSS context only if RSS mode is enabled. [31/31] net/bnxt: fix to move a flow to a different queue

Checks

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

Commit Message

Ajit Khaparde June 19, 2018, 9:30 p.m. UTC

  In bnxt_free_filter_mem(), check the filter type and call the
appropriate HWRM command to clear the filter from HW.

Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
 drivers/net/bnxt/bnxt_filter.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

Comments

Ferruh Yigit June 26, 2018, 3:30 p.m. UTC | #1

On 6/19/2018 10:30 PM, Ajit Khaparde wrote:
> In bnxt_free_filter_mem(), check the filter type and call the
> appropriate HWRM command to clear the filter from HW.

Just to double check, is this check to fix an issue? If so do you want to
backport the fix into stable trees?

> 
> Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>

<...>

diff mbox series

Patch

diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c
index 31757d32c..1038941e8 100644
--- a/drivers/net/bnxt/bnxt_filter.c
+++ b/drivers/net/bnxt/bnxt_filter.c
@@ -117,16 +117,29 @@  void bnxt_free_filter_mem(struct bnxt *bp)
 	max_filters = bp->max_l2_ctx;
 	for (i = 0; i < max_filters; i++) {
 		filter = &bp->filter_info[i];
-		if (filter->fw_l2_filter_id != ((uint64_t)-1)) {
-			PMD_DRV_LOG(ERR, "HWRM filter is not freed??\n");
+		if (filter->fw_l2_filter_id != ((uint64_t)-1) &&
+		    filter->filter_type == HWRM_CFA_L2_FILTER) {
+			PMD_DRV_LOG(ERR, "L2 filter is not free\n");
 			/* Call HWRM to try to free filter again */
 			rc = bnxt_hwrm_clear_l2_filter(bp, filter);
 			if (rc)
 				PMD_DRV_LOG(ERR,
-				       "HWRM filter cannot be freed rc = %d\n",
-					rc);
+					    "Cannot free L2 filter: %d\n",
+					    rc);
 		}
 		filter->fw_l2_filter_id = UINT64_MAX;
+
+		if (filter->fw_ntuple_filter_id != ((uint64_t)-1) &&
+		    filter->filter_type == HWRM_CFA_NTUPLE_FILTER) {
+			PMD_DRV_LOG(ERR, "NTUPLE filter is not free\n");
+			/* Call HWRM to try to free filter again */
+			rc = bnxt_hwrm_clear_ntuple_filter(bp, filter);
+			if (rc)
+				PMD_DRV_LOG(ERR,
+					    "Cannot free NTUPLE filter: %d\n",
+					    rc);
+		}
+		filter->fw_ntuple_filter_id = UINT64_MAX;
 	}
 	STAILQ_INIT(&bp->free_filter_list);