d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/bonding: do not ignore RSS key on device config

Browse Source 
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: 734ce47f71 ("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>
This commit is contained in:
Igor Romanov 2018-08-29 08:51:24 +01:00 committed by Ferruh Yigit
parent 617d1ac2fd
commit 83cf204a98
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/bonding/rte_eth_bond_pmd.c
View File

@ -1778,12 +1778,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;
}
@ -3284,11 +3283,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;