patch 'net/mlx5: fix RSS RETA update' has been queued to stable release 19.11.11

[christian.ehrhardt at canonical.com]

Hi,

FYI, your patch has been queued to stable release 19.11.11

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/2fb2e78780789ca313ee313a4e036e71477c331e

Thanks.

Christian Ehrhardt <christian.ehrhardt at canonical.com>

---
>From 2fb2e78780789ca313ee313a4e036e71477c331e Mon Sep 17 00:00:00 2001
From: Maxime Coquelin <maxime.coquelin at redhat.com>
Date: Wed, 27 Oct 2021 16:22:12 +0200
Subject: [PATCH] net/mlx5: fix RSS RETA update

[ upstream commit 5aeb7fab59fef7b9cb01ec58ef32d1068923b6d3 ]

This patch fixes RETA updating for entries above 64.
Without that, these entries are never updated as
calculated mask value will always be 0.

Fixes: 634efbc2c8c0 ("mlx5: support RETA query and update")

Signed-off-by: Maxime Coquelin <maxime.coquelin at redhat.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5_rss.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c
index 170005a7af..a0daafe81d 100644
--- a/drivers/net/mlx5/mlx5_rss.c
+++ b/drivers/net/mlx5/mlx5_rss.c
@@ -216,7 +216,7 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev,
 	for (idx = 0, i = 0; (i != reta_size); ++i) {
 		idx = i / RTE_RETA_GROUP_SIZE;
 		pos = i % RTE_RETA_GROUP_SIZE;
-		if (((reta_conf[idx].mask >> i) & 0x1) == 0)
+		if (((reta_conf[idx].mask >> pos) & 0x1) == 0)
 			continue;
 		assert(reta_conf[idx].reta[pos] < priv->rxqs_n);
 		(*priv->reta_idx)[i] = reta_conf[idx].reta[pos];
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-30 16:50:12.359929813 +0100
+++ 0113-net-mlx5-fix-RSS-RETA-update.patch	2021-11-30 16:50:05.926874528 +0100
@@ -1 +1 @@
-From 5aeb7fab59fef7b9cb01ec58ef32d1068923b6d3 Mon Sep 17 00:00:00 2001
+From 2fb2e78780789ca313ee313a4e036e71477c331e Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5aeb7fab59fef7b9cb01ec58ef32d1068923b6d3 ]
+
@@ -11 +12,0 @@
-Cc: stable at dpdk.org
@@ -20 +21 @@
-index a4f690039e..a04e22398d 100644
+index 170005a7af..a0daafe81d 100644
@@ -23 +24 @@
-@@ -211,7 +211,7 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev,
+@@ -216,7 +216,7 @@ mlx5_dev_rss_reta_update(struct rte_eth_dev *dev,
@@ -25,2 +26,2 @@
- 		idx = i / RTE_ETH_RETA_GROUP_SIZE;
- 		pos = i % RTE_ETH_RETA_GROUP_SIZE;
+ 		idx = i / RTE_RETA_GROUP_SIZE;
+ 		pos = i % RTE_RETA_GROUP_SIZE;
@@ -30 +31 @@
- 		MLX5_ASSERT(reta_conf[idx].reta[pos] < priv->rxqs_n);
+ 		assert(reta_conf[idx].reta[pos] < priv->rxqs_n);