[dpdk-stable] patch 'net/mlx: do not enforce RSS hash offload' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/11/20. 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/247f3abafd373c621aace1cf70bfa4504ab169c7

Thanks.

Luca Boccassi

---
>From 247f3abafd373c621aace1cf70bfa4504ab169c7 Mon Sep 17 00:00:00 2001
From: Alexander Kozyrev <akozyrev at mellanox.com>
Date: Tue, 27 Oct 2020 15:14:36 +0000
Subject: [PATCH] net/mlx: do not enforce RSS hash offload

[ upstream commit 6db1fde3891c493b9d352487fc8b6384cc6d06f3 ]

Rx RSS hash offload should be controlled by the user
and should not be enforced by RSS multi-queue Rx mode.

Fixes: 8b945a7f7dcb ("drivers/net: update Rx RSS hash offload capabilities")

Author: Andrew Rybchenko <arybchenko at solarflare.com>
Signed-off-by: Alexander Kozyrev <akozyrev at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx4/mlx4.c        | 3 ---
 drivers/net/mlx5/mlx5_ethdev.c | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c
index 9dda4ef330..8de265230d 100644
--- a/drivers/net/mlx4/mlx4.c
+++ b/drivers/net/mlx4/mlx4.c
@@ -252,9 +252,6 @@ mlx4_dev_configure(struct rte_eth_dev *dev)
 	struct rte_flow_error error;
 	int ret;
 
-	if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG)
-		dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH;
-
 	/* Prepare internal flow rules. */
 	ret = mlx4_flow_sync(priv, &error);
 	if (ret) {
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index ef332536ee..a6a091259e 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -405,9 +405,6 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
 		return -rte_errno;
 	}
 
-	if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG)
-		dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH;
-
 	memcpy(priv->rss_conf.rss_key,
 	       use_app_rss_key ?
 	       dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key :
-- 
2.27.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-11-09 18:40:13.507850592 +0000
+++ 0061-net-mlx-do-not-enforce-RSS-hash-offload.patch	2020-11-09 18:40:11.195312278 +0000
@@ -1 +1 @@
-From 6db1fde3891c493b9d352487fc8b6384cc6d06f3 Mon Sep 17 00:00:00 2001
+From 247f3abafd373c621aace1cf70bfa4504ab169c7 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 6db1fde3891c493b9d352487fc8b6384cc6d06f3 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -17,2 +18,2 @@
- drivers/net/mlx5/mlx5_ethdev.c | 2 --
- 2 files changed, 5 deletions(-)
+ drivers/net/mlx5/mlx5_ethdev.c | 3 ---
+ 2 files changed, 6 deletions(-)
@@ -21 +22 @@
-index 34c2bbb373..d5d8c96351 100644
+index 9dda4ef330..8de265230d 100644
@@ -24 +25 @@
-@@ -249,9 +249,6 @@ mlx4_dev_configure(struct rte_eth_dev *dev)
+@@ -252,9 +252,6 @@ mlx4_dev_configure(struct rte_eth_dev *dev)
@@ -35 +36 @@
-index 2cd05c5f80..ee97480dcb 100644
+index ef332536ee..a6a091259e 100644
@@ -38 +39 @@
-@@ -85,8 +85,6 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
+@@ -405,9 +405,6 @@ mlx5_dev_configure(struct rte_eth_dev *dev)
@@ -44,3 +45,4 @@
- 	if ((dev->data->dev_conf.txmode.offloads &
- 			DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP) &&
- 			rte_mbuf_dyn_tx_timestamp_register(NULL, NULL) != 0) {
+-
+ 	memcpy(priv->rss_conf.rss_key,
+ 	       use_app_rss_key ?
+ 	       dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key :