From: Gagandeep Singh <[email protected]> Allocate TX queues based on dpni attribute and align the bounds check with the RX queue logic: - compute nb_tx_queues from num_tx_tcs * num_queues (respecting DPNI_OPT_SINGLE_SENDER) and cap at MAX_TX_QUEUES (128) - cap nb_rx_queues at MAX_RX_QUEUES (128) - cap num_channels at DPAA2_MAX_CHANNELS - assign tc_index/flow_id at queue-allocation time instead of at queue-setup time - replace the open-coded (channel << 8 | tc) with DPNI_BUILD_PARAM(channel, tc) throughout tx_queue_setup - initialize fqid to DPAA2_INVALID_FQ_ID and use it as the already-configured guard (replacing DPAA2_INVALID_FLOW_ID) - add a per-device tx_channels[] array for channel mapping
Signed-off-by: Jun Yang <[email protected]> Signed-off-by: Gagandeep Singh <[email protected]> --- drivers/bus/fslmc/portal/dpaa2_hw_pvt.h | 1 + drivers/net/dpaa2/dpaa2_ethdev.c | 112 ++++++++++++++---------- drivers/net/dpaa2/dpaa2_ethdev.h | 5 +- 3 files changed, 70 insertions(+), 48 deletions(-) diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h index ef65e7895a..f0bc9a3063 100644 --- a/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h +++ b/drivers/bus/fslmc/portal/dpaa2_hw_pvt.h @@ -82,6 +82,7 @@ #define DPAA2_DPCI_MAX_QUEUES 2 #define DPAA2_INVALID_FLOW_ID 0xffff +#define DPAA2_INVALID_FQ_ID ((uint32_t)(-1)) #define DPAA2_INVALID_CGID 0xff #define SEC_FLC_DHR_OUTBOUND (-114) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index c95704d4ca..d79dfa7114 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -519,17 +519,13 @@ static int dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev) { struct dpaa2_dev_priv *priv = dev->data->dev_private; - uint16_t dist_idx; - uint32_t vq_id; - uint8_t num_rxqueue_per_tc; - struct dpaa2_queue *mc_q, *mcq; + uint8_t num_queue_per_tc; + struct dpaa2_queue *mc_q, *dpaa2_q; uint32_t tot_queues; int i, ret = 0; - struct dpaa2_queue *dpaa2_q; PMD_INIT_FUNC_TRACE(); - num_rxqueue_per_tc = (priv->nb_rx_queues / priv->num_rx_tc); if (priv->flags & DPAA2_TX_CONF_ENABLE) tot_queues = priv->nb_rx_queues + 2 * priv->nb_tx_queues; else @@ -541,8 +537,12 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev) return -ENOBUFS; } + num_queue_per_tc = (priv->nb_rx_queues / priv->num_rx_tc); for (i = 0; i < priv->nb_rx_queues; i++) { mc_q->eth_data = dev->data; + mc_q->tc_index = i / num_queue_per_tc; + mc_q->flow_id = i % num_queue_per_tc; + mc_q->fqid = DPAA2_INVALID_FQ_ID; priv->rx_vq[i] = mc_q++; dpaa2_q = priv->rx_vq[i]; ret = dpaa2_queue_storage_alloc(dpaa2_q, @@ -566,9 +566,12 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev) goto fail; } + num_queue_per_tc = (priv->nb_tx_queues / priv->num_tx_tc); for (i = 0; i < priv->nb_tx_queues; i++) { mc_q->eth_data = dev->data; - mc_q->flow_id = DPAA2_INVALID_FLOW_ID; + mc_q->tc_index = i / num_queue_per_tc; + mc_q->flow_id = i % num_queue_per_tc; + mc_q->fqid = DPAA2_INVALID_FQ_ID; priv->tx_vq[i] = mc_q++; dpaa2_q = (struct dpaa2_queue *)priv->tx_vq[i]; dpaa2_q->cscn = rte_malloc(NULL, @@ -583,8 +586,9 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev) /*Setup tx confirmation queues*/ for (i = 0; i < priv->nb_tx_queues; i++) { mc_q->eth_data = dev->data; - mc_q->tc_index = i; - mc_q->flow_id = 0; + mc_q->tc_index = i / num_queue_per_tc; + mc_q->flow_id = i % num_queue_per_tc; + mc_q->fqid = DPAA2_INVALID_FQ_ID; priv->tx_conf_vq[i] = mc_q++; dpaa2_q = priv->tx_conf_vq[i]; ret = dpaa2_queue_storage_alloc(dpaa2_q, @@ -594,14 +598,6 @@ dpaa2_alloc_rx_tx_queues(struct rte_eth_dev *dev) } } - vq_id = 0; - for (dist_idx = 0; dist_idx < priv->nb_rx_queues; dist_idx++) { - mcq = priv->rx_vq[vq_id]; - mcq->tc_index = dist_idx / num_rxqueue_per_tc; - mcq->flow_id = dist_idx % num_rxqueue_per_tc; - vq_id++; - } - return 0; fail_tx_conf: i -= 1; @@ -977,6 +973,12 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev, return ret; } dpaa2_q = priv->rx_vq[rx_queue_id]; + if (dpaa2_q->fqid != DPAA2_INVALID_FQ_ID) { + DPAA2_PMD_WARN("%s: RXQ[%d] has been setup", + dev->data->name, rx_queue_id); + dev->data->rx_queues[rx_queue_id] = dpaa2_q; + return 0; + } dpaa2_q->mb_pool = mb_pool; /**< mbuf pool to populate RX ring. */ dpaa2_q->bp_array = rte_dpaa2_bpid_info; dpaa2_q->offloads = rx_conf->offloads; @@ -1165,7 +1167,9 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev, dpaa2_q->offloads = tx_conf->offloads; /* Return if queue already configured */ - if (dpaa2_q->flow_id != DPAA2_INVALID_FLOW_ID) { + if (dpaa2_q->fqid != DPAA2_INVALID_FQ_ID) { + DPAA2_PMD_WARN("%s: TXQ[%d] has been setup", + dev->data->name, tx_queue_id); dev->data->tx_queues[tx_queue_id] = dpaa2_q; return 0; } @@ -1173,26 +1177,24 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev, memset(&tx_conf_cfg, 0, sizeof(struct dpni_queue)); memset(&tx_flow_cfg, 0, sizeof(struct dpni_queue)); - tc_id = tx_queue_id % priv->num_tx_tc; - channel_id = (uint8_t)(tx_queue_id / priv->num_tx_tc) % priv->num_channels; - flow_id = 0; + tc_id = dpaa2_q->tc_index; + flow_id = dpaa2_q->flow_id; + if (tc_id < priv->num_channels) + channel_id = priv->tx_channels[tc_id]; + else + channel_id = priv->tx_channels[priv->num_channels - 1]; ret = dpni_set_queue(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_TX, - ((channel_id << 8) | tc_id), flow_id, options, &tx_flow_cfg); + DPNI_BUILD_PARAM(channel_id, tc_id), flow_id, options, &tx_flow_cfg); if (ret) { - DPAA2_PMD_ERR("Error in setting the tx flow: " - "tc_id=%d, flow=%d err=%d", - tc_id, flow_id, ret); - return ret; + DPAA2_PMD_ERR("Failed(%d) to set %s's TC[%d].txq[%d]", + ret, dev->data->name, tc_id, flow_id); + return ret; } - dpaa2_q->flow_id = flow_id; - - dpaa2_q->tc_index = tc_id; - ret = dpni_get_queue(dpni, CMD_PRI_LOW, priv->token, - DPNI_QUEUE_TX, ((channel_id << 8) | dpaa2_q->tc_index), - dpaa2_q->flow_id, &tx_flow_cfg, &qid); + DPNI_QUEUE_TX, DPNI_BUILD_PARAM(channel_id, tc_id), + flow_id, &tx_flow_cfg, &qid); if (ret) { DPAA2_PMD_ERR("Error in getting LFQID err=%d", ret); return ret; @@ -1231,10 +1233,9 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev, ret = dpni_set_congestion_notification(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_TX, - ((channel_id << 8) | tc_id), &cong_notif_cfg); + DPNI_BUILD_PARAM(channel_id, tc_id), &cong_notif_cfg); if (ret) { - DPAA2_PMD_ERR("Set TX congestion notification err=%d", - ret); + DPAA2_PMD_ERR("Set TX congestion notification err=%d", ret); return ret; } } @@ -1242,31 +1243,32 @@ dpaa2_dev_tx_queue_setup(struct rte_eth_dev *dev, dev->data->tx_queues[tx_queue_id] = dpaa2_q; if (priv->flags & DPAA2_TX_CONF_ENABLE) { + tc_id = dpaa2_tx_conf_q->tc_index; + flow_id = dpaa2_tx_conf_q->flow_id; dpaa2_q->tx_conf_queue = dpaa2_tx_conf_q; options = options | DPNI_QUEUE_OPT_USER_CTX; tx_conf_cfg.user_context = (size_t)(dpaa2_q); ret = dpni_set_queue(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_TX_CONFIRM, - ((channel_id << 8) | dpaa2_tx_conf_q->tc_index), - dpaa2_tx_conf_q->flow_id, - options, &tx_conf_cfg); + DPNI_BUILD_PARAM(channel_id, tc_id), + flow_id, options, &tx_conf_cfg); if (ret) { DPAA2_PMD_ERR("Set TC[%d].TX[%d] conf flow err=%d", - dpaa2_tx_conf_q->tc_index, - dpaa2_tx_conf_q->flow_id, ret); + tc_id, flow_id, ret); return ret; } ret = dpni_get_queue(dpni, CMD_PRI_LOW, priv->token, DPNI_QUEUE_TX_CONFIRM, - ((channel_id << 8) | dpaa2_tx_conf_q->tc_index), - dpaa2_tx_conf_q->flow_id, &tx_conf_cfg, &qid); + DPNI_BUILD_PARAM(channel_id, tc_id), + flow_id, &tx_conf_cfg, &qid); if (ret) { DPAA2_PMD_ERR("Error in getting LFQID err=%d", ret); return ret; } dpaa2_tx_conf_q->fqid = qid.fqid; } + return 0; } @@ -3553,10 +3555,28 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) for (i = 0; i < priv->max_cgs; i++) priv->cgid_in_use[i] = 0; - for (i = 0; i < attr.num_rx_tcs; i++) - priv->nb_rx_queues += attr.num_queues; - - priv->nb_tx_queues = attr.num_tx_tcs * attr.num_channels; + priv->nb_rx_queues = attr.num_rx_tcs * attr.num_queues; + if (priv->nb_rx_queues > MAX_RX_QUEUES) { + DPAA2_PMD_WARN("Too many RXQs(%d) > %d, reduce it to %d", + priv->nb_rx_queues, MAX_RX_QUEUES, MAX_RX_QUEUES); + priv->nb_rx_queues = MAX_RX_QUEUES; + } + if (attr.options & DPNI_OPT_SINGLE_SENDER) + priv->nb_tx_queues = attr.num_tx_tcs * 1; + else + priv->nb_tx_queues = attr.num_tx_tcs * attr.num_queues; + if (priv->nb_tx_queues > MAX_TX_QUEUES) { + DPAA2_PMD_WARN("Too many TXQs(%d) > %d, reduce it to %d", + priv->nb_tx_queues, MAX_TX_QUEUES, MAX_TX_QUEUES); + priv->nb_tx_queues = MAX_TX_QUEUES; + } + if (priv->num_channels > DPAA2_MAX_CHANNELS) { + DPAA2_PMD_WARN("Too many TX channels(%d) > %d, reduce it to %d", + priv->num_channels, DPAA2_MAX_CHANNELS, DPAA2_MAX_CHANNELS); + priv->num_channels = DPAA2_MAX_CHANNELS; + } + for (i = 0; i < priv->num_channels; i++) + priv->tx_channels[i] = i; DPAA2_PMD_DEBUG("RX-TC= %d, rx_queues= %d, tx_queues=%d, max_cgs=%d", priv->num_rx_tc, priv->nb_rx_queues, diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 149954fb6b..0366315ec7 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -28,7 +28,7 @@ #define MAX_TCS DPNI_MAX_TC #define MAX_RX_QUEUES 128 -#define MAX_TX_QUEUES 16 +#define MAX_TX_QUEUES 128 #define MAX_DPNI 8 #define DPAA2_MAX_CHANNELS 16 @@ -390,13 +390,14 @@ struct dpaa2_dev_priv { int32_t hw_id; int32_t qdid; uint16_t token; + uint16_t tx_channels[DPAA2_MAX_CHANNELS]; uint8_t nb_tx_queues; uint8_t nb_rx_queues; uint32_t options; void *rx_vq[MAX_RX_QUEUES]; void *tx_vq[MAX_TX_QUEUES]; struct dpaa2_bp_list *bp_list; /**<Attached buffer pool list */ - void *tx_conf_vq[MAX_TX_QUEUES * DPAA2_MAX_CHANNELS]; + void *tx_conf_vq[MAX_TX_QUEUES]; void *rx_err_vq; uint32_t flags; /*dpaa2 config flags */ uint8_t max_mac_filters; -- 2.43.0
