i40evf: fix RSS key configuration

It fixes the issue of not configuring rss key enable flags
when there is no rss key available.

Fixes: 647d1eaf758b ("i40evf: support AQ based RSS config")

Signed-off-by: Helin Zhang <helin.zhang@intel.com>

diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c
index ea96f85..5c554f2 100644 (file)
--- a/drivers/net/i40e/i40e_ethdev_vf.c
+++ b/drivers/net/i40e/i40e_ethdev_vf.c
@@ -2200,9 +2200,14 @@ i40evf_set_rss_key(struct i40e_vsi *vsi, uint8_t *key, uint8_t key_len)
        struct i40e_hw *hw = I40E_VSI_TO_HW(vsi);
        int ret = 0;
 
-       if (!key || key_len != ((I40E_VFQF_HKEY_MAX_INDEX + 1) *
-               sizeof(uint32_t)))
+       if (!key || key_len == 0) {
+               PMD_DRV_LOG(DEBUG, "No key to be configured");
+               return 0;
+       } else if (key_len != (I40E_VFQF_HKEY_MAX_INDEX + 1) *
+               sizeof(uint32_t)) {
+               PMD_DRV_LOG(ERR, "Invalid key length %u", key_len);
                return -EINVAL;
+       }
 
        if (vf->flags & I40E_FLAG_RSS_AQ_CAPABLE) {
                struct i40e_aqc_get_set_rss_key_data *key_dw =
@@ -2322,12 +2327,14 @@ i40evf_config_rss(struct i40e_vf *vf)
                return 0;
        }
 
-       if (rss_conf.rss_key == NULL || rss_conf.rss_key_len < nb_q) {
+       if (rss_conf.rss_key == NULL || rss_conf.rss_key_len <
+               (I40E_VFQF_HKEY_MAX_INDEX + 1) * sizeof(uint32_t)) {
                /* Calculate the default hash key */
                for (i = 0; i <= I40E_VFQF_HKEY_MAX_INDEX; i++)
                        rss_key_default[i] = (uint32_t)rte_rand();
                rss_conf.rss_key = (uint8_t *)rss_key_default;
-               rss_conf.rss_key_len = nb_q;
+               rss_conf.rss_key_len = (I40E_VFQF_HKEY_MAX_INDEX + 1) *
+                       sizeof(uint32_t);
        }
 
        return i40evf_hw_rss_hash_set(vf, &rss_conf);