[dpdk-stable] patch 'net/mlx5: fix RSS enablement' has been queued to stable release 19.11.3

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.3

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/21/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.

Thanks.

Luca Boccassi

---
>From 831152d0d94a8548aa804ece84acd2ac1529fc8b Mon Sep 17 00:00:00 2001
From: Xiaoyu Min <jackmin at mellanox.com>
Date: Wed, 29 Apr 2020 16:00:42 +0300
Subject: [PATCH] net/mlx5: fix RSS enablement

[ upstream commit 0afac6dcca44dea15f23e93851b6e52f014a98e4 ]

PMD create some default control rules with RSS action
if it's not isolated mode.

However whether default control rules need to do RSS or not should be
controlled by device configuration, the mq_mode of rxmode configuration
in specific.

In another word, only when mq_mode is configured with ETH_MQ_RX_RSS_FLAG
set, then RSS is needed for default rules.

Fixes: c64ccc0eca2f ("mlx5: fix overwritten RSS configuration")

Signed-off-by: Xiaoyu Min <jackmin at mellanox.com>
Signed-off-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 drivers/net/mlx5/mlx5_flow.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index bb8538e816..15d895c847 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -4691,6 +4691,8 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev,
 	if (!priv->reta_idx_n || !priv->rxqs_n) {
 		return 0;
 	}
+	if (!(dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG))
+		action_rss.types = 0;
 	for (i = 0; i != priv->reta_idx_n; ++i)
 		queue[i] = (*priv->reta_idx)[i];
 	flow = flow_list_create(dev, &priv->ctrl_flows,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:50.677331839 +0100
+++ 0153-net-mlx5-fix-RSS-enablement.patch	2020-05-19 14:04:44.484653231 +0100
@@ -1,8 +1,10 @@
-From 0afac6dcca44dea15f23e93851b6e52f014a98e4 Mon Sep 17 00:00:00 2001
+From 831152d0d94a8548aa804ece84acd2ac1529fc8b Mon Sep 17 00:00:00 2001
 From: Xiaoyu Min <jackmin at mellanox.com>
 Date: Wed, 29 Apr 2020 16:00:42 +0300
 Subject: [PATCH] net/mlx5: fix RSS enablement
 
+[ upstream commit 0afac6dcca44dea15f23e93851b6e52f014a98e4 ]
+
 PMD create some default control rules with RSS action
 if it's not isolated mode.
 
@@ -14,7 +16,6 @@
 set, then RSS is needed for default rules.
 
 Fixes: c64ccc0eca2f ("mlx5: fix overwritten RSS configuration")
-Cc: stable at dpdk.org
 
 Signed-off-by: Xiaoyu Min <jackmin at mellanox.com>
 Signed-off-by: Viacheslav Ovsiienko <viacheslavo at mellanox.com>
@@ -25,10 +26,10 @@
  1 file changed, 2 insertions(+)
 
 diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
-index e9ae2f782c..cb593c9449 100644
+index bb8538e816..15d895c847 100644
 --- a/drivers/net/mlx5/mlx5_flow.c
 +++ b/drivers/net/mlx5/mlx5_flow.c
-@@ -4912,6 +4912,8 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev,
+@@ -4691,6 +4691,8 @@ mlx5_ctrl_flow_vlan(struct rte_eth_dev *dev,
  	if (!priv->reta_idx_n || !priv->rxqs_n) {
  		return 0;
  	}
@@ -36,7 +37,7 @@
 +		action_rss.types = 0;
  	for (i = 0; i != priv->reta_idx_n; ++i)
  		queue[i] = (*priv->reta_idx)[i];
- 	flow_idx = flow_list_create(dev, &priv->ctrl_flows,
+ 	flow = flow_list_create(dev, &priv->ctrl_flows,
 -- 
 2.20.1