From: Martin Spinler <[email protected]> This prepares queue mapping for port-aware driver implementation.
Signed-off-by: Martin Spinler <[email protected]> --- drivers/net/nfb/nfb.h | 4 ++++ drivers/net/nfb/nfb_ethdev.c | 19 +++++++++++++++++++ drivers/net/nfb/nfb_rx.c | 21 ++++++++++++--------- drivers/net/nfb/nfb_tx.c | 21 ++++++++++++--------- 4 files changed, 47 insertions(+), 18 deletions(-) diff --git a/drivers/net/nfb/nfb.h b/drivers/net/nfb/nfb.h index 09d4b7da5f..0361859fc1 100644 --- a/drivers/net/nfb/nfb.h +++ b/drivers/net/nfb/nfb.h @@ -47,6 +47,10 @@ struct pmd_internals { uint16_t max_txmac; struct nc_rxmac *rxmac[RTE_MAX_NC_RXMAC]; struct nc_txmac *txmac[RTE_MAX_NC_TXMAC]; + + int *queue_map_rx; + int *queue_map_tx; + struct nfb_device *nfb; }; diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c index 59d9987789..238a3004c5 100644 --- a/drivers/net/nfb/nfb_ethdev.c +++ b/drivers/net/nfb/nfb_ethdev.c @@ -509,6 +509,7 @@ static const struct eth_dev_ops ops = { static int nfb_eth_dev_init(struct rte_eth_dev *dev) { + int i; int ret; uint32_t mac_count; struct rte_eth_dev_data *data = dev->data; @@ -566,6 +567,21 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) dev->rx_pkt_burst = nfb_eth_ndp_rx; dev->tx_pkt_burst = nfb_eth_ndp_tx; + internals->queue_map_rx = rte_malloc("NFB queue map", + sizeof(*internals->queue_map_rx) * + (priv->max_rx_queues + priv->max_tx_queues), 0); + if (internals->queue_map_rx == NULL) { + ret = -ENOMEM; + goto err_alloc_queue_map; + } + internals->queue_map_tx = internals->queue_map_rx + priv->max_rx_queues; + + /* default queue mapping is 1:1 */ + for (i = 0; i < priv->max_rx_queues; i++) + internals->queue_map_rx[i] = i; + for (i = 0; i < priv->max_tx_queues; i++) + internals->queue_map_tx[i] = i; + /* Set function callbacks for Ethernet API */ dev->dev_ops = &ops; @@ -604,6 +620,8 @@ nfb_eth_dev_init(struct rte_eth_dev *dev) return 0; err_malloc_mac_addrs: + rte_free(internals->queue_map_rx); +err_alloc_queue_map: nfb_nc_rxmac_deinit(internals->rxmac, internals->max_rxmac); nfb_nc_txmac_deinit(internals->txmac, internals->max_txmac); nfb_close(internals->nfb); @@ -634,6 +652,7 @@ nfb_eth_dev_uninit(struct rte_eth_dev *dev) nfb_nc_txmac_deinit(internals->txmac, internals->max_txmac); nfb_close(internals->nfb); + rte_free(internals->queue_map_rx); rte_free(internals); NFB_LOG(INFO, "NFB device (" PCI_PRI_FMT ") successfully uninitialized", diff --git a/drivers/net/nfb/nfb_rx.c b/drivers/net/nfb/nfb_rx.c index 413d275853..dba5755bdc 100644 --- a/drivers/net/nfb/nfb_rx.c +++ b/drivers/net/nfb/nfb_rx.c @@ -63,6 +63,7 @@ nfb_eth_rx_queue_setup(struct rte_eth_dev *dev, struct pmd_internals *internals = dev->process_private; struct ndp_rx_queue *rxq; + int nfb_qid; int ret; rxq = rte_zmalloc_socket("ndp rx queue", @@ -77,17 +78,19 @@ nfb_eth_rx_queue_setup(struct rte_eth_dev *dev, rxq->flags = 0; - ret = nfb_eth_rx_queue_init(internals->nfb, - rx_queue_id, - dev->data->port_id, - mb_pool, - rxq); + /* nfb queue id doesn't necessary corresponds to txq_id */ + nfb_qid = internals->queue_map_rx[rx_queue_id]; - if (ret == 0) - dev->data->rx_queues[rx_queue_id] = rxq; - else - rte_free(rxq); + ret = nfb_eth_rx_queue_init(internals->nfb, nfb_qid, + dev->data->port_id, mb_pool, rxq); + if (ret) + goto err_queue_init; + + dev->data->rx_queues[rx_queue_id] = rxq; + return 0; +err_queue_init: + rte_free(rxq); return ret; } diff --git a/drivers/net/nfb/nfb_tx.c b/drivers/net/nfb/nfb_tx.c index 1f997ce22f..8ea62ec62c 100644 --- a/drivers/net/nfb/nfb_tx.c +++ b/drivers/net/nfb/nfb_tx.c @@ -55,10 +55,10 @@ nfb_eth_tx_queue_setup(struct rte_eth_dev *dev, { struct pmd_internals *internals = dev->process_private; int ret; + int nfb_qid; struct ndp_tx_queue *txq; - txq = rte_zmalloc_socket("ndp tx queue", - sizeof(struct ndp_tx_queue), + txq = rte_zmalloc_socket("ndp tx queue", sizeof(struct ndp_tx_queue), RTE_CACHE_LINE_SIZE, socket_id); if (txq == NULL) { @@ -67,15 +67,18 @@ nfb_eth_tx_queue_setup(struct rte_eth_dev *dev, return -ENOMEM; } - ret = nfb_eth_tx_queue_init(internals->nfb, - tx_queue_id, - txq); + /* nfb queue id doesn't necessary corresponds to tx_queue_id */ + nfb_qid = internals->queue_map_tx[tx_queue_id]; - if (ret == 0) - dev->data->tx_queues[tx_queue_id] = txq; - else - rte_free(txq); + ret = nfb_eth_tx_queue_init(internals->nfb, nfb_qid, txq); + if (ret) + goto err_queue_init; + + dev->data->tx_queues[tx_queue_id] = txq; + return 0; +err_queue_init: + rte_free(txq); return ret; } -- 2.52.0
