[dpdk-stable] patch 'net/bnxt: fix dynamic VNIC count' has been queued to stable release 20.11.2

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.11.2

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

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/85b0241b6b9262f9a2f68a9da0b3c52fe6afb73f

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 85b0241b6b9262f9a2f68a9da0b3c52fe6afb73f Mon Sep 17 00:00:00 2001
From: Lance Richardson <lance.richardson at broadcom.com>
Date: Wed, 28 Apr 2021 18:03:44 -0400
Subject: [PATCH] net/bnxt: fix dynamic VNIC count
Cc: Luca Boccassi <bluca at debian.org>

[ upstream commit a0c2315a2a5f0a83d5d77ec745ac1de04a1e962b ]

Ensure that the current count of in-use VNICs is decremented
when a VNIC is freed. Don't attempt VNIC allocation when the
maximum supported number of VNICs is currently allocated.

Fixes: 49d0709b257f ("net/bnxt: delete and flush L2 filters cleanly")
Fixes: d24610f7bfda ("net/bnxt: allow flow creation when RSS is enabled")

Signed-off-by: Lance Richardson <lance.richardson at broadcom.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
Reported-by: Stephen Hemminger <sthemmin at microsoft.com>
---
 drivers/net/bnxt/bnxt.h      | 2 +-
 drivers/net/bnxt/bnxt_flow.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h
index 600154f654..0fb195b656 100644
--- a/drivers/net/bnxt/bnxt.h
+++ b/drivers/net/bnxt/bnxt.h
@@ -705,7 +705,7 @@ struct bnxt {
 	uint32_t		max_ring_grps;
 	struct bnxt_ring_grp_info	*grp_info;
 
-	unsigned int		nr_vnics;
+	uint16_t			nr_vnics;
 
 #define BNXT_GET_DEFAULT_VNIC(bp)	(&(bp)->vnic_info[0])
 	struct bnxt_vnic_info	*vnic_info;
diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c
index b8020d9e98..11034b6719 100644
--- a/drivers/net/bnxt/bnxt_flow.c
+++ b/drivers/net/bnxt/bnxt_flow.c
@@ -925,6 +925,9 @@ static int bnxt_vnic_prep(struct bnxt *bp, struct bnxt_vnic_info *vnic)
 	uint64_t rx_offloads = dev_conf->rxmode.offloads;
 	int rc;
 
+	if (bp->nr_vnics > bp->max_vnics - 1)
+		return -ENOMEM;
+
 	rc = bnxt_vnic_grp_alloc(bp, vnic);
 	if (rc)
 		goto ret;
@@ -1543,6 +1546,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev,
 			bnxt_hwrm_vnic_ctx_free(bp, vnic);
 			bnxt_hwrm_vnic_free(bp, vnic);
 			vnic->rx_queue_cnt = 0;
+			bp->nr_vnics--;
 			PMD_DRV_LOG(DEBUG, "Free VNIC\n");
 		}
 	}
@@ -2001,6 +2005,7 @@ done:
 
 			bnxt_hwrm_vnic_free(bp, vnic);
 			vnic->rx_queue_cnt = 0;
+			bp->nr_vnics--;
 		}
 	} else {
 		rte_flow_error_set(error, -ret,
-- 
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-06-12 06:53:58.545261700 +0800
+++ 0075-net-bnxt-fix-dynamic-VNIC-count.patch	2021-06-12 06:53:56.350000000 +0800
@@ -1 +1 @@
-From a0c2315a2a5f0a83d5d77ec745ac1de04a1e962b Mon Sep 17 00:00:00 2001
+From 85b0241b6b9262f9a2f68a9da0b3c52fe6afb73f Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Luca Boccassi <bluca at debian.org>
+
+[ upstream commit a0c2315a2a5f0a83d5d77ec745ac1de04a1e962b ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -23 +25 @@
-index 72513fe66b..8558565617 100644
+index 600154f654..0fb195b656 100644
@@ -26 +28 @@
-@@ -720,7 +720,7 @@ struct bnxt {
+@@ -705,7 +705,7 @@ struct bnxt {
@@ -36 +38 @@
-index 844bf1520f..73fd24cd9a 100644
+index b8020d9e98..11034b6719 100644
@@ -49 +51 @@
-@@ -1550,6 +1553,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev,
+@@ -1543,6 +1546,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev,
@@ -57 +59 @@
-@@ -2011,6 +2015,7 @@ done:
+@@ -2001,6 +2005,7 @@ done: