From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D09BEA00C2 for ; Tue, 8 Mar 2022 15:16:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CA61740E78; Tue, 8 Mar 2022 15:16:02 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 2ACA640DDB for ; Tue, 8 Mar 2022 15:16:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748960; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=H161Ry0B73VhFRhrFtY0tkvnIAtO5pABOT0xF1ZVo/s=; b=R9yYxpSbbD/7/PAc0u27UzNOziuCsDlLklb+su3njyuuHuJM4GDRGsdBLeoudJmdu6cbTa nUaJWci++z+MJSrCEcMMzwHRsVBjpCKyxXQuiry2eOMKDqdsYtB5LhY4hA5R7jbpUZfy+S 7DRy2QdC7TTgCkk4+JT3b4Pfd8CaEaY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-343-HpwnZ6tKNSe4V5suPKukeA-1; Tue, 08 Mar 2022 09:15:53 -0500 X-MC-Unique: HpwnZ6tKNSe4V5suPKukeA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A726A1854E2A; Tue, 8 Mar 2022 14:15:52 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8E08A84034; Tue, 8 Mar 2022 14:15:51 +0000 (UTC) From: Kevin Traynor To: Michael Baum Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix shared counter flag in flow validation' has been queued to stable release 21.11.1 Date: Tue, 8 Mar 2022 14:14:34 +0000 Message-Id: <20220308141500.286915-19-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.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 03/14/22. 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/4de91bc1a8a19ccdea3cce67dff939ab34cf0275 Thanks. Kevin --- >From 4de91bc1a8a19ccdea3cce67dff939ab34cf0275 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Mon, 28 Feb 2022 09:09:53 +0200 Subject: [PATCH] net/mlx5: fix shared counter flag in flow validation [ upstream commit 8f53c7cf2660a2a5d2a61fefe987491bce50edde ] The AGE action can be implemented by either counters or ASO mechanism. When user ask count action in the flow rule, AGE action is implemented by the same counter. However, if user ask indirect count action, it cannot be used for AGE. The flow_dv_validate() function has a flag named "shared_count" which indicates whether AGE action validate depends on ASO support or not. This flag is initialized to false and is updated if there is indirect count action in the action list. This flag is mistakenly set within the loop that reads the action list and in each iteration it is reinitialized to false, regardless of the existence of an indirect count action in the list. This patch moves the flag initialization out of the loop. Fixes: f3191849f2c2 ("net/mlx5: support flow count action handle") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 43d8db14ad..268673a265 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -6916,4 +6916,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, const struct rte_flow_item *port_id_item = NULL; bool def_policy = false; + bool shared_count = false; uint16_t udp_dport = 0; @@ -7286,5 +7287,4 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, for (; actions->type != RTE_FLOW_ACTION_TYPE_END; actions++) { int type = actions->type; - bool shared_count = false; if (!mlx5_flow_os_action_supported(type)) -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:28.906524884 +0000 +++ 0019-net-mlx5-fix-shared-counter-flag-in-flow-validation.patch 2022-03-08 13:55:28.443315017 +0000 @@ -1 +1 @@ -From 8f53c7cf2660a2a5d2a61fefe987491bce50edde Mon Sep 17 00:00:00 2001 +From 4de91bc1a8a19ccdea3cce67dff939ab34cf0275 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8f53c7cf2660a2a5d2a61fefe987491bce50edde ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index caee0f7c91..20e0af29c8 100644 +index 43d8db14ad..268673a265 100644 @@ -34 +35 @@ -@@ -6908,4 +6908,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -6916,4 +6916,5 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, @@ -40 +41 @@ -@@ -7285,5 +7286,4 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -7286,5 +7287,4 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,