[dpdk-stable] patch 'net/ice: fix RSS advanced rule' 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 5cfef294de7edb551232ef4fac533c6802d5acbe Mon Sep 17 00:00:00 2001
From: Junyu Jiang <junyux.jiang at intel.com>
Date: Tue, 7 Apr 2020 01:48:17 +0000
Subject: [PATCH] net/ice: fix RSS advanced rule

[ upstream commit 2aa55b41359c64aecadf670d8c0fc15c7cc23df5 ]

This patch moved the RSS initialization from dev start to dev configure
to fix RSS advanced rule invalid issue after running port stop and port
start.

Fixes: 5ad3db8d4bdd ("net/ice: enable advanced RSS")

Signed-off-by: Junyu Jiang <junyux.jiang at intel.com>
Tested-by: Zhiwei He <zhiwei.he at intel.com>
Acked-by: Qiming Yang <qiming.yang at intel.com>
---
 drivers/net/ice/ice_ethdev.c | 50 +++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 52cd20ed9e..ca4371ae3b 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2440,24 +2440,6 @@ ice_dev_uninit(struct rte_eth_dev *dev)
 	return 0;
 }
 
-static int
-ice_dev_configure(struct rte_eth_dev *dev)
-{
-	struct ice_adapter *ad =
-		ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
-
-	/* Initialize to TRUE. If any of Rx queues doesn't meet the
-	 * bulk allocation or vector Rx preconditions we will reset it.
-	 */
-	ad->rx_bulk_alloc_allowed = true;
-	ad->tx_simple_allowed = true;
-
-	if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG)
-		dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH;
-
-	return 0;
-}
-
 static int ice_init_rss(struct ice_pf *pf)
 {
 	struct ice_hw *hw = ICE_PF_TO_HW(pf);
@@ -2588,6 +2570,32 @@ static int ice_init_rss(struct ice_pf *pf)
 	return 0;
 }
 
+static int
+ice_dev_configure(struct rte_eth_dev *dev)
+{
+	struct ice_adapter *ad =
+		ICE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+	struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
+	int ret;
+
+	/* Initialize to TRUE. If any of Rx queues doesn't meet the
+	 * bulk allocation or vector Rx preconditions we will reset it.
+	 */
+	ad->rx_bulk_alloc_allowed = true;
+	ad->tx_simple_allowed = true;
+
+	if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG)
+		dev->data->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_RSS_HASH;
+
+	ret = ice_init_rss(pf);
+	if (ret) {
+		PMD_DRV_LOG(ERR, "Failed to enable rss for PF");
+		return ret;
+	}
+
+	return 0;
+}
+
 static void
 __vsi_queues_bind_intr(struct ice_vsi *vsi, uint16_t msix_vect,
 		       int base_queue, int nb_queue)
@@ -2791,12 +2799,6 @@ ice_dev_start(struct rte_eth_dev *dev)
 		}
 	}
 
-	ret = ice_init_rss(pf);
-	if (ret) {
-		PMD_DRV_LOG(ERR, "Failed to enable rss for PF");
-		goto rx_err;
-	}
-
 	ice_set_rx_function(dev);
 	ice_set_tx_function(dev);
 
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-05-19 14:04:46.710821877 +0100
+++ 0054-net-ice-fix-RSS-advanced-rule.patch	2020-05-19 14:04:44.196648010 +0100
@@ -1,14 +1,15 @@
-From 2aa55b41359c64aecadf670d8c0fc15c7cc23df5 Mon Sep 17 00:00:00 2001
+From 5cfef294de7edb551232ef4fac533c6802d5acbe Mon Sep 17 00:00:00 2001
 From: Junyu Jiang <junyux.jiang at intel.com>
 Date: Tue, 7 Apr 2020 01:48:17 +0000
 Subject: [PATCH] net/ice: fix RSS advanced rule
 
+[ upstream commit 2aa55b41359c64aecadf670d8c0fc15c7cc23df5 ]
+
 This patch moved the RSS initialization from dev start to dev configure
 to fix RSS advanced rule invalid issue after running port stop and port
 start.
 
 Fixes: 5ad3db8d4bdd ("net/ice: enable advanced RSS")
-Cc: stable at dpdk.org
 
 Signed-off-by: Junyu Jiang <junyux.jiang at intel.com>
 Tested-by: Zhiwei He <zhiwei.he at intel.com>
@@ -18,10 +19,10 @@
  1 file changed, 26 insertions(+), 24 deletions(-)
 
 diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
-index 3c38472dec..d5110c4392 100644
+index 52cd20ed9e..ca4371ae3b 100644
 --- a/drivers/net/ice/ice_ethdev.c
 +++ b/drivers/net/ice/ice_ethdev.c
-@@ -2436,24 +2436,6 @@ ice_dev_uninit(struct rte_eth_dev *dev)
+@@ -2440,24 +2440,6 @@ ice_dev_uninit(struct rte_eth_dev *dev)
  	return 0;
  }
  
@@ -46,7 +47,7 @@
  static int ice_init_rss(struct ice_pf *pf)
  {
  	struct ice_hw *hw = ICE_PF_TO_HW(pf);
-@@ -2584,6 +2566,32 @@ static int ice_init_rss(struct ice_pf *pf)
+@@ -2588,6 +2570,32 @@ static int ice_init_rss(struct ice_pf *pf)
  	return 0;
  }
  
@@ -79,7 +80,7 @@
  static void
  __vsi_queues_bind_intr(struct ice_vsi *vsi, uint16_t msix_vect,
  		       int base_queue, int nb_queue)
-@@ -2787,12 +2795,6 @@ ice_dev_start(struct rte_eth_dev *dev)
+@@ -2791,12 +2799,6 @@ ice_dev_start(struct rte_eth_dev *dev)
  		}
  	}