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 794E1A0093 for ; Wed, 9 Mar 2022 17:32:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 73F084013F; Wed, 9 Mar 2022 17:32:38 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id A45BC4013F for ; Wed, 9 Mar 2022 17:32:37 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id e24so3896539wrc.10 for ; Wed, 09 Mar 2022 08:32:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=sSxXKp7bohWg3dEABJRc6TdiLZYc0uJpByQGP4/EFdE=; b=fiQpW1uWJTXxaPdilid3rz/1+aQJbTr7Fz0wJ7LdXYxCYUlAVyocWMY9W0+fNIP9tY V1rpMbTSWLhSMz0BLPl/X5AH2g8CHwisD6jkKEhvfMg+OK+L9rGmaq+j6tOG4OI8x72A oCdPDA/pjv3v6Jhn0fRbSfuxqOyzgXmPkF6bE8ZFmjffPp0/++RRZgdjuF8H2tthasru //kezM6PD45lYH9JZGN4kn1UvBkBMapgPCiX4yOEOy1NA91/gyv33gu0qhpVomeTZSQ8 Ffk2+6bL83LBFyjr4enpI3GATHhMltv10oTouGDKiyt30NiKZPpvKAggh9l/VNHJajAx MEGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sSxXKp7bohWg3dEABJRc6TdiLZYc0uJpByQGP4/EFdE=; b=vFPKF+eNbtvKwTDIskjVH1uCiRYXIJIRzA+RSL8TF8XZvNfi0lgQ66GwBjxt0VBBXu wJaaH8JOzq79AZfRA6EEaeX1PkPcUX+CBk3bT92A/gkVtlJyJI2lzvwSV5lrmtM6Y8vz 53NC3peXuboPJtu14d60yipt/49shSXJQHfMbJBfYj9jvtrqi+89IxpoCU5avOhNjkAD P5HN7QBx00EIj/6Q1O9a6fgRsJlgNSbZtaop57XhnsREagpEB532nkn/cOhHiugz8gL2 2hokdsQAbAUOZnkvEi51HMbNaUtbjxVzSSecra03V+icOEfHMgSuWFvbtL92UyK44JSC gi8w== X-Gm-Message-State: AOAM533cnI0nkuL1tvUP89t5GZE6BYaAbm63hYgSChJ5cu5qXuE+kokL va3ZdC9KLxbMj15iCxc6LzM= X-Google-Smtp-Source: ABdhPJyfegtKrufb2urNulZUMqTcNJo0K2jnww6r5AKUh0V+MiNMpQfVEm71qKmLoRDdLYr1qDjR/w== X-Received: by 2002:adf:e448:0:b0:1ea:c7b6:782 with SMTP id t8-20020adfe448000000b001eac7b60782mr342455wrm.29.1646843557325; Wed, 09 Mar 2022 08:32:37 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id v4-20020a5d6784000000b001f1f7b814d7sm2064597wru.69.2022.03.09.08.32.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 08:32:36 -0800 (PST) From: luca.boccassi@gmail.com To: Rongwei Liu Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix shared RSS destroy' has been queued to stable release 20.11.5 Date: Wed, 9 Mar 2022 16:30:47 +0000 Message-Id: <20220309163053.245754-31-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309163053.245754-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220309163053.245754-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.5 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/11/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/c0278ca723280b26d80fd847800ebb12024b50e3 Thanks. Luca Boccassi --- >From c0278ca723280b26d80fd847800ebb12024b50e3 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index e2dc48f471..4e87f7a952 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -8741,6 +8741,7 @@ 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; MLX5_ASSERT(rss_desc->queue_num); @@ -8755,6 +8756,7 @@ flow_dv_hrxq_prepare(struct rte_eth_dev *dev, return NULL; hrxq = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_HRXQ], *hrxq_idx); + rss_desc->shared_rss = shared_rss; return hrxq; } -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 16:30:09.657243837 +0000 +++ 0031-net-mlx5-fix-shared-RSS-destroy.patch 2022-03-09 16:30:08.587026049 +0000 @@ -1 +1 @@ -From e1786fd53d7e5631c9ffb9b2fba0fd402bc8cf74 Mon Sep 17 00:00:00 2001 +From c0278ca723280b26d80fd847800ebb12024b50e3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e1786fd53d7e5631c9ffb9b2fba0fd402bc8cf74 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -29 +30 @@ -index 7a7591144a..ebd0a427f3 100644 +index e2dc48f471..4e87f7a952 100644 @@ -32,2 +33 @@ -@@ -11206,6 +11206,7 @@ flow_dv_hrxq_prepare(struct rte_eth_dev *dev, - uint32_t *hrxq_idx) +@@ -8741,6 +8741,7 @@ flow_dv_hrxq_prepare(struct rte_eth_dev *dev, @@ -34,0 +35 @@ + struct mlx5_priv *priv = dev->data->dev_private; @@ -40,4 +41,4 @@ -@@ -11217,6 +11218,7 @@ flow_dv_hrxq_prepare(struct rte_eth_dev *dev, - rss_desc->queue_num = 1; - hrxq = mlx5_hrxq_get(dev, rss_desc); - *hrxq_idx = hrxq ? hrxq->idx : 0; +@@ -8755,6 +8756,7 @@ flow_dv_hrxq_prepare(struct rte_eth_dev *dev, + return NULL; + hrxq = mlx5_ipool_get(priv->sh->ipool[MLX5_IPOOL_HRXQ], + *hrxq_idx);