[dpdk-stable] patch 'net/bnxt: set flow error when free filter not available' has been queued to stable release 19.11.10

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.10

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/12/21. 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.

Queued patches are on a temporary branch at:
https://github.com/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/efb741b14dcda254455bd82fe0a4b897725f5ad6

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From efb741b14dcda254455bd82fe0a4b897725f5ad6 Mon Sep 17 00:00:00 2001
From: Kalesh AP <kalesh-anakkur.purayil at broadcom.com>
Date: Mon, 31 May 2021 12:56:37 +0530
Subject: [PATCH] net/bnxt: set flow error when free filter not available

[ upstream commit 94df7953ac6599c2887b859de19c541e5b5830d9 ]

In bnxt_flow_validate(), when bnxt_get_unused_filter() fails due to
no filter resources available, driver is not setting flow error using
"rte_flow_error_set".

Also, fixed the error code.

Fixes: 5ef3b79fdfe6 ("net/bnxt: support flow filter ops")

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

diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index 41be6b5d81..ec36c6787e 100644
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -1514,9 +1514,11 @@ bnxt_flow_validate(struct rte_eth_dev *dev,
 
 	filter = bnxt_get_unused_filter(bp);
 	if (filter == NULL) {
-		PMD_DRV_LOG(ERR, "Not enough resources for a new flow.\n");
+		rte_flow_error_set(error, ENOSPC,
+				   RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+				   "Not enough resources for a new flow");
 		bnxt_release_flow_lock(bp);
-		return -ENOMEM;
+		return -ENOSPC;
 	}
 
 	ret = bnxt_validate_and_parse_flow(dev, pattern, actions, attr,
-- 
2.32.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-08-10 15:11:13.248000594 +0200
+++ 0004-net-bnxt-set-flow-error-when-free-filter-not-availab.patch	2021-08-10 15:11:12.894637205 +0200
@@ -1 +1 @@
-From 94df7953ac6599c2887b859de19c541e5b5830d9 Mon Sep 17 00:00:00 2001
+From efb741b14dcda254455bd82fe0a4b897725f5ad6 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 94df7953ac6599c2887b859de19c541e5b5830d9 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +24 @@
-index 66012b8057..9b4780773a 100644
+index 41be6b5d81..ec36c6787e 100644
@@ -26 +27 @@
-@@ -1550,9 +1550,11 @@ bnxt_flow_validate(struct rte_eth_dev *dev,
+@@ -1514,9 +1514,11 @@ bnxt_flow_validate(struct rte_eth_dev *dev,