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/zxdh/zxdh_ethdev.c | 18 +++++++++--------- drivers/net/zxdh/zxdh_queue.c | 4 ++-- drivers/net/zxdh/zxdh_queue.h | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/net/zxdh/zxdh_ethdev.c b/drivers/net/zxdh/zxdh_ethdev.c index f3efc927b2..616ed6f610 100644 --- a/drivers/net/zxdh/zxdh_ethdev.c +++ b/drivers/net/zxdh/zxdh_ethdev.c @@ -679,7 +679,7 @@ zxdh_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_logic_qidx) sz_hdr_mz = vq_size * sizeof(struct zxdh_tx_region); } - vq = rte_zmalloc_socket(vq_name, size, RTE_CACHE_LINE_SIZE, numa_node); + vq = rte_zmalloc_numa(vq_name, size, RTE_CACHE_LINE_SIZE, numa_node); if (vq == NULL) { PMD_DRV_LOG(ERR, "can not allocate vq"); return -ENOMEM; @@ -1665,7 +1665,7 @@ zxdh_dtb_dump_res_init(struct zxdh_hw *hw, ZXDH_DEV_INIT_CTRL_T *dpp_ctrl) const struct rte_memzone *generic_dump_mz = rte_memzone_reserve_aligned(p->mz_name, p->mz_size, - SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE); + RTE_NUMA_ID_ANY, 0, RTE_CACHE_LINE_SIZE); if (generic_dump_mz == NULL) { PMD_DRV_LOG(ERR, "Cannot alloc mem for dtb table bulk dump, mz_name is %s, mz_size is %u", p->mz_name, p->mz_size); @@ -1732,7 +1732,7 @@ zxdh_np_dtb_res_init(struct rte_eth_dev *dev) if (!dtb_data->dtb_table_conf_mz) { snprintf(buf, sizeof(buf), "%s_%x", "zxdh_dtb_table_conf_mz", hw->dev_id); const struct rte_memzone *conf_mz = rte_memzone_reserve_aligned(buf, - ZXDH_DTB_TABLE_CONF_SIZE, SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE); + ZXDH_DTB_TABLE_CONF_SIZE, RTE_NUMA_ID_ANY, 0, RTE_CACHE_LINE_SIZE); if (conf_mz == NULL) { PMD_DRV_LOG(ERR, @@ -1750,7 +1750,7 @@ zxdh_np_dtb_res_init(struct rte_eth_dev *dev) memset(buf, '\0', sizeof(buf)); snprintf(buf, sizeof(buf), "%s_%x", "zxdh_dtb_table_dump_mz", hw->dev_id); const struct rte_memzone *dump_mz = rte_memzone_reserve_aligned(buf, - ZXDH_DTB_TABLE_DUMP_SIZE, SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE); + ZXDH_DTB_TABLE_DUMP_SIZE, RTE_NUMA_ID_ANY, 0, RTE_CACHE_LINE_SIZE); if (dump_mz == NULL) { PMD_DRV_LOG(ERR, @@ -1842,7 +1842,7 @@ zxdh_init_shared_data(void) if (rte_eal_process_type() == RTE_PROC_PRIMARY) { /* Allocate shared memory. */ mz = rte_memzone_reserve("zxdh_pmd_shared_data", - sizeof(*zxdh_shared_data), SOCKET_ID_ANY, 0); + sizeof(*zxdh_shared_data), RTE_NUMA_ID_ANY, 0); if (mz == NULL) { PMD_DRV_LOG(ERR, "Cannot allocate zxdh shared data"); ret = -rte_errno; @@ -1898,14 +1898,14 @@ zxdh_init_sh_res(struct zxdh_shared_data *sd) if (rte_eal_process_type() == RTE_PROC_PRIMARY) { flow_mp = rte_mempool_create(MZ_ZXDH_FLOW_MP, ZXDH_MAX_FLOW_NUM, sizeof(struct zxdh_flow), 64, 0, - NULL, NULL, NULL, NULL, SOCKET_ID_ANY, 0); + NULL, NULL, NULL, NULL, RTE_NUMA_ID_ANY, 0); if (flow_mp == NULL) { PMD_DRV_LOG(ERR, "Cannot allocate zxdh flow mempool"); goto error; } mtr_mp = rte_mempool_create(MZ_ZXDH_MTR_MP, ZXDH_MAX_MTR_NUM, sizeof(struct zxdh_mtr_object), 64, 0, - NULL, NULL, NULL, NULL, SOCKET_ID_ANY, 0); + NULL, NULL, NULL, NULL, RTE_NUMA_ID_ANY, 0); if (mtr_mp == NULL) { PMD_DRV_LOG(ERR, "Cannot allocate zxdh mtr mempool"); goto error; @@ -1913,14 +1913,14 @@ zxdh_init_sh_res(struct zxdh_shared_data *sd) mtr_profile_mp = rte_mempool_create(MZ_ZXDH_MTR_PROFILE_MP, MAX_MTR_PROFILE_NUM, sizeof(struct zxdh_meter_profile), 64, 0, NULL, NULL, NULL, - NULL, SOCKET_ID_ANY, 0); + NULL, RTE_NUMA_ID_ANY, 0); if (mtr_profile_mp == NULL) { PMD_DRV_LOG(ERR, "Cannot allocate zxdh mtr profile mempool"); goto error; } mtr_policy_mp = rte_mempool_create(MZ_ZXDH_MTR_POLICY_MP, ZXDH_MAX_POLICY_NUM, sizeof(struct zxdh_meter_policy), - 64, 0, NULL, NULL, NULL, NULL, SOCKET_ID_ANY, 0); + 64, 0, NULL, NULL, NULL, NULL, RTE_NUMA_ID_ANY, 0); if (mtr_policy_mp == NULL) { PMD_DRV_LOG(ERR, "Cannot allocate zxdh mtr profile mempool"); goto error; diff --git a/drivers/net/zxdh/zxdh_queue.c b/drivers/net/zxdh/zxdh_queue.c index 4668cb5d13..b2b7c30fab 100644 --- a/drivers/net/zxdh/zxdh_queue.c +++ b/drivers/net/zxdh/zxdh_queue.c @@ -223,7 +223,7 @@ int32_t zxdh_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, - uint32_t socket_id __rte_unused, + uint32_t numa_id __rte_unused, const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp) { @@ -316,7 +316,7 @@ int32_t zxdh_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, - uint32_t socket_id __rte_unused, + uint32_t numa_id __rte_unused, const struct rte_eth_txconf *tx_conf) { struct zxdh_hw *hw = dev->data->dev_private; diff --git a/drivers/net/zxdh/zxdh_queue.h b/drivers/net/zxdh/zxdh_queue.h index 006b02c425..a254d3781e 100644 --- a/drivers/net/zxdh/zxdh_queue.h +++ b/drivers/net/zxdh/zxdh_queue.h @@ -376,12 +376,12 @@ int32_t zxdh_get_queue_type(uint16_t vtpci_queue_idx); int32_t zxdh_dev_tx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, - uint32_t socket_id, + uint32_t numa_id, const struct rte_eth_txconf *tx_conf); int32_t zxdh_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, uint16_t nb_desc, - uint32_t socket_id, + uint32_t numa_id, const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp); int32_t zxdh_dev_rx_queue_intr_disable(struct rte_eth_dev *dev, uint16_t queue_id); -- 2.55.0
