[dpdk-stable] patch 'net/bonding: do not ignore RSS key on device config' has been queued to LTS release 16.11.9

[Luca Boccassi <bluca@debian.org>]

Hi,

FYI, your patch has been queued to LTS release 16.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/27/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.

Thanks.

Luca Boccassi

---
>From c1fea1e942b08365d5279ba2df428a4bf11cd17b Mon Sep 17 00:00:00 2001
From: Igor Romanov <igor.romanov@oktetlabs.ru>
Date: Wed, 29 Aug 2018 08:51:24 +0100
Subject: [PATCH] net/bonding: do not ignore RSS key on device config

[ upstream commit 83cf204a982918fd56b15f9d458d1dfb1e724b5f ]

Bonding driver ignores the value of RSS key (that is set in the port RSS
configuration) in bond_ethdev_configure(). So the only way to set
non-default RSS key is by using rss_hash_update(). This is not an
expected behaviour.

Make the bond_ethdev_configure() set default RSS key only if
requested key is set to NULL.

Fixes: 734ce47f71e0 ("bonding: support RSS dynamic configuration")

Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Acked-by: Chas Williams <chas3@att.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 30 +++++++++++++++++++-------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 1fe0c179a1..c672f0560b 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1325,6 +1325,9 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
 	int errval;
 	uint16_t q_id;
 
+	struct bond_dev_private *internals = (struct bond_dev_private *)
+		bonded_eth_dev->data->dev_private;
+
 	/* Stop slave */
 	rte_eth_dev_stop(slave_eth_dev->data->port_id);
 
@@ -1334,12 +1337,11 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
 
 	/* If RSS is enabled for bonding, try to enable it for slaves  */
 	if (bonded_eth_dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {
-		if (bonded_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key_len
-				!= 0) {
+		if (internals->rss_key_len != 0) {
 			slave_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key_len =
-					bonded_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key_len;
+					internals->rss_key_len;
 			slave_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key =
-					bonded_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key;
+					internals->rss_key;
 		} else {
 			slave_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key = NULL;
 		}
@@ -2372,11 +2374,23 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
 
 	unsigned i, j;
 
-	/* If RSS is enabled, fill table and key with default values */
+	/*
+	 * If RSS is enabled, fill table with default values and
+	 * set key to the the value specified in port RSS configuration.
+	 * Fall back to default RSS key if the key is not specified
+	 */
 	if (dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS) {
-		dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key = internals->rss_key;
-		dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key_len = 0;
-		memcpy(internals->rss_key, default_rss_key, 40);
+		if (dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key != NULL) {
+			internals->rss_key_len =
+				dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key_len;
+			memcpy(internals->rss_key,
+			       dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key,
+			       internals->rss_key_len);
+		} else {
+			internals->rss_key_len = sizeof(default_rss_key);
+			memcpy(internals->rss_key, default_rss_key,
+			       internals->rss_key_len);
+		}
 
 		for (i = 0; i < RTE_DIM(internals->reta_conf); i++) {
 			internals->reta_conf[i].mask = ~0LL;
-- 
2.18.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2018-09-25 13:26:56.926173608 +0100
+++ 0007-net-bonding-do-not-ignore-RSS-key-on-device-config.patch	2018-09-25 13:26:56.783424705 +0100
@@ -1,8 +1,10 @@
-From 83cf204a982918fd56b15f9d458d1dfb1e724b5f Mon Sep 17 00:00:00 2001
+From c1fea1e942b08365d5279ba2df428a4bf11cd17b Mon Sep 17 00:00:00 2001
 From: Igor Romanov <igor.romanov@oktetlabs.ru>
 Date: Wed, 29 Aug 2018 08:51:24 +0100
 Subject: [PATCH] net/bonding: do not ignore RSS key on device config
 
+[ upstream commit 83cf204a982918fd56b15f9d458d1dfb1e724b5f ]
+
 Bonding driver ignores the value of RSS key (that is set in the port RSS
 configuration) in bond_ethdev_configure(). So the only way to set
 non-default RSS key is by using rss_hash_update(). This is not an
@@ -12,20 +14,29 @@
 requested key is set to NULL.
 
 Fixes: 734ce47f71e0 ("bonding: support RSS dynamic configuration")
-Cc: stable@dpdk.org
 
 Signed-off-by: Igor Romanov <igor.romanov@oktetlabs.ru>
 Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
 Acked-by: Chas Williams <chas3@att.com>
 ---
- drivers/net/bonding/rte_eth_bond_pmd.c | 27 ++++++++++++++++++--------
- 1 file changed, 19 insertions(+), 8 deletions(-)
+ drivers/net/bonding/rte_eth_bond_pmd.c | 30 +++++++++++++++++++-------
+ 1 file changed, 22 insertions(+), 8 deletions(-)
 
 diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
-index 0f5ab09e38..7814258f23 100644
+index 1fe0c179a1..c672f0560b 100644
 --- a/drivers/net/bonding/rte_eth_bond_pmd.c
 +++ b/drivers/net/bonding/rte_eth_bond_pmd.c
-@@ -1778,12 +1778,11 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
+@@ -1325,6 +1325,9 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
+ 	int errval;
+ 	uint16_t q_id;
+ 
++	struct bond_dev_private *internals = (struct bond_dev_private *)
++		bonded_eth_dev->data->dev_private;
++
+ 	/* Stop slave */
+ 	rte_eth_dev_stop(slave_eth_dev->data->port_id);
+ 
+@@ -1334,12 +1337,11 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
  
  	/* If RSS is enabled for bonding, try to enable it for slaves  */
  	if (bonded_eth_dev->data->dev_conf.rxmode.mq_mode & ETH_MQ_RX_RSS_FLAG) {
@@ -41,7 +52,7 @@
  		} else {
  			slave_eth_dev->data->dev_conf.rx_adv_conf.rss_conf.rss_key = NULL;
  		}
-@@ -3284,11 +3283,23 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
+@@ -2372,11 +2374,23 @@ bond_ethdev_configure(struct rte_eth_dev *dev)
  
  	unsigned i, j;