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/atlantic/atl_ethdev.h | 4 ++-- drivers/net/atlantic/atl_rxtx.c | 24 ++++++++++++------------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/net/atlantic/atl_ethdev.h b/drivers/net/atlantic/atl_ethdev.h index d2f951c146..41bd29652f 100644 --- a/drivers/net/atlantic/atl_ethdev.h +++ b/drivers/net/atlantic/atl_ethdev.h @@ -58,12 +58,12 @@ void atl_rx_queue_release(struct rte_eth_dev *dev, uint16_t rx_queue_id); void atl_tx_queue_release(struct rte_eth_dev *dev, uint16_t tx_queue_id); int atl_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); int atl_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); int atl_rx_queue_count(void *rx_queue); diff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c index 8d02b92304..016351e69d 100644 --- a/drivers/net/atlantic/atl_rxtx.c +++ b/drivers/net/atlantic/atl_rxtx.c @@ -100,7 +100,7 @@ atl_reset_rx_queue(struct atl_rx_queue *rxq) int atl_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) { @@ -130,8 +130,8 @@ atl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, } /* allocate memory for the queue structure */ - rxq = rte_zmalloc_socket("atlantic Rx queue", sizeof(*rxq), - RTE_CACHE_LINE_SIZE, socket_id); + rxq = rte_zmalloc_numa("atlantic Rx queue", sizeof(*rxq), + RTE_CACHE_LINE_SIZE, numa_id); if (rxq == NULL) { PMD_INIT_LOG(ERR, "Cannot allocate queue structure"); return -ENOMEM; @@ -152,9 +152,9 @@ atl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, PMD_DRV_LOG(ERR, "PMD does not support KEEP_CRC offload"); /* allocate memory for the software ring */ - rxq->sw_ring = rte_zmalloc_socket("atlantic sw rx ring", + rxq->sw_ring = rte_zmalloc_numa("atlantic sw rx ring", nb_rx_desc * sizeof(struct atl_rx_entry), - RTE_CACHE_LINE_SIZE, socket_id); + RTE_CACHE_LINE_SIZE, numa_id); if (rxq->sw_ring == NULL) { PMD_INIT_LOG(ERR, "Port %d: Cannot allocate software ring for queue %d", @@ -171,7 +171,7 @@ atl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t rx_queue_id, mz = rte_eth_dma_zone_reserve(dev, "rx hw_ring", rx_queue_id, HW_ATL_B0_MAX_RXD * sizeof(struct hw_atl_rxd_s), - 128, socket_id); + 128, numa_id); if (mz == NULL) { PMD_INIT_LOG(ERR, "Port %d: Cannot allocate hardware ring for queue %d", @@ -223,7 +223,7 @@ atl_reset_tx_queue(struct atl_tx_queue *txq) int atl_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) { struct atl_tx_queue *txq; @@ -252,8 +252,8 @@ atl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, } /* allocate memory for the queue structure */ - txq = rte_zmalloc_socket("atlantic Tx queue", sizeof(*txq), - RTE_CACHE_LINE_SIZE, socket_id); + txq = rte_zmalloc_numa("atlantic Tx queue", sizeof(*txq), + RTE_CACHE_LINE_SIZE, numa_id); if (txq == NULL) { PMD_INIT_LOG(ERR, "Cannot allocate queue structure"); return -ENOMEM; @@ -267,9 +267,9 @@ atl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, /* allocate memory for the software ring */ - txq->sw_ring = rte_zmalloc_socket("atlantic sw tx ring", + txq->sw_ring = rte_zmalloc_numa("atlantic sw tx ring", nb_tx_desc * sizeof(struct atl_tx_entry), - RTE_CACHE_LINE_SIZE, socket_id); + RTE_CACHE_LINE_SIZE, numa_id); if (txq->sw_ring == NULL) { PMD_INIT_LOG(ERR, "Port %d: Cannot allocate software ring for queue %d", @@ -285,7 +285,7 @@ atl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t tx_queue_id, */ mz = rte_eth_dma_zone_reserve(dev, "tx hw_ring", tx_queue_id, HW_ATL_B0_MAX_TXD * sizeof(struct hw_atl_txd_s), - 128, socket_id); + 128, numa_id); if (mz == NULL) { PMD_INIT_LOG(ERR, "Port %d: Cannot allocate hardware ring for queue %d", -- 2.55.0
