[PATCH v5 23/40] net/ixgbe: check RSS hash algorithms

[Jie Hai]

A new field 'algorithm' has been added to rss_conf, check it
in case of ignoring unsupported values.

Signed-off-by: Jie Hai <haij...@huawei.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 12 ++++++++++--
 drivers/net/ixgbe/ixgbe_rxtx.c   |  4 ++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index d6cf00317e77..b92cd746a061 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2434,8 +2434,12 @@ ixgbe_dev_configure(struct rte_eth_dev *dev)
 
        PMD_INIT_FUNC_TRACE();
 
-       if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)
+       if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) {
                dev->data->dev_conf.rxmode.offloads |= 
RTE_ETH_RX_OFFLOAD_RSS_HASH;
+               if (dev->data->dev_conf.rx_adv_conf.rss_conf.algorithm !=
+                   RTE_ETH_HASH_FUNCTION_DEFAULT)
+                       return -EINVAL;
+       }
 
        /* multiple queue mode checking */
        ret  = ixgbe_check_mq_mode(dev);
@@ -5326,8 +5330,12 @@ ixgbevf_dev_configure(struct rte_eth_dev *dev)
        PMD_INIT_LOG(DEBUG, "Configured Virtual Function port id: %d",
                     dev->data->port_id);
 
-       if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)
+       if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) {
                dev->data->dev_conf.rxmode.offloads |= 
RTE_ETH_RX_OFFLOAD_RSS_HASH;
+               if (dev->data->dev_conf.rx_adv_conf.rss_conf.algorithm !=
+                   RTE_ETH_HASH_FUNCTION_DEFAULT)
+                       return -EINVAL;
+       }
 
        /*
         * VF has no ability to enable/disable HW CRC
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 90b0a7004f50..150f8065ab60 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -3631,6 +3631,10 @@ ixgbe_dev_rss_hash_update(struct rte_eth_dev *dev,
        /* RSS enabled */
        if (rss_hf == 0) /* Disable RSS */
                return -(EINVAL);
+
+       if (rss_conf->algorithm != RTE_ETH_HASH_FUNCTION_DEFAULT)
+               return -EINVAL;
+
        ixgbe_hw_rss_hash_set(hw, rss_conf);
        return 0;
 }
-- 
2.30.0