[dpdk-stable] patch 'net/bnxt: fix flow error on filter creation' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/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 9e4213197fc9ad881ee5da16245464e3a0b84850 Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Thu, 9 Jul 2020 15:08:31 +0530
Subject: [PATCH] net/bnxt: fix flow error on filter creation

[ upstream commit 87aefef133e3d670be365efdaa620f36d97ee4bd ]

If set_em_filter/set_ntuple_filter cmds fails for some reason,
driver is not filling the "rte_flow_error" string buffer.
Same is the case when flow create fails due to an already
existing mark id for the new flow id created.
This leads to a crash in testpmd while trying to print the
error message.

Fixes: 5c1171c97216 ("net/bnxt: refactor filter/flow")
Fixes: 9db66782bd06 ("net/bnxt: fix supporting zero mark ID with RSS action")

Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
---
 drivers/net/bnxt/bnxt_flow.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index d901479ee..52d521d6e 100644
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -1715,12 +1715,24 @@ bnxt_flow_create(struct rte_eth_dev *dev,
 		filter->enables |=
 			HWRM_CFA_EM_FLOW_ALLOC_INPUT_ENABLES_L2_FILTER_ID;
 		ret = bnxt_hwrm_set_em_filter(bp, filter->dst_id, filter);
+		if (ret != 0) {
+			rte_flow_error_set(error, -ret,
+					   RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+					   "Failed to create EM filter");
+			goto free_filter;
+		}
 	}
 
 	if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER) {
 		filter->enables |=
 			HWRM_CFA_NTUPLE_FILTER_ALLOC_INPUT_ENABLES_L2_FILTER_ID;
 		ret = bnxt_hwrm_set_ntuple_filter(bp, filter->dst_id, filter);
+		if (ret != 0) {
+			rte_flow_error_set(error, -ret,
+					   RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+					   "Failed to create ntuple filter");
+			goto free_filter;
+		}
 	}
 
 	vnic = find_matching_vnic(bp, filter);
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:54.196815269 +0100
+++ 0146-net-bnxt-fix-flow-error-on-filter-creation.patch	2020-07-24 12:53:48.495010335 +0100
@@ -1,8 +1,10 @@
-From 87aefef133e3d670be365efdaa620f36d97ee4bd Mon Sep 17 00:00:00 2001
+From 9e4213197fc9ad881ee5da16245464e3a0b84850 Mon Sep 17 00:00:00 2001
 From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Date: Thu, 9 Jul 2020 15:08:31 +0530
 Subject: [PATCH] net/bnxt: fix flow error on filter creation
 
+[ upstream commit 87aefef133e3d670be365efdaa620f36d97ee4bd ]
+
 If set_em_filter/set_ntuple_filter cmds fails for some reason,
 driver is not filling the "rte_flow_error" string buffer.
 Same is the case when flow create fails due to an already
@@ -12,19 +14,18 @@
 
 Fixes: 5c1171c97216 ("net/bnxt: refactor filter/flow")
 Fixes: 9db66782bd06 ("net/bnxt: fix supporting zero mark ID with RSS action")
-Cc: stable at dpdk.org
 
 Signed-off-by: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
 Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
 ---
- drivers/net/bnxt/bnxt_flow.c | 20 ++++++++++++++++----
- 1 file changed, 16 insertions(+), 4 deletions(-)
+ drivers/net/bnxt/bnxt_flow.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
 
 diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
-index 19bc66a5a..499dcdf6b 100644
+index d901479ee..52d521d6e 100644
 --- a/drivers/net/bnxt/bnxt_flow.c
 +++ b/drivers/net/bnxt/bnxt_flow.c
-@@ -1786,12 +1786,24 @@ bnxt_flow_create(struct rte_eth_dev *dev,
+@@ -1715,12 +1715,24 @@ bnxt_flow_create(struct rte_eth_dev *dev,
  		filter->enables |=
  			HWRM_CFA_EM_FLOW_ALLOC_INPUT_ENABLES_L2_FILTER_ID;
  		ret = bnxt_hwrm_set_em_filter(bp, filter->dst_id, filter);
@@ -49,21 +50,6 @@
  	}
  
  	vnic = find_matching_vnic(bp, filter);
-@@ -1817,10 +1829,10 @@ done:
- 			 */
- 			flow_id = filter->flow_id & BNXT_FLOW_ID_MASK;
- 			if (bp->mark_table[flow_id].valid) {
--				PMD_DRV_LOG(ERR,
--					    "Entry for Mark id 0x%x occupied"
--					    " flow id 0x%x\n",
--					    filter->mark, filter->flow_id);
-+				rte_flow_error_set(error, EEXIST,
-+						   RTE_FLOW_ERROR_TYPE_HANDLE,
-+						   NULL,
-+						   "Flow with mark id exists");
- 				goto free_filter;
- 			}
- 			bp->mark_table[flow_id].valid = true;
 -- 
 2.20.1