From: Chengwen Feng <[email protected]> Rename socket_id parameters, internal structure fields, variables and comments to the NUMA node terminology, and switch calls to the NUMA-named APIs.
Signed-off-by: Chengwen Feng <[email protected]> --- drivers/net/axgbe/axgbe_rxtx.c | 16 ++++++++-------- drivers/net/axgbe/axgbe_rxtx.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c index 51a1aeb0b9..47c09399c1 100644 --- a/drivers/net/axgbe/axgbe_rxtx.c +++ b/drivers/net/axgbe/axgbe_rxtx.c @@ -36,7 +36,7 @@ void axgbe_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx) } int axgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, - uint16_t nb_desc, unsigned int socket_id, + uint16_t nb_desc, unsigned int numa_id, const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp) { @@ -55,9 +55,9 @@ int axgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, rx_desc > pdata->rx_desc_count) return -EINVAL; /* First allocate the rx queue data structure */ - rxq = rte_zmalloc_socket("ethdev RX queue", + rxq = rte_zmalloc_numa("ethdev RX queue", sizeof(struct axgbe_rx_queue), - RTE_CACHE_LINE_SIZE, socket_id); + RTE_CACHE_LINE_SIZE, numa_id); if (!rxq) { PMD_INIT_LOG(ERR, "rte_zmalloc for rxq failed!"); return -ENOMEM; @@ -90,7 +90,7 @@ int axgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, /* Allocate RX ring hardware descriptors */ size = rxq->nb_desc * sizeof(union axgbe_rx_desc); dma = rte_eth_dma_zone_reserve(dev, "rx_ring", queue_idx, size, 128, - socket_id); + numa_id); if (!dma) { PMD_DRV_LOG_LINE(ERR, "ring_dma_zone_reserve for rx_ring failed"); axgbe_rx_queue_release(rxq); @@ -101,9 +101,9 @@ int axgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, memset((void *)rxq->desc, 0, size); /* Allocate software ring */ size = rxq->nb_desc * sizeof(struct rte_mbuf *); - rxq->sw_ring = rte_zmalloc_socket("sw_ring", size, + rxq->sw_ring = rte_zmalloc_numa("sw_ring", size, RTE_CACHE_LINE_SIZE, - socket_id); + numa_id); if (!rxq->sw_ring) { PMD_DRV_LOG_LINE(ERR, "rte_zmalloc for sw_ring failed"); axgbe_rx_queue_release(rxq); @@ -544,7 +544,7 @@ void axgbe_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx) } int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, - uint16_t nb_desc, unsigned int socket_id, + uint16_t nb_desc, unsigned int numa_id, const struct rte_eth_txconf *tx_conf) { PMD_INIT_FUNC_TRACE(); @@ -593,7 +593,7 @@ int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, /* Allocate TX ring hardware descriptors */ tsize = txq->nb_desc * sizeof(struct axgbe_tx_desc); tz = rte_eth_dma_zone_reserve(dev, "tx_ring", queue_idx, - tsize, AXGBE_DESC_ALIGN, socket_id); + tsize, AXGBE_DESC_ALIGN, numa_id); if (!tz) { axgbe_tx_queue_release(txq); return -ENOMEM; diff --git a/drivers/net/axgbe/axgbe_rxtx.h b/drivers/net/axgbe/axgbe_rxtx.h index f5f74a0a39..ca6b4935d4 100644 --- a/drivers/net/axgbe/axgbe_rxtx.h +++ b/drivers/net/axgbe/axgbe_rxtx.h @@ -157,7 +157,7 @@ void axgbe_set_rx_function(struct rte_eth_dev *dev); void axgbe_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); int axgbe_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, - uint16_t nb_tx_desc, unsigned int socket_id, + uint16_t nb_tx_desc, unsigned int numa_id, const struct rte_eth_txconf *tx_conf); void axgbe_dev_enable_tx(struct rte_eth_dev *dev); void axgbe_dev_disable_tx(struct rte_eth_dev *dev); @@ -179,7 +179,7 @@ uint16_t axgbe_xmit_pkts_vec(void *tx_queue, struct rte_mbuf **tx_pkts, void axgbe_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); int axgbe_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, - uint16_t nb_rx_desc, unsigned int socket_id, + uint16_t nb_rx_desc, unsigned int numa_id, const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mb_pool); void axgbe_dev_enable_rx(struct rte_eth_dev *dev); -- 2.55.0
