net/i40e: fix TM node parameter checking

[dpdk.git] / drivers / net / i40e / i40e_tm.c

diff --git a/drivers/net/i40e/i40e_tm.c b/drivers/net/i40e/i40e_tm.c
index 56013b1..cfda4ab 100644 (file)
--- a/drivers/net/i40e/i40e_tm.c
+++ b/drivers/net/i40e/i40e_tm.c
@@ -302,7 +302,7 @@ i40e_shaper_profile_add(struct rte_eth_dev *dev,
        if (!shaper_profile)
                return -ENOMEM;
        shaper_profile->shaper_profile_id = shaper_profile_id;
-       (void)rte_memcpy(&shaper_profile->profile, profile,
+       rte_memcpy(&shaper_profile->profile, profile,
                         sizeof(struct rte_tm_shaper_params));
        TAILQ_INSERT_TAIL(&pf->tm_conf.shaper_profile_list,
                          shaper_profile, node);
@@ -374,11 +374,13 @@ i40e_tm_node_search(struct rte_eth_dev *dev,
 }
 
 static int
-i40e_node_param_check(uint32_t node_id, uint32_t parent_node_id,
+i40e_node_param_check(struct rte_eth_dev *dev, uint32_t node_id,
                      uint32_t priority, uint32_t weight,
                      struct rte_tm_node_params *params,
                      struct rte_tm_error *error)
 {
+       struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+
        if (node_id == RTE_TM_NODE_ID_NULL) {
                error->type = RTE_TM_ERROR_TYPE_NODE_ID;
                error->message = "invalid node id";
@@ -409,8 +411,8 @@ i40e_node_param_check(uint32_t node_id, uint32_t parent_node_id,
                return -EINVAL;
        }
 
-       /* for root node */
-       if (parent_node_id == RTE_TM_NODE_ID_NULL) {
+       /* for non-leaf node */
+       if (node_id >= hw->func_caps.num_tx_qp) {
                if (params->nonleaf.wfq_weight_mode) {
                        error->type =
                                RTE_TM_ERROR_TYPE_NODE_PARAMS_WFQ_WEIGHT_MODE;
@@ -433,7 +435,7 @@ i40e_node_param_check(uint32_t node_id, uint32_t parent_node_id,
                return 0;
        }
 
-       /* for TC or queue node */
+       /* for leaf node */
        if (params->leaf.cman) {
                error->type = RTE_TM_ERROR_TYPE_NODE_PARAMS_CMAN;
                error->message = "Congestion management not supported";
@@ -494,7 +496,7 @@ i40e_node_add(struct rte_eth_dev *dev, uint32_t node_id,
                return -EINVAL;
        }
 
-       ret = i40e_node_param_check(node_id, parent_node_id, priority, weight,
+       ret = i40e_node_param_check(dev, node_id, priority, weight,
                                    params, error);
        if (ret)
                return ret;
@@ -544,7 +546,7 @@ i40e_node_add(struct rte_eth_dev *dev, uint32_t node_id,
                tm_node->reference_count = 0;
                tm_node->parent = NULL;
                tm_node->shaper_profile = shaper_profile;
-               (void)rte_memcpy(&tm_node->params, params,
+               rte_memcpy(&tm_node->params, params,
                                 sizeof(struct rte_tm_node_params));
                pf->tm_conf.root = tm_node;
 
@@ -617,7 +619,7 @@ i40e_node_add(struct rte_eth_dev *dev, uint32_t node_id,
        tm_node->reference_count = 0;
        tm_node->parent = pf->tm_conf.root;
        tm_node->shaper_profile = shaper_profile;
-       (void)rte_memcpy(&tm_node->params, params,
+       rte_memcpy(&tm_node->params, params,
                         sizeof(struct rte_tm_node_params));
        if (parent_node_type == I40E_TM_NODE_TYPE_PORT) {
                TAILQ_INSERT_TAIL(&pf->tm_conf.tc_list,
@@ -962,8 +964,6 @@ i40e_hierarchy_commit(struct rte_eth_dev *dev,
                goto fail_clear;
        }
 
-       goto done;
-
 done:
        pf->tm_conf.committed = true;
        return 0;