From: Jiawen Wu Date: Fri, 18 Dec 2020 09:36:52 +0000 (+0800) Subject: net/txgbe: add TM configuration init and uninit X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=ad02aa0343ff0473f6004d3ffd3ac976a10a9d65;p=dpdk.git net/txgbe: add TM configuration init and uninit Add traffic manager configuration init and uninit operations. Signed-off-by: Jiawen Wu --- diff --git a/drivers/net/txgbe/meson.build b/drivers/net/txgbe/meson.build index bb1683631f..352baad8bf 100644 --- a/drivers/net/txgbe/meson.build +++ b/drivers/net/txgbe/meson.build @@ -11,6 +11,7 @@ sources = files( 'txgbe_ptypes.c', 'txgbe_pf.c', 'txgbe_rxtx.c', + 'txgbe_tm.c', ) deps += ['hash'] diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c index 73498935ca..0ce17b1803 100644 --- a/drivers/net/txgbe/txgbe_ethdev.c +++ b/drivers/net/txgbe/txgbe_ethdev.c @@ -704,6 +704,9 @@ eth_txgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused) /* initialize bandwidth configuration info */ memset(bw_conf, 0, sizeof(struct txgbe_bw_conf)); + /* initialize Traffic Manager configuration */ + txgbe_tm_conf_init(eth_dev); + return 0; } @@ -1545,6 +1548,7 @@ txgbe_dev_start(struct rte_eth_dev *dev) int status; uint16_t vf, idx; uint32_t *link_speeds; + struct txgbe_tm_conf *tm_conf = TXGBE_DEV_TM_CONF(dev); PMD_INIT_FUNC_TRACE(); @@ -1748,6 +1752,11 @@ skip_link_setup: txgbe_l2_tunnel_conf(dev); txgbe_filter_restore(dev); + if (tm_conf->root && !tm_conf->committed) + PMD_DRV_LOG(WARNING, + "please call hierarchy_commit() " + "before starting the port"); + /* * Update link status right before return, because it may * start link configuration process in a separate thread. @@ -1780,6 +1789,7 @@ txgbe_dev_stop(struct rte_eth_dev *dev) struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev); struct rte_intr_handle *intr_handle = &pci_dev->intr_handle; int vf; + struct txgbe_tm_conf *tm_conf = TXGBE_DEV_TM_CONF(dev); if (hw->adapter_stopped) return 0; @@ -1832,6 +1842,9 @@ txgbe_dev_stop(struct rte_eth_dev *dev) intr_handle->intr_vec = NULL; } + /* reset hierarchy commit */ + tm_conf->committed = false; + adapter->rss_reta_updated = 0; wr32m(hw, TXGBE_LEDCTL, 0xFFFFFFFF, TXGBE_LEDCTL_SEL_MASK); @@ -1947,6 +1960,9 @@ txgbe_dev_close(struct rte_eth_dev *dev) /* clear all the filters list */ txgbe_filterlist_flush(); + /* Remove all Traffic Manager configuration */ + txgbe_tm_conf_uninit(dev); + return ret; } diff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h index 6168fee2bc..7751c9db4a 100644 --- a/drivers/net/txgbe/txgbe_ethdev.h +++ b/drivers/net/txgbe/txgbe_ethdev.h @@ -16,6 +16,7 @@ #include #include #include +#include /* need update link, bit flag */ #define TXGBE_FLAG_NEED_LINK_UPDATE (uint32_t)(1 << 0) @@ -275,6 +276,60 @@ struct txgbe_bw_conf { uint8_t tc_num; /* Number of TCs. */ }; +/* Struct to store Traffic Manager shaper profile. */ +struct txgbe_tm_shaper_profile { + TAILQ_ENTRY(txgbe_tm_shaper_profile) node; + uint32_t shaper_profile_id; + uint32_t reference_count; + struct rte_tm_shaper_params profile; +}; + +TAILQ_HEAD(txgbe_shaper_profile_list, txgbe_tm_shaper_profile); + +/* Struct to store Traffic Manager node configuration. */ +struct txgbe_tm_node { + TAILQ_ENTRY(txgbe_tm_node) node; + uint32_t id; + uint32_t priority; + uint32_t weight; + uint32_t reference_count; + uint16_t no; + struct txgbe_tm_node *parent; + struct txgbe_tm_shaper_profile *shaper_profile; + struct rte_tm_node_params params; +}; + +TAILQ_HEAD(txgbe_tm_node_list, txgbe_tm_node); + +/* The configuration of Traffic Manager */ +struct txgbe_tm_conf { + struct txgbe_shaper_profile_list shaper_profile_list; + struct txgbe_tm_node *root; /* root node - port */ + struct txgbe_tm_node_list tc_list; /* node list for all the TCs */ + struct txgbe_tm_node_list queue_list; /* node list for all the queues */ + /** + * The number of added TC nodes. + * It should be no more than the TC number of this port. + */ + uint32_t nb_tc_node; + /** + * The number of added queue nodes. + * It should be no more than the queue number of this port. + */ + uint32_t nb_queue_node; + /** + * This flag is used to check if APP can change the TM node + * configuration. + * When it's true, means the configuration is applied to HW, + * APP should not change the configuration. + * As we don't support on-the-fly configuration, when starting + * the port, APP should call the hierarchy_commit API to set this + * flag to true. When stopping the port, this flag should be set + * to false. + */ + bool committed; +}; + /* * Structure to store private data for each driver instance (for each port). */ @@ -297,6 +352,7 @@ struct txgbe_adapter { struct rte_timecounter systime_tc; struct rte_timecounter rx_tstamp_tc; struct rte_timecounter tx_tstamp_tc; + struct txgbe_tm_conf tm_conf; /* For RSS reta table update */ uint8_t rss_reta_updated; @@ -347,6 +403,8 @@ struct txgbe_adapter { #define TXGBE_DEV_BW_CONF(dev) \ (&((struct txgbe_adapter *)(dev)->data->dev_private)->bw_conf) +#define TXGBE_DEV_TM_CONF(dev) \ + (&((struct txgbe_adapter *)(dev)->data->dev_private)->tm_conf) /* * RX/TX function prototypes @@ -501,6 +559,8 @@ int txgbe_clear_all_l2_tn_filter(struct rte_eth_dev *dev); int txgbe_set_vf_rate_limit(struct rte_eth_dev *dev, uint16_t vf, uint16_t tx_rate, uint64_t q_msk); +void txgbe_tm_conf_init(struct rte_eth_dev *dev); +void txgbe_tm_conf_uninit(struct rte_eth_dev *dev); int txgbe_set_queue_rate_limit(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t tx_rate); int txgbe_rss_conf_init(struct txgbe_rte_flow_rss_conf *out, diff --git a/drivers/net/txgbe/txgbe_tm.c b/drivers/net/txgbe/txgbe_tm.c new file mode 100644 index 0000000000..78f4269643 --- /dev/null +++ b/drivers/net/txgbe/txgbe_tm.c @@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2015-2020 + */ + +#include + +#include "txgbe_ethdev.h" + +void +txgbe_tm_conf_init(struct rte_eth_dev *dev) +{ + struct txgbe_tm_conf *tm_conf = TXGBE_DEV_TM_CONF(dev); + + /* initialize shaper profile list */ + TAILQ_INIT(&tm_conf->shaper_profile_list); + + /* initialize node configuration */ + tm_conf->root = NULL; + TAILQ_INIT(&tm_conf->queue_list); + TAILQ_INIT(&tm_conf->tc_list); + tm_conf->nb_tc_node = 0; + tm_conf->nb_queue_node = 0; + tm_conf->committed = false; +} + +void +txgbe_tm_conf_uninit(struct rte_eth_dev *dev) +{ + struct txgbe_tm_conf *tm_conf = TXGBE_DEV_TM_CONF(dev); + struct txgbe_tm_shaper_profile *shaper_profile; + struct txgbe_tm_node *tm_node; + + /* clear node configuration */ + while ((tm_node = TAILQ_FIRST(&tm_conf->queue_list))) { + TAILQ_REMOVE(&tm_conf->queue_list, tm_node, node); + rte_free(tm_node); + } + tm_conf->nb_queue_node = 0; + while ((tm_node = TAILQ_FIRST(&tm_conf->tc_list))) { + TAILQ_REMOVE(&tm_conf->tc_list, tm_node, node); + rte_free(tm_node); + } + tm_conf->nb_tc_node = 0; + if (tm_conf->root) { + rte_free(tm_conf->root); + tm_conf->root = NULL; + } + + /* Remove all shaper profiles */ + while ((shaper_profile = + TAILQ_FIRST(&tm_conf->shaper_profile_list))) { + TAILQ_REMOVE(&tm_conf->shaper_profile_list, + shaper_profile, node); + rte_free(shaper_profile); + } +} +