From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 3E0CF1B455 for ; Thu, 31 Jan 2019 16:50:15 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9E77A81F12; Thu, 31 Jan 2019 15:50:14 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-200.ams2.redhat.com [10.36.117.200]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4FA925C23E; Thu, 31 Jan 2019 15:50:13 +0000 (UTC) From: Kevin Traynor To: Moti Haimovsky Cc: Shahaf Shuler , dpdk stable Date: Thu, 31 Jan 2019 15:48:31 +0000 Message-Id: <20190131154901.5383-23-ktraynor@redhat.com> In-Reply-To: <20190131154901.5383-1-ktraynor@redhat.com> References: <20190131154901.5383-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Thu, 31 Jan 2019 15:50:14 +0000 (UTC) Subject: [dpdk-stable] patch 'net/mlx5: fix shared counter allocation logic' has been queued to LTS release 18.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 31 Jan 2019 15:50:15 -0000 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 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 Acked-by: Shahaf Shuler --- 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 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@dpdk.org Signed-off-by: Moti Haimovsky Acked-by: Shahaf Shuler