patch 'regex/mlx5: utilize all available queue pairs' has been queued to stable release 21.11.4

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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 03/20/23. 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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/e140c624f60fba5dbed361ab26ac87ac8ac108d7

Thanks.

Kevin

---
>From e140c624f60fba5dbed361ab26ac87ac8ac108d7 Mon Sep 17 00:00:00 2001
From: Gerry Gribbon <ggribbon at nvidia.com>
Date: Tue, 21 Feb 2023 07:47:28 +0000
Subject: [PATCH] regex/mlx5: utilize all available queue pairs

[ upstream commit 2fa696a2e93c57f22a6640987b5f4378fb5de899 ]

Fix overflow of free QP mask.
Regex used 64 QPs and used a bitmask to select a free QP for use.
The bitmask in use was only 32 bits so did not allow half of the QPs
to be utilised.
Upgraded to 64 bit mask and using ffsll now instead of ffs.

Fixes: 270032608503 ("regex/mlx5: refactor HW queue objects")

Signed-off-by: Gerry Gribbon <ggribbon at nvidia.com>
---
 drivers/regex/mlx5/mlx5_regex.h          |  2 +-
 drivers/regex/mlx5/mlx5_regex_fastpath.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/regex/mlx5/mlx5_regex.h b/drivers/regex/mlx5/mlx5_regex.h
index 89495301ac..831eb153eb 100644
--- a/drivers/regex/mlx5/mlx5_regex.h
+++ b/drivers/regex/mlx5/mlx5_regex.h
@@ -38,5 +38,5 @@ struct mlx5_regex_qp {
 	uint16_t nb_obj; /* Number of qp objects. */
 	struct mlx5_regex_cq cq; /* CQ struct. */
-	uint32_t free_qps;
+	uint64_t free_qps;
 	struct mlx5_regex_job *jobs;
 	struct ibv_mr *metadata;
diff --git a/drivers/regex/mlx5/mlx5_regex_fastpath.c b/drivers/regex/mlx5/mlx5_regex_fastpath.c
index 9a2db7e43f..4edd56d045 100644
--- a/drivers/regex/mlx5/mlx5_regex_fastpath.c
+++ b/drivers/regex/mlx5/mlx5_regex_fastpath.c
@@ -376,5 +376,5 @@ mlx5_regexdev_enqueue_gga(struct rte_regexdev *dev, uint16_t qp_id,
 	size_t hw_qpid, nb_left = nb_ops, nb_desc;
 
-	while ((hw_qpid = ffs(queue->free_qps))) {
+	while ((hw_qpid = ffsll(queue->free_qps))) {
 		hw_qpid--; /* ffs returns 1 for bit 0 */
 		qp_obj = &queue->qps[hw_qpid];
@@ -385,5 +385,5 @@ mlx5_regexdev_enqueue_gga(struct rte_regexdev *dev, uint16_t qp_id,
 				nb_desc = nb_left;
 			else
-				queue->free_qps &= ~(1 << hw_qpid);
+				queue->free_qps &= ~(1ULL << hw_qpid);
 			prep_regex_umr_wqe_set(priv, queue, qp_obj, ops,
 				nb_desc);
@@ -410,5 +410,5 @@ mlx5_regexdev_enqueue(struct rte_regexdev *dev, uint16_t qp_id,
 	size_t hw_qpid, job_id, i = 0;
 
-	while ((hw_qpid = ffs(queue->free_qps))) {
+	while ((hw_qpid = ffsll(queue->free_qps))) {
 		hw_qpid--; /* ffs returns 1 for bit 0 */
 		qp_obj = &queue->qps[hw_qpid];
@@ -424,5 +424,5 @@ mlx5_regexdev_enqueue(struct rte_regexdev *dev, uint16_t qp_id,
 			}
 		}
-		queue->free_qps &= ~(1 << hw_qpid);
+		queue->free_qps &= ~(1ULL << hw_qpid);
 		send_doorbell(priv, qp_obj);
 	}
@@ -557,5 +557,5 @@ mlx5_regexdev_dequeue(struct rte_regexdev *dev, uint16_t qp_id,
 		rte_wmb();
 		cq->cq_obj.db_rec[0] = rte_cpu_to_be_32(cq->ci);
-		queue->free_qps |= (1 << hw_qpid);
+		queue->free_qps |= (1ULL << hw_qpid);
 	}
 
@@ -596,5 +596,5 @@ setup_qps(struct mlx5_regex_priv *priv, struct mlx5_regex_qp *queue)
 			wqe += 64;
 		}
-		queue->free_qps |= 1 << hw_qpid;
+		queue->free_qps |= 1ULL << hw_qpid;
 	}
 }
-- 
2.39.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-03-15 14:30:21.372001865 +0000
+++ 0032-regex-mlx5-utilize-all-available-queue-pairs.patch	2023-03-15 14:30:20.597123742 +0000
@@ -1 +1 @@
-From 2fa696a2e93c57f22a6640987b5f4378fb5de899 Mon Sep 17 00:00:00 2001
+From e140c624f60fba5dbed361ab26ac87ac8ac108d7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 2fa696a2e93c57f22a6640987b5f4378fb5de899 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index b8554fd1cf..481f6fc59f 100644
+index 89495301ac..831eb153eb 100644
@@ -33 +34 @@
-index 143c7d7cdf..6c87afa923 100644
+index 9a2db7e43f..4edd56d045 100644
@@ -36,2 +37,2 @@
-@@ -418,5 +418,5 @@ mlx5_regexdev_enqueue_gga(struct rte_regexdev *dev, uint16_t qp_id,
- #endif
+@@ -376,5 +376,5 @@ mlx5_regexdev_enqueue_gga(struct rte_regexdev *dev, uint16_t qp_id,
+ 	size_t hw_qpid, nb_left = nb_ops, nb_desc;
@@ -43 +44 @@
-@@ -427,5 +427,5 @@ mlx5_regexdev_enqueue_gga(struct rte_regexdev *dev, uint16_t qp_id,
+@@ -385,5 +385,5 @@ mlx5_regexdev_enqueue_gga(struct rte_regexdev *dev, uint16_t qp_id,
@@ -50,2 +51,2 @@
-@@ -457,5 +457,5 @@ mlx5_regexdev_enqueue(struct rte_regexdev *dev, uint16_t qp_id,
- #endif
+@@ -410,5 +410,5 @@ mlx5_regexdev_enqueue(struct rte_regexdev *dev, uint16_t qp_id,
+ 	size_t hw_qpid, job_id, i = 0;
@@ -57 +58 @@
-@@ -471,5 +471,5 @@ mlx5_regexdev_enqueue(struct rte_regexdev *dev, uint16_t qp_id,
+@@ -424,5 +424,5 @@ mlx5_regexdev_enqueue(struct rte_regexdev *dev, uint16_t qp_id,
@@ -64 +65 @@
-@@ -604,5 +604,5 @@ mlx5_regexdev_dequeue(struct rte_regexdev *dev, uint16_t qp_id,
+@@ -557,5 +557,5 @@ mlx5_regexdev_dequeue(struct rte_regexdev *dev, uint16_t qp_id,
@@ -71 +72 @@
-@@ -643,5 +643,5 @@ setup_qps(struct mlx5_regex_priv *priv, struct mlx5_regex_qp *queue)
+@@ -596,5 +596,5 @@ setup_qps(struct mlx5_regex_priv *priv, struct mlx5_regex_qp *queue)