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 AACD5A0093 for ; Thu, 10 Mar 2022 13:12:11 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A5D834113E; Thu, 10 Mar 2022 13:12:11 +0100 (CET) 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 737E14113F for ; Thu, 10 Mar 2022 13:12:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646914330; 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=eT4IREhtIMhhm8KvwuoCSIe36M0qzzESyMtgJb2DlTU=; b=hg4IBfqh5B4HiYCJQHHae72EqvDirSUFQzq70X14TCw0bhYG2SV/W7kI+bYAUBM/RgPTnH 1W+f+0MfjbMiSMVK0tjT0wGcI4xzwt1yBYNAJ4gCQAzQlHffg99U905YbBZQVCn08BRP2P YibO/rFtGm7iNzjC1sU9788wirgnQqQ= 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-90-9M5kumdgPo-DLMQtCX2o1Q-1; Thu, 10 Mar 2022 07:12:06 -0500 X-MC-Unique: 9M5kumdgPo-DLMQtCX2o1Q-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 228CD801AFE; Thu, 10 Mar 2022 12:12:05 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17F4E2D1F8; Thu, 10 Mar 2022 12:12:03 +0000 (UTC) From: Kevin Traynor To: Rongwei Liu Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix shared RSS destroy' has been queued to stable release 21.11.1 Date: Thu, 10 Mar 2022 12:11:14 +0000 Message-Id: <20220310121127.1324802-8-ktraynor@redhat.com> In-Reply-To: <20220310121127.1324802-1-ktraynor@redhat.com> References: <20220310121127.1324802-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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/eebfb74c5155c08ff2a0e1b9a01f76f62e3b7382 Thanks. Kevin --- >From eebfb74c5155c08ff2a0e1b9a01f76f62e3b7382 Mon Sep 17 00:00:00 2001 From: Rongwei Liu Date: Wed, 2 Mar 2022 13:19:38 +0200 Subject: [PATCH] net/mlx5: fix shared RSS destroy [ upstream commit e1786fd53d7e5631c9ffb9b2fba0fd402bc8cf74 ] When both shared and non-shared RSS actions are present in single flow rule shared RSS index is unset by mistake. For example: 1. flow indirect_action 0 create action_id 3 ingress action RSS ... 2. set sample_actions 0 mark id 43690 / queue index 0 / end 3. flow create 0 ingress group 107 pattern eth / sample ratio 2 index 0 / indirect 3 / end PMD translates the indirect action to a shared RSS description at first. In the split prefix flow, RSS->shared_RSS is unset when translating sample queue action, the subfix flow will treat the RSS as non-shared. Fixes: 8e61555657b2 ("net/mlx5: fix shared RSS and mark actions combination") Signed-off-by: Rongwei Liu Acked-by: Viacheslav Ovsiienko --- 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 7a5f17a8b7..a35fb3de4e 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -11103,4 +11103,5 @@ flow_dv_hrxq_prepare(struct rte_eth_dev *dev, struct mlx5_priv *priv = dev->data->dev_private; struct mlx5_flow_handle *dh = dev_flow->handle; + uint32_t shared_rss = rss_desc->shared_rss; struct mlx5_hrxq *hrxq; @@ -11117,4 +11118,5 @@ flow_dv_hrxq_prepare(struct rte_eth_dev *dev, hrxq = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_HRXQ], *hrxq_idx); + rss_desc->shared_rss = shared_rss; return hrxq; } @@ -18325,3 +18327,2 @@ const struct mlx5_flow_driver_ops mlx5_flow_dv_drv_ops = { #endif /* HAVE_IBV_FLOW_DV_SUPPORT */ - -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-10 12:05:31.704141933 +0000 +++ 0015-net-mlx5-fix-shared-RSS-destroy.patch 2022-03-10 12:05:31.278630800 +0000 @@ -1 +1 @@ -From e1786fd53d7e5631c9ffb9b2fba0fd402bc8cf74 Mon Sep 17 00:00:00 2001 +From eebfb74c5155c08ff2a0e1b9a01f76f62e3b7382 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e1786fd53d7e5631c9ffb9b2fba0fd402bc8cf74 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -25,2 +26,2 @@ - drivers/net/mlx5/mlx5_flow_dv.c | 2 ++ - 1 file changed, 2 insertions(+) + drivers/net/mlx5/mlx5_flow_dv.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) @@ -29 +30 @@ -index 7a7591144a..ebd0a427f3 100644 +index 7a5f17a8b7..a35fb3de4e 100644 @@ -32,2 +33,2 @@ -@@ -11207,4 +11207,5 @@ flow_dv_hrxq_prepare(struct rte_eth_dev *dev, - { +@@ -11103,4 +11103,5 @@ flow_dv_hrxq_prepare(struct rte_eth_dev *dev, + struct mlx5_priv *priv = dev->data->dev_private; @@ -38,3 +39,3 @@ -@@ -11218,4 +11219,5 @@ flow_dv_hrxq_prepare(struct rte_eth_dev *dev, - hrxq = mlx5_hrxq_get(dev, rss_desc); - *hrxq_idx = hrxq ? hrxq->idx : 0; +@@ -11117,4 +11118,5 @@ flow_dv_hrxq_prepare(struct rte_eth_dev *dev, + hrxq = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_HRXQ], + *hrxq_idx); @@ -43,0 +45,4 @@ +@@ -18325,3 +18327,2 @@ const struct mlx5_flow_driver_ops mlx5_flow_dv_drv_ops = { + + #endif /* HAVE_IBV_FLOW_DV_SUPPORT */ +-