net/hns3: fix flow RSS queue number 0
authorWei Hu (Xavier) <xavier.huwei@huawei.com>
Tue, 22 Sep 2020 12:03:26 +0000 (20:03 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Wed, 30 Sep 2020 17:19:11 +0000 (19:19 +0200)
When user specifies RSS queue num for 0 in action list by flow create API,
it should create a valid flow rule. The following flow rule should be
success in the command line of the testpmd application:
flow create 0 <pattern> actions rss queues  / end

Fixes: c37ca66f2b27 ("net/hns3: support RSS")
Cc: stable@dpdk.org
Signed-off-by: Lijun Ou <oulijun@huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei@huawei.com>
drivers/net/hns3/hns3_flow.c

index 6f2ff87..5b5124c 100644 (file)
@@ -1360,10 +1360,9 @@ hns3_parse_rss_filter(struct rte_eth_dev *dev,
        uint16_t n;
 
        NEXT_ITEM_OF_ACTION(act, actions, act_index);
-       /* Get configuration args from APP cmdline input */
        rss = act->conf;
 
-       if (rss == NULL || rss->queue_num == 0) {
+       if (rss == NULL) {
                return rte_flow_error_set(error, EINVAL,
                                          RTE_FLOW_ERROR_TYPE_ACTION,
                                          act, "no valid queues");
@@ -1537,11 +1536,6 @@ hns3_update_indir_table(struct rte_eth_dev *dev,
        uint8_t queue_id;
        uint32_t i;
 
-       if (num == 0) {
-               hns3_err(hw, "No PF queues are configured to enable RSS");
-               return -ENOTSUP;
-       }
-
        allow_rss_queues = RTE_MIN(dev->data->nb_rx_queues, hw->rss_size_max);
        /* Fill in redirection table */
        memcpy(indir_tbl, hw->rss_info.rss_indirection_tbl,
@@ -1632,10 +1626,11 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
        hns3_info(hw, "Max of contiguous %u PF queues are configured", num);
 
        rte_spinlock_lock(&hw->lock);
-       /* Update redirection talbe of rss */
-       ret = hns3_update_indir_table(dev, &rss_flow_conf, num);
-       if (ret)
-               goto rss_config_err;
+       if (num) {
+               ret = hns3_update_indir_table(dev, &rss_flow_conf, num);
+               if (ret)
+                       goto rss_config_err;
+       }
 
        /* Set hash algorithm and flow types by the user's config */
        ret = hns3_hw_rss_hash_set(hw, &rss_flow_conf);
@@ -1661,9 +1656,6 @@ hns3_clear_rss_filter(struct rte_eth_dev *dev)
        struct hns3_adapter *hns = dev->data->dev_private;
        struct hns3_hw *hw = &hns->hw;
 
-       if (hw->rss_info.conf.queue_num == 0)
-               return 0;
-
        return hns3_config_rss_filter(dev, &hw->rss_info, false);
 }
 
@@ -1674,9 +1666,6 @@ hns3_restore_rss_filter(struct rte_eth_dev *dev)
        struct hns3_adapter *hns = dev->data->dev_private;
        struct hns3_hw *hw = &hns->hw;
 
-       if (hw->rss_info.conf.queue_num == 0)
-               return 0;
-
        /* When user flush all rules, it doesn't need to restore RSS rule */
        if (hw->rss_info.conf.func == RTE_ETH_HASH_FUNCTION_MAX)
                return 0;