net/txgbe: support TM node add and delete
authorJiawen Wu <jiawenwu@trustnetic.com>
Fri, 18 Dec 2020 09:36:55 +0000 (17:36 +0800)
committerFerruh Yigit <ferruh.yigit@intel.com>
Wed, 13 Jan 2021 17:51:58 +0000 (18:51 +0100)
Support traffic manager node add and delete operations.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
drivers/net/txgbe/txgbe_ethdev.h
drivers/net/txgbe/txgbe_tm.c

index 04db329..52ddda5 100644 (file)
@@ -16,6 +16,7 @@
 #include <rte_ethdev_core.h>
 #include <rte_hash.h>
 #include <rte_hash_crc.h>
+#include <rte_bus_pci.h>
 #include <rte_tm_driver.h>
 
 /* need update link, bit flag */
index 8adb038..6dd593e 100644 (file)
@@ -16,6 +16,15 @@ static int txgbe_shaper_profile_add(struct rte_eth_dev *dev,
 static int txgbe_shaper_profile_del(struct rte_eth_dev *dev,
                                    uint32_t shaper_profile_id,
                                    struct rte_tm_error *error);
+static int txgbe_node_add(struct rte_eth_dev *dev, uint32_t node_id,
+                         uint32_t parent_node_id, uint32_t priority,
+                         uint32_t weight, uint32_t level_id,
+                         struct rte_tm_node_params *params,
+                         struct rte_tm_error *error);
+static int txgbe_node_delete(struct rte_eth_dev *dev, uint32_t node_id,
+                            struct rte_tm_error *error);
+static int txgbe_node_type_get(struct rte_eth_dev *dev, uint32_t node_id,
+                              int *is_leaf, struct rte_tm_error *error);
 static int txgbe_level_capabilities_get(struct rte_eth_dev *dev,
                                        uint32_t level_id,
                                        struct rte_tm_level_capabilities *cap,
@@ -29,6 +38,9 @@ const struct rte_tm_ops txgbe_tm_ops = {
        .capabilities_get = txgbe_tm_capabilities_get,
        .shaper_profile_add = txgbe_shaper_profile_add,
        .shaper_profile_delete = txgbe_shaper_profile_del,
+       .node_add = txgbe_node_add,
+       .node_delete = txgbe_node_delete,
+       .node_type_get = txgbe_node_type_get,
        .level_capabilities_get = txgbe_level_capabilities_get,
        .node_capabilities_get = txgbe_node_capabilities_get,
 };
@@ -332,6 +344,482 @@ txgbe_tm_node_search(struct rte_eth_dev *dev, uint32_t node_id,
        return NULL;
 }
 
+static void
+txgbe_queue_base_nb_get(struct rte_eth_dev *dev, uint16_t tc_node_no,
+                       uint16_t *base, uint16_t *nb)
+{
+       uint8_t nb_tcs = txgbe_tc_nb_get(dev);
+       struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
+       uint16_t vf_num = pci_dev->max_vfs;
+
+       *base = 0;
+       *nb = 0;
+
+       /* VT on */
+       if (vf_num) {
+               /* no DCB */
+               if (nb_tcs == 1) {
+                       if (vf_num >= ETH_32_POOLS) {
+                               *nb = 2;
+                               *base = vf_num * 2;
+                       } else if (vf_num >= ETH_16_POOLS) {
+                               *nb = 4;
+                               *base = vf_num * 4;
+                       } else {
+                               *nb = 8;
+                               *base = vf_num * 8;
+                       }
+               } else {
+                       /* DCB */
+                       *nb = 1;
+                       *base = vf_num * nb_tcs + tc_node_no;
+               }
+       } else {
+               /* VT off */
+               if (nb_tcs == ETH_8_TCS) {
+                       switch (tc_node_no) {
+                       case 0:
+                               *base = 0;
+                               *nb = 32;
+                               break;
+                       case 1:
+                               *base = 32;
+                               *nb = 32;
+                               break;
+                       case 2:
+                               *base = 64;
+                               *nb = 16;
+                               break;
+                       case 3:
+                               *base = 80;
+                               *nb = 16;
+                               break;
+                       case 4:
+                               *base = 96;
+                               *nb = 8;
+                               break;
+                       case 5:
+                               *base = 104;
+                               *nb = 8;
+                               break;
+                       case 6:
+                               *base = 112;
+                               *nb = 8;
+                               break;
+                       case 7:
+                               *base = 120;
+                               *nb = 8;
+                               break;
+                       default:
+                               return;
+                       }
+               } else {
+                       switch (tc_node_no) {
+                       /**
+                        * If no VF and no DCB, only 64 queues can be used.
+                        * This case also be covered by this "case 0".
+                        */
+                       case 0:
+                               *base = 0;
+                               *nb = 64;
+                               break;
+                       case 1:
+                               *base = 64;
+                               *nb = 32;
+                               break;
+                       case 2:
+                               *base = 96;
+                               *nb = 16;
+                               break;
+                       case 3:
+                               *base = 112;
+                               *nb = 16;
+                               break;
+                       default:
+                               return;
+                       }
+               }
+       }
+}
+
+static int
+txgbe_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)
+{
+       if (node_id == RTE_TM_NODE_ID_NULL) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_ID;
+               error->message = "invalid node id";
+               return -EINVAL;
+       }
+
+       if (priority) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_PRIORITY;
+               error->message = "priority should be 0";
+               return -EINVAL;
+       }
+
+       if (weight != 1) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_WEIGHT;
+               error->message = "weight must be 1";
+               return -EINVAL;
+       }
+
+       /* not support shared shaper */
+       if (params->shared_shaper_id) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_PARAMS_SHARED_SHAPER_ID;
+               error->message = "shared shaper not supported";
+               return -EINVAL;
+       }
+       if (params->n_shared_shapers) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_PARAMS_N_SHARED_SHAPERS;
+               error->message = "shared shaper not supported";
+               return -EINVAL;
+       }
+
+       /* for non-leaf node */
+       if (node_id >= dev->data->nb_tx_queues) {
+               /* check the unsupported parameters */
+               if (params->nonleaf.wfq_weight_mode) {
+                       error->type =
+                               RTE_TM_ERROR_TYPE_NODE_PARAMS_WFQ_WEIGHT_MODE;
+                       error->message = "WFQ not supported";
+                       return -EINVAL;
+               }
+               if (params->nonleaf.n_sp_priorities != 1) {
+                       error->type =
+                               RTE_TM_ERROR_TYPE_NODE_PARAMS_N_SP_PRIORITIES;
+                       error->message = "SP priority not supported";
+                       return -EINVAL;
+               } else if (params->nonleaf.wfq_weight_mode &&
+                          !(*params->nonleaf.wfq_weight_mode)) {
+                       error->type =
+                               RTE_TM_ERROR_TYPE_NODE_PARAMS_WFQ_WEIGHT_MODE;
+                       error->message = "WFP should be byte mode";
+                       return -EINVAL;
+               }
+
+               return 0;
+       }
+
+       /* for leaf node */
+       /* check the unsupported parameters */
+       if (params->leaf.cman) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_PARAMS_CMAN;
+               error->message = "Congestion management not supported";
+               return -EINVAL;
+       }
+       if (params->leaf.wred.wred_profile_id !=
+           RTE_TM_WRED_PROFILE_ID_NONE) {
+               error->type =
+                       RTE_TM_ERROR_TYPE_NODE_PARAMS_WRED_PROFILE_ID;
+               error->message = "WRED not supported";
+               return -EINVAL;
+       }
+       if (params->leaf.wred.shared_wred_context_id) {
+               error->type =
+                       RTE_TM_ERROR_TYPE_NODE_PARAMS_SHARED_WRED_CONTEXT_ID;
+               error->message = "WRED not supported";
+               return -EINVAL;
+       }
+       if (params->leaf.wred.n_shared_wred_contexts) {
+               error->type =
+                       RTE_TM_ERROR_TYPE_NODE_PARAMS_N_SHARED_WRED_CONTEXTS;
+               error->message = "WRED not supported";
+               return -EINVAL;
+       }
+
+       return 0;
+}
+
+/**
+ * Now the TC and queue configuration is controlled by DCB.
+ * We need check if the node configuration follows the DCB configuration.
+ * In the future, we may use TM to cover DCB.
+ */
+static int
+txgbe_node_add(struct rte_eth_dev *dev, uint32_t node_id,
+              uint32_t parent_node_id, uint32_t priority,
+              uint32_t weight, uint32_t level_id,
+              struct rte_tm_node_params *params,
+              struct rte_tm_error *error)
+{
+       struct txgbe_tm_conf *tm_conf = TXGBE_DEV_TM_CONF(dev);
+       enum txgbe_tm_node_type node_type = TXGBE_TM_NODE_TYPE_MAX;
+       enum txgbe_tm_node_type parent_node_type = TXGBE_TM_NODE_TYPE_MAX;
+       struct txgbe_tm_shaper_profile *shaper_profile = NULL;
+       struct txgbe_tm_node *tm_node;
+       struct txgbe_tm_node *parent_node;
+       uint8_t nb_tcs;
+       uint16_t q_base = 0;
+       uint16_t q_nb = 0;
+       int ret;
+
+       if (!params || !error)
+               return -EINVAL;
+
+       /* if already committed */
+       if (tm_conf->committed) {
+               error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
+               error->message = "already committed";
+               return -EINVAL;
+       }
+
+       ret = txgbe_node_param_check(dev, node_id, priority, weight,
+                                    params, error);
+       if (ret)
+               return ret;
+
+       /* check if the node ID is already used */
+       if (txgbe_tm_node_search(dev, node_id, &node_type)) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_ID;
+               error->message = "node id already used";
+               return -EINVAL;
+       }
+
+       /* check the shaper profile id */
+       if (params->shaper_profile_id != RTE_TM_SHAPER_PROFILE_ID_NONE) {
+               shaper_profile = txgbe_shaper_profile_search(dev,
+                                       params->shaper_profile_id);
+               if (!shaper_profile) {
+                       error->type =
+                               RTE_TM_ERROR_TYPE_NODE_PARAMS_SHAPER_PROFILE_ID;
+                       error->message = "shaper profile not exist";
+                       return -EINVAL;
+               }
+       }
+
+       /* root node if not have a parent */
+       if (parent_node_id == RTE_TM_NODE_ID_NULL) {
+               /* check level */
+               if (level_id != RTE_TM_NODE_LEVEL_ID_ANY &&
+                   level_id > TXGBE_TM_NODE_TYPE_PORT) {
+                       error->type = RTE_TM_ERROR_TYPE_NODE_PARAMS;
+                       error->message = "Wrong level";
+                       return -EINVAL;
+               }
+
+               /* obviously no more than one root */
+               if (tm_conf->root) {
+                       error->type = RTE_TM_ERROR_TYPE_NODE_PARENT_NODE_ID;
+                       error->message = "already have a root";
+                       return -EINVAL;
+               }
+
+               /* add the root node */
+               tm_node = rte_zmalloc("txgbe_tm_node",
+                                     sizeof(struct txgbe_tm_node),
+                                     0);
+               if (!tm_node)
+                       return -ENOMEM;
+               tm_node->id = node_id;
+               tm_node->priority = priority;
+               tm_node->weight = weight;
+               tm_node->reference_count = 0;
+               tm_node->no = 0;
+               tm_node->parent = NULL;
+               tm_node->shaper_profile = shaper_profile;
+               rte_memcpy(&tm_node->params, params,
+                                sizeof(struct rte_tm_node_params));
+               tm_conf->root = tm_node;
+
+               /* increase the reference counter of the shaper profile */
+               if (shaper_profile)
+                       shaper_profile->reference_count++;
+
+               return 0;
+       }
+
+       /* TC or queue node */
+       /* check the parent node */
+       parent_node = txgbe_tm_node_search(dev, parent_node_id,
+                                          &parent_node_type);
+       if (!parent_node) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_PARENT_NODE_ID;
+               error->message = "parent not exist";
+               return -EINVAL;
+       }
+       if (parent_node_type != TXGBE_TM_NODE_TYPE_PORT &&
+           parent_node_type != TXGBE_TM_NODE_TYPE_TC) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_PARENT_NODE_ID;
+               error->message = "parent is not port or TC";
+               return -EINVAL;
+       }
+       /* check level */
+       if (level_id != RTE_TM_NODE_LEVEL_ID_ANY &&
+           level_id != parent_node_type + 1) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_PARAMS;
+               error->message = "Wrong level";
+               return -EINVAL;
+       }
+
+       /* check the node number */
+       if (parent_node_type == TXGBE_TM_NODE_TYPE_PORT) {
+               /* check TC number */
+               nb_tcs = txgbe_tc_nb_get(dev);
+               if (tm_conf->nb_tc_node >= nb_tcs) {
+                       error->type = RTE_TM_ERROR_TYPE_NODE_ID;
+                       error->message = "too many TCs";
+                       return -EINVAL;
+               }
+       } else {
+               /* check queue number */
+               if (tm_conf->nb_queue_node >= dev->data->nb_tx_queues) {
+                       error->type = RTE_TM_ERROR_TYPE_NODE_ID;
+                       error->message = "too many queues";
+                       return -EINVAL;
+               }
+
+               txgbe_queue_base_nb_get(dev, parent_node->no, &q_base, &q_nb);
+               if (parent_node->reference_count >= q_nb) {
+                       error->type = RTE_TM_ERROR_TYPE_NODE_ID;
+                       error->message = "too many queues than TC supported";
+                       return -EINVAL;
+               }
+
+               /**
+                * check the node id.
+                * For queue, the node id means queue id.
+                */
+               if (node_id >= dev->data->nb_tx_queues) {
+                       error->type = RTE_TM_ERROR_TYPE_NODE_ID;
+                       error->message = "too large queue id";
+                       return -EINVAL;
+               }
+       }
+
+       /* add the TC or queue node */
+       tm_node = rte_zmalloc("txgbe_tm_node",
+                             sizeof(struct txgbe_tm_node),
+                             0);
+       if (!tm_node)
+               return -ENOMEM;
+       tm_node->id = node_id;
+       tm_node->priority = priority;
+       tm_node->weight = weight;
+       tm_node->reference_count = 0;
+       tm_node->parent = parent_node;
+       tm_node->shaper_profile = shaper_profile;
+       rte_memcpy(&tm_node->params, params,
+                        sizeof(struct rte_tm_node_params));
+       if (parent_node_type == TXGBE_TM_NODE_TYPE_PORT) {
+               tm_node->no = parent_node->reference_count;
+               TAILQ_INSERT_TAIL(&tm_conf->tc_list,
+                                 tm_node, node);
+               tm_conf->nb_tc_node++;
+       } else {
+               tm_node->no = q_base + parent_node->reference_count;
+               TAILQ_INSERT_TAIL(&tm_conf->queue_list,
+                                 tm_node, node);
+               tm_conf->nb_queue_node++;
+       }
+       tm_node->parent->reference_count++;
+
+       /* increase the reference counter of the shaper profile */
+       if (shaper_profile)
+               shaper_profile->reference_count++;
+
+       return 0;
+}
+
+static int
+txgbe_node_delete(struct rte_eth_dev *dev, uint32_t node_id,
+                 struct rte_tm_error *error)
+{
+       struct txgbe_tm_conf *tm_conf = TXGBE_DEV_TM_CONF(dev);
+       enum txgbe_tm_node_type node_type = TXGBE_TM_NODE_TYPE_MAX;
+       struct txgbe_tm_node *tm_node;
+
+       if (!error)
+               return -EINVAL;
+
+       /* if already committed */
+       if (tm_conf->committed) {
+               error->type = RTE_TM_ERROR_TYPE_UNSPECIFIED;
+               error->message = "already committed";
+               return -EINVAL;
+       }
+
+       if (node_id == RTE_TM_NODE_ID_NULL) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_ID;
+               error->message = "invalid node id";
+               return -EINVAL;
+       }
+
+       /* check the if the node id exists */
+       tm_node = txgbe_tm_node_search(dev, node_id, &node_type);
+       if (!tm_node) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_ID;
+               error->message = "no such node";
+               return -EINVAL;
+       }
+
+       /* the node should have no child */
+       if (tm_node->reference_count) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_ID;
+               error->message =
+                       "cannot delete a node which has children";
+               return -EINVAL;
+       }
+
+       /* root node */
+       if (node_type == TXGBE_TM_NODE_TYPE_PORT) {
+               if (tm_node->shaper_profile)
+                       tm_node->shaper_profile->reference_count--;
+               rte_free(tm_node);
+               tm_conf->root = NULL;
+               return 0;
+       }
+
+       /* TC or queue node */
+       if (tm_node->shaper_profile)
+               tm_node->shaper_profile->reference_count--;
+       tm_node->parent->reference_count--;
+       if (node_type == TXGBE_TM_NODE_TYPE_TC) {
+               TAILQ_REMOVE(&tm_conf->tc_list, tm_node, node);
+               tm_conf->nb_tc_node--;
+       } else {
+               TAILQ_REMOVE(&tm_conf->queue_list, tm_node, node);
+               tm_conf->nb_queue_node--;
+       }
+       rte_free(tm_node);
+
+       return 0;
+}
+
+static int
+txgbe_node_type_get(struct rte_eth_dev *dev, uint32_t node_id,
+                   int *is_leaf, struct rte_tm_error *error)
+{
+       enum txgbe_tm_node_type node_type = TXGBE_TM_NODE_TYPE_MAX;
+       struct txgbe_tm_node *tm_node;
+
+       if (!is_leaf || !error)
+               return -EINVAL;
+
+       if (node_id == RTE_TM_NODE_ID_NULL) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_ID;
+               error->message = "invalid node id";
+               return -EINVAL;
+       }
+
+       /* check if the node id exists */
+       tm_node = txgbe_tm_node_search(dev, node_id, &node_type);
+       if (!tm_node) {
+               error->type = RTE_TM_ERROR_TYPE_NODE_ID;
+               error->message = "no such node";
+               return -EINVAL;
+       }
+
+       if (node_type == TXGBE_TM_NODE_TYPE_QUEUE)
+               *is_leaf = true;
+       else
+               *is_leaf = false;
+
+       return 0;
+}
+
 static int
 txgbe_level_capabilities_get(struct rte_eth_dev *dev,
                             uint32_t level_id,