[dpdk-stable] patch 'net/mlx5: fix shared counter allocation logic' has been queued to LTS release 18.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.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/07/19. 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.

Kevin Traynor

---
>From b432ddcabd6eaf94b6572e1487f77dc244734ac2 Mon Sep 17 00:00:00 2001
From: Moti Haimovsky <motih at mellanox.com>
Date: Thu, 3 Jan 2019 15:06:36 +0000
Subject: [PATCH] net/mlx5: fix shared counter allocation logic

[ upstream commit 5f09e80cf8b248348cc635e518dfcab3126f1ca1 ]

This commit fixes the logic for searching and allocating a shared
counter in mlx5_flow_verbs.
Now only the shared counters in the counters list are checked for
a match and not all the counters as before.

Fixes: 84c406e74524 ("net/mlx5: add flow translate function")

Signed-off-by: Moti Haimovsky <motih at mellanox.com>
Acked-by: Shahaf Shuler <shahafs at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow_verbs.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_flow_verbs.c b/drivers/net/mlx5/mlx5_flow_verbs.c
index 81ec59d78..409e1cd0c 100644
--- a/drivers/net/mlx5/mlx5_flow_verbs.c
+++ b/drivers/net/mlx5/mlx5_flow_verbs.c
@@ -122,11 +122,11 @@ flow_verbs_counter_new(struct rte_eth_dev *dev, uint32_t shared, uint32_t id)
 	int ret;
 
-	LIST_FOREACH(cnt, &priv->flow_counters, next) {
-		if (!cnt->shared || cnt->shared != shared)
-			continue;
-		if (cnt->id != id)
-			continue;
-		cnt->ref_cnt++;
-		return cnt;
+	if (shared) {
+		LIST_FOREACH(cnt, &priv->flow_counters, next) {
+			if (cnt->shared && cnt->id == id) {
+				cnt->ref_cnt++;
+				return cnt;
+			}
+		}
 	}
 	cnt = rte_calloc(__func__, 1, sizeof(*cnt), 0);
-- 
2.19.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-01-31 15:44:06.286131952 +0000
+++ 0023-net-mlx5-fix-shared-counter-allocation-logic.patch	2019-01-31 15:44:05.000000000 +0000
@@ -1,15 +1,16 @@
-From 5f09e80cf8b248348cc635e518dfcab3126f1ca1 Mon Sep 17 00:00:00 2001
+From b432ddcabd6eaf94b6572e1487f77dc244734ac2 Mon Sep 17 00:00:00 2001
 From: Moti Haimovsky <motih at mellanox.com>
 Date: Thu, 3 Jan 2019 15:06:36 +0000
 Subject: [PATCH] net/mlx5: fix shared counter allocation logic
 
+[ upstream commit 5f09e80cf8b248348cc635e518dfcab3126f1ca1 ]
+
 This commit fixes the logic for searching and allocating a shared
 counter in mlx5_flow_verbs.
 Now only the shared counters in the counters list are checked for
 a match and not all the counters as before.
 
 Fixes: 84c406e74524 ("net/mlx5: add flow translate function")
-Cc: stable at dpdk.org
 
 Signed-off-by: Moti Haimovsky <motih at mellanox.com>
 Acked-by: Shahaf Shuler <shahafs at mellanox.com>