[dpdk-stable] patch 'net/bnxt: fix bumping of L2 filter reference count' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/13/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From c07f50f9824531ddc8912a43cdd286d31bb3e084 Mon Sep 17 00:00:00 2001
From: Somnath Kotur <somnath.kotur at broadcom.com>
Date: Tue, 28 Jan 2020 12:59:16 +0530
Subject: [PATCH] net/bnxt: fix bumping of L2 filter reference count

[ upstream commit 9073198e42d23d00d807798e02227f7bc50a0046 ]

Now that the L2 filter reference count is bumped up in all cases
including bnxt_alloc_filter() which is issued in init, just move this
ref count bump inside the routine issuing the HWRM cmd so that it is
bumped up only if the cmd is successful.

Fixes: 5c1171c97216 ("net/bnxt: refactor filter/flow")

Reviewed-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Signed-off-by: Somnath Kotur <somnath.kotur at broadcom.com>
Signed-off-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_filter.c | 3 +--
 drivers/net/bnxt/bnxt_flow.c   | 1 -
 drivers/net/bnxt/bnxt_hwrm.c   | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c
index 2f890779d2..622a9bb417 100644
--- a/drivers/net/bnxt/bnxt_filter.c
+++ b/drivers/net/bnxt/bnxt_filter.c
@@ -39,8 +39,7 @@ struct bnxt_filter_info *bnxt_alloc_filter(struct bnxt *bp)
 			HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR_MASK;
 	memcpy(filter->l2_addr, bp->mac_addr, RTE_ETHER_ADDR_LEN);
 	memset(filter->l2_addr_mask, 0xff, RTE_ETHER_ADDR_LEN);
-	/* bump up the reference count of filter */
-	filter->l2_ref_cnt++;
+
 	return filter;
 }
 
diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index c11c0c969d..60c390448a 100644
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -867,7 +867,6 @@ bnxt_create_l2_filter(struct bnxt *bp, struct bnxt_filter_info *nf,
 		bnxt_free_filter(bp, filter1);
 		return NULL;
 	}
-	filter1->l2_ref_cnt++;
 	return filter1;
 }
 
diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
index 2becf0fbe6..6309a61c06 100644
--- a/drivers/net/bnxt/bnxt_hwrm.c
+++ b/drivers/net/bnxt/bnxt_hwrm.c
@@ -487,6 +487,8 @@ int bnxt_hwrm_set_l2_filter(struct bnxt *bp,
 	filter->fw_l2_filter_id = rte_le_to_cpu_64(resp->l2_filter_id);
 	HWRM_UNLOCK();
 
+	filter->l2_ref_cnt++;
+
 	return rc;
 }
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-11 11:17:44.186682980 +0000
+++ 0160-net-bnxt-fix-bumping-of-L2-filter-reference-count.patch	2020-02-11 11:17:38.764008153 +0000
@@ -1,15 +1,16 @@
-From 9073198e42d23d00d807798e02227f7bc50a0046 Mon Sep 17 00:00:00 2001
+From c07f50f9824531ddc8912a43cdd286d31bb3e084 Mon Sep 17 00:00:00 2001
 From: Somnath Kotur <somnath.kotur at broadcom.com>
 Date: Tue, 28 Jan 2020 12:59:16 +0530
 Subject: [PATCH] net/bnxt: fix bumping of L2 filter reference count
 
+[ upstream commit 9073198e42d23d00d807798e02227f7bc50a0046 ]
+
 Now that the L2 filter reference count is bumped up in all cases
 including bnxt_alloc_filter() which is issued in init, just move this
 ref count bump inside the routine issuing the HWRM cmd so that it is
 bumped up only if the cmd is successful.
 
 Fixes: 5c1171c97216 ("net/bnxt: refactor filter/flow")
-Cc: stable at dpdk.org
 
 Reviewed-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Signed-off-by: Somnath Kotur <somnath.kotur at broadcom.com>
@@ -21,7 +22,7 @@
  3 files changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c
-index e2184334f7..a1463a0e2f 100644
+index 2f890779d2..622a9bb417 100644
 --- a/drivers/net/bnxt/bnxt_filter.c
 +++ b/drivers/net/bnxt/bnxt_filter.c
 @@ -39,8 +39,7 @@ struct bnxt_filter_info *bnxt_alloc_filter(struct bnxt *bp)
@@ -35,7 +36,7 @@
  }
  
 diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
-index 5564c53637..4b3b597956 100644
+index c11c0c969d..60c390448a 100644
 --- a/drivers/net/bnxt/bnxt_flow.c
 +++ b/drivers/net/bnxt/bnxt_flow.c
 @@ -867,7 +867,6 @@ bnxt_create_l2_filter(struct bnxt *bp, struct bnxt_filter_info *nf,
@@ -47,11 +48,11 @@
  }
  
 diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c
-index 3b013396ba..460cc48942 100644
+index 2becf0fbe6..6309a61c06 100644
 --- a/drivers/net/bnxt/bnxt_hwrm.c
 +++ b/drivers/net/bnxt/bnxt_hwrm.c
-@@ -488,6 +488,8 @@ int bnxt_hwrm_set_l2_filter(struct bnxt *bp,
- 	filter->flow_id = rte_le_to_cpu_32(resp->flow_id);
+@@ -487,6 +487,8 @@ int bnxt_hwrm_set_l2_filter(struct bnxt *bp,
+ 	filter->fw_l2_filter_id = rte_le_to_cpu_64(resp->l2_filter_id);
  	HWRM_UNLOCK();
  
 +	filter->l2_ref_cnt++;