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/bnx2x/bnx2x.c | 2 +- drivers/net/bnx2x/bnx2x_rxtx.c | 22 +++++++++++----------- drivers/net/bnx2x/bnx2x_rxtx.h | 4 ++-- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/net/bnx2x/bnx2x.c b/drivers/net/bnx2x/bnx2x.c index 2924fed66b..fdb3290413 100644 --- a/drivers/net/bnx2x/bnx2x.c +++ b/drivers/net/bnx2x/bnx2x.c @@ -156,7 +156,7 @@ bnx2x_dma_alloc(struct bnx2x_softc *sc, size_t size, struct bnx2x_dma *dma, /* Caller must take care that strlen(mz_name) < RTE_MEMZONE_NAMESIZE */ z = rte_memzone_reserve_aligned(mz_name, (uint64_t)size, - SOCKET_ID_ANY, + RTE_NUMA_ID_ANY, RTE_MEMZONE_IOVA_CONTIG, align); if (z == NULL) { PMD_DRV_LOG(ERR, sc, "DMA alloc failed for %s", msg); diff --git a/drivers/net/bnx2x/bnx2x_rxtx.c b/drivers/net/bnx2x/bnx2x_rxtx.c index fbc0bb7698..0b8451d4ab 100644 --- a/drivers/net/bnx2x/bnx2x_rxtx.c +++ b/drivers/net/bnx2x/bnx2x_rxtx.c @@ -10,10 +10,10 @@ static const struct rte_memzone * ring_dma_zone_reserve(struct rte_eth_dev *dev, const char *ring_name, - uint16_t queue_id, uint32_t ring_size, int socket_id) + uint16_t queue_id, uint32_t ring_size, int numa_id) { return rte_eth_dma_zone_reserve(dev, ring_name, queue_id, - ring_size, BNX2X_PAGE_SIZE, socket_id); + ring_size, BNX2X_PAGE_SIZE, numa_id); } static void @@ -45,7 +45,7 @@ int bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, - unsigned int socket_id, + unsigned int numa_id, __rte_unused const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp) { @@ -61,8 +61,8 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev, rte_iova_t busaddr; /* First allocate the rx queue data structure */ - rxq = rte_zmalloc_socket("ethdev RX queue", sizeof(struct bnx2x_rx_queue), - RTE_CACHE_LINE_SIZE, socket_id); + rxq = rte_zmalloc_numa("ethdev RX queue", sizeof(struct bnx2x_rx_queue), + RTE_CACHE_LINE_SIZE, numa_id); if (NULL == rxq) { PMD_DRV_LOG(ERR, sc, "rte_zmalloc for rxq failed!"); return -ENOMEM; @@ -88,7 +88,7 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev, /* Allocate RX ring hardware descriptors */ dma_size = rxq->nb_rx_desc * sizeof(struct eth_rx_bd); - dma = ring_dma_zone_reserve(dev, "hw_ring", queue_idx, dma_size, socket_id); + dma = ring_dma_zone_reserve(dev, "hw_ring", queue_idx, dma_size, numa_id); if (NULL == dma) { PMD_RX_LOG(ERR, "ring_dma_zone_reserve for rx_ring failed!"); bnx2x_rx_queue_release(rxq); @@ -107,9 +107,9 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev, /* Allocate software ring */ dma_size = rxq->nb_rx_desc * sizeof(struct bnx2x_rx_entry); - rxq->sw_ring = rte_zmalloc_socket("sw_ring", dma_size, + rxq->sw_ring = rte_zmalloc_numa("sw_ring", dma_size, RTE_CACHE_LINE_SIZE, - socket_id); + numa_id); if (NULL == rxq->sw_ring) { PMD_RX_LOG(ERR, "rte_zmalloc for sw_ring failed!"); bnx2x_rx_queue_release(rxq); @@ -136,7 +136,7 @@ bnx2x_dev_rx_queue_setup(struct rte_eth_dev *dev, /* Allocate CQ chain. */ dma_size = BNX2X_RX_CHAIN_PAGE_SZ * rxq->nb_cq_pages; - dma = ring_dma_zone_reserve(dev, "bnx2x_rcq", queue_idx, dma_size, socket_id); + dma = ring_dma_zone_reserve(dev, "bnx2x_rcq", queue_idx, dma_size, numa_id); if (NULL == dma) { PMD_RX_LOG(ERR, "RCQ alloc failed"); return -ENOMEM; @@ -231,7 +231,7 @@ int bnx2x_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, - unsigned int socket_id, + unsigned int numa_id, const struct rte_eth_txconf *tx_conf) { uint16_t i; @@ -270,7 +270,7 @@ bnx2x_dev_tx_queue_setup(struct rte_eth_dev *dev, /* Allocate TX ring hardware descriptors */ tsize = txq->nb_tx_desc * sizeof(union eth_tx_bd_types); - tz = ring_dma_zone_reserve(dev, "tx_hw_ring", queue_idx, tsize, socket_id); + tz = ring_dma_zone_reserve(dev, "tx_hw_ring", queue_idx, tsize, numa_id); if (tz == NULL) { bnx2x_tx_queue_release(txq); return -ENOMEM; diff --git a/drivers/net/bnx2x/bnx2x_rxtx.h b/drivers/net/bnx2x/bnx2x_rxtx.h index 247a72230b..c8dc12156d 100644 --- a/drivers/net/bnx2x/bnx2x_rxtx.h +++ b/drivers/net/bnx2x/bnx2x_rxtx.h @@ -64,12 +64,12 @@ struct bnx2x_tx_queue { }; int bnx2x_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); int bnx2x_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 bnx2x_dev_rx_queue_release(struct rte_eth_dev *dev, uint16_t queue_idx); -- 2.55.0
