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 012F9A0555 for ; Wed, 25 May 2022 18:30:18 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F0AB942B6D; Wed, 25 May 2022 18:30:17 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 136AD4281C for ; Wed, 25 May 2022 18:30:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496215; 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=Fun3RhonFT/epE2ViH44ig0FEDMNiZUekpppqAV7oZA=; b=AXM3lbn5f6LhOUH5f0esdgtTHp5dUAnSQRvEGiuREq2Vzq27c9fxIlQ8uVnL423iI4ZUnR WFRcF0ia5zltQtseVVzdJ8goKmX62K5JbQl1LepkBhuSYT6r27dwlIJ5yOpL4aOkz5LQT7 dHUyaP+txwH90r4CThmLiU5IBy17fqg= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-66-H5xijdzYO--b2clDfvbQYA-1; Wed, 25 May 2022 12:30:12 -0400 X-MC-Unique: H5xijdzYO--b2clDfvbQYA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F2E3D100FBC4; Wed, 25 May 2022 16:30:11 +0000 (UTC) Received: from rh.Home (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id E88382026D64; Wed, 25 May 2022 16:30:10 +0000 (UTC) From: Kevin Traynor To: Shun Hao Cc: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix no-green metering with RSS' has been queued to stable release 21.11.2 Date: Wed, 25 May 2022 17:28:42 +0100 Message-Id: <20220525162847.711753-50-ktraynor@redhat.com> In-Reply-To: <20220525162847.711753-1-ktraynor@redhat.com> References: <20220525162847.711753-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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-default=true 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.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 05/30/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/671e8fa0c83244427df0b92a62156b6e700ee68d Thanks. Kevin --- >From 671e8fa0c83244427df0b92a62156b6e700ee68d Mon Sep 17 00:00:00 2001 From: Shun Hao Date: Thu, 14 Apr 2022 10:55:20 +0300 Subject: [PATCH] net/mlx5: fix no-green metering with RSS [ upstream commit fc7211097d41957bd6e29d64fd42ce679b4147b8 ] When a meter with RSS action being used, there might be several sub-flows using different sub-policies in the flow splitting stage. If there's no green action, there's an error that will always use the same sub-policy for all sub-flows, some resources will be overwritten and cannot be released, leading assert during port close. This patch fixes this issue by checking both green and yellow queue index during getting a blank sub-policy, to avoid the incorrect resource overwrite. Fixes: b38a12272b3a ("net/mlx5: split meter color policy handling") Signed-off-by: Shun Hao Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 8a3d9b5b6f..b24c79b324 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -16991,5 +16991,6 @@ __flow_dv_meter_get_rss_sub_policy(struct rte_eth_dev *dev, } /* Create sub policy. */ - if (!mtr_policy->sub_policys[domain][0]->rix_hrxq[0]) { + if (!mtr_policy->sub_policys[domain][0]->rix_hrxq[RTE_COLOR_GREEN] && + !mtr_policy->sub_policys[domain][0]->rix_hrxq[RTE_COLOR_YELLOW]) { /* Reuse the first pre-allocated sub_policy. */ sub_policy = mtr_policy->sub_policys[domain][0]; -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-25 17:26:59.737243659 +0100 +++ 0050-net-mlx5-fix-no-green-metering-with-RSS.patch 2022-05-25 17:26:58.660828468 +0100 @@ -1 +1 @@ -From fc7211097d41957bd6e29d64fd42ce679b4147b8 Mon Sep 17 00:00:00 2001 +From 671e8fa0c83244427df0b92a62156b6e700ee68d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fc7211097d41957bd6e29d64fd42ce679b4147b8 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index cb5006bb11..f9c56204c4 100644 +index 8a3d9b5b6f..b24c79b324 100644 @@ -29 +30 @@ -@@ -17055,5 +17055,6 @@ __flow_dv_meter_get_rss_sub_policy(struct rte_eth_dev *dev, +@@ -16991,5 +16991,6 @@ __flow_dv_meter_get_rss_sub_policy(struct rte_eth_dev *dev,