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/netvsc/hn_ethdev.c | 6 +++--- drivers/net/netvsc/hn_rxtx.c | 30 +++++++++++++++--------------- drivers/net/netvsc/hn_var.h | 10 +++++----- drivers/net/netvsc/hn_vf.c | 8 ++++---- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index 5dc91f9503..ae21ade424 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -163,7 +163,7 @@ eth_dev_vmbus_allocate(struct rte_vmbus_device *dev, size_t private_data_size) if (private_data_size) { eth_dev->data->dev_private = - rte_zmalloc_socket(name, private_data_size, + rte_zmalloc_numa(name, private_data_size, RTE_CACHE_LINE_SIZE, dev->device.numa_node); if (!eth_dev->data->dev_private) { PMD_DRV_LOG(NOTICE, "can not allocate driver data"); @@ -1987,7 +1987,7 @@ static int netvsc_init_once(void) switch (rte_eal_process_type()) { case RTE_PROC_PRIMARY: netvsc_shared_mz = rte_memzone_reserve(MZ_NETVSC_SHARED_DATA, - sizeof(*netvsc_shared_data), SOCKET_ID_ANY, 0); + sizeof(*netvsc_shared_data), RTE_NUMA_ID_ANY, 0); if (!netvsc_shared_mz) { PMD_DRV_LOG(ERR, "Cannot allocate netvsc shared data"); return -rte_errno; @@ -2091,7 +2091,7 @@ static int eth_hn_probe(struct rte_vmbus_driver *drv __rte_unused, goto vmbus_alloc_failed; } - process_priv = rte_zmalloc_socket("netvsc_proc_priv", + process_priv = rte_zmalloc_numa("netvsc_proc_priv", sizeof(struct hn_nvs_process_priv), RTE_CACHE_LINE_SIZE, dev->device.numa_node); diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index 7987b70ce5..e18fb64f2e 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -236,7 +236,7 @@ hn_rx_queue_free_common(struct hn_rx_queue *rxq) int hn_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) { @@ -263,8 +263,8 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, return -EINVAL; } - txq = rte_zmalloc_socket("HN_TXQ", sizeof(*txq), RTE_CACHE_LINE_SIZE, - socket_id); + txq = rte_zmalloc_numa("HN_TXQ", sizeof(*txq), RTE_CACHE_LINE_SIZE, + numa_id); if (!txq) return -ENOMEM; @@ -281,7 +281,7 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, name, nb_desc, sizeof(struct hn_txdesc)); txq->tx_rndis_mz = rte_memzone_reserve_aligned(name, - nb_desc * HN_RNDIS_PKT_ALIGNED, rte_socket_id(), + nb_desc * HN_RNDIS_PKT_ALIGNED, rte_numa_id(), RTE_MEMZONE_IOVA_CONTIG, HN_RNDIS_PKT_ALIGNED); if (!txq->tx_rndis_mz) { err = -rte_errno; @@ -307,7 +307,7 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, * received */ if (queue_idx >= dev->data->nb_rx_queues) { - rxq = hn_rx_queue_alloc(hv, queue_idx, socket_id); + rxq = hn_rx_queue_alloc(hv, queue_idx, numa_id); if (!rxq) { err = -ENOMEM; @@ -329,7 +329,7 @@ hn_dev_tx_queue_setup(struct rte_eth_dev *dev, hn_reset_txagg(txq); err = hn_vf_tx_queue_setup(dev, queue_idx, nb_desc, - socket_id, tx_conf); + numa_id, tx_conf); if (err == 0) { dev->data->tx_queues[queue_idx] = txq; if (rxq != NULL) @@ -906,12 +906,12 @@ static void hn_nvs_handle_notify(struct rte_eth_dev *dev, struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv, uint16_t queue_id, - unsigned int socket_id) + unsigned int numa_id) { struct hn_rx_queue *rxq; - rxq = rte_zmalloc_socket("HN_RXQ", sizeof(*rxq), - RTE_CACHE_LINE_SIZE, socket_id); + rxq = rte_zmalloc_numa("HN_RXQ", sizeof(*rxq), + RTE_CACHE_LINE_SIZE, numa_id); if (!rxq) return NULL; @@ -921,8 +921,8 @@ struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv, rxq->port_id = hv->port_id; rxq->queue_id = queue_id; rxq->event_sz = HN_RXQ_EVENT_DEFAULT; - rxq->event_buf = rte_malloc_socket("HN_EVENTS", HN_RXQ_EVENT_DEFAULT, - RTE_CACHE_LINE_SIZE, socket_id); + rxq->event_buf = rte_malloc_numa("HN_EVENTS", HN_RXQ_EVENT_DEFAULT, + RTE_CACHE_LINE_SIZE, numa_id); if (!rxq->event_buf) { rte_free(rxq); return NULL; @@ -962,7 +962,7 @@ hn_dev_rx_queue_info(struct rte_eth_dev *dev, uint16_t queue_id, int hn_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, const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp) { @@ -982,7 +982,7 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev, * number of Rx queues, we may already have allocated an rxq. */ if (!dev->data->rx_queues[queue_idx]) - rxq = hn_rx_queue_alloc(hv, queue_idx, socket_id); + rxq = hn_rx_queue_alloc(hv, queue_idx, numa_id); else rxq = dev->data->rx_queues[queue_idx]; @@ -1004,12 +1004,12 @@ hn_dev_rx_queue_setup(struct rte_eth_dev *dev, "hn_rx_%u_%u", dev->data->port_id, queue_idx); rxq->rx_ring = rte_ring_create(ring_name, rte_align32pow2(nb_desc), - socket_id, 0); + numa_id, 0); if (!rxq->rx_ring) goto fail; error = hn_vf_rx_queue_setup(dev, queue_idx, nb_desc, - socket_id, rx_conf, mp); + numa_id, rx_conf, mp); if (error) goto fail; diff --git a/drivers/net/netvsc/hn_var.h b/drivers/net/netvsc/hn_var.h index 7d9a950816..ad6180ef09 100644 --- a/drivers/net/netvsc/hn_var.h +++ b/drivers/net/netvsc/hn_var.h @@ -205,7 +205,7 @@ int hn_chim_init(struct rte_eth_dev *dev); void hn_chim_uninit(struct rte_eth_dev *dev); int hn_dev_link_update(struct rte_eth_dev *dev, int wait); int hn_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); void hn_dev_tx_queue_release(struct rte_eth_dev *dev, uint16_t qid); void hn_dev_tx_queue_info(struct rte_eth_dev *dev, uint16_t queue_idx, @@ -215,10 +215,10 @@ int hn_dev_tx_descriptor_status(void *arg, uint16_t offset); struct hn_rx_queue *hn_rx_queue_alloc(struct hn_data *hv, uint16_t queue_id, - unsigned int socket_id); + unsigned int numa_id); int hn_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, const struct rte_eth_rxconf *rx_conf, struct rte_mempool *mp); void hn_dev_rx_queue_info(struct rte_eth_dev *dev, uint16_t queue_id, @@ -263,14 +263,14 @@ int hn_vf_mc_addr_list(struct rte_eth_dev *dev, int hn_vf_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); void hn_vf_tx_queue_release(struct hn_data *hv, uint16_t queue_id); int hn_vf_tx_queue_status(struct hn_data *hv, uint16_t queue_id, uint16_t offset); int hn_vf_rx_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_rxconf *rx_conf, struct rte_mempool *mp); void hn_vf_rx_queue_release(struct hn_data *hv, uint16_t queue_id); diff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c index 96e811278a..f226acfedb 100644 --- a/drivers/net/netvsc/hn_vf.c +++ b/drivers/net/netvsc/hn_vf.c @@ -848,7 +848,7 @@ int hn_vf_mc_addr_list(struct rte_eth_dev *dev, int hn_vf_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) { struct hn_data *hv = dev->data->dev_private; @@ -860,7 +860,7 @@ int hn_vf_tx_queue_setup(struct rte_eth_dev *dev, if (vf_dev) ret = rte_eth_tx_queue_setup(vf_dev->data->port_id, queue_idx, nb_desc, - socket_id, tx_conf); + numa_id, tx_conf); rte_rwlock_read_unlock(&hv->vf_lock); return ret; } @@ -881,7 +881,7 @@ void hn_vf_tx_queue_release(struct hn_data *hv, uint16_t queue_id) int hn_vf_rx_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_rxconf *rx_conf, struct rte_mempool *mp) { @@ -894,7 +894,7 @@ int hn_vf_rx_queue_setup(struct rte_eth_dev *dev, if (vf_dev) ret = rte_eth_rx_queue_setup(vf_dev->data->port_id, queue_idx, nb_desc, - socket_id, rx_conf, mp); + numa_id, rx_conf, mp); rte_rwlock_read_unlock(&hv->vf_lock); return ret; } -- 2.55.0
