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/compress/octeontx/otx_zip_pmd.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/compress/octeontx/otx_zip_pmd.c b/drivers/compress/octeontx/otx_zip_pmd.c index 74e3e942ad..a70e9ddfa5 100644 --- a/drivers/compress/octeontx/otx_zip_pmd.c +++ b/drivers/compress/octeontx/otx_zip_pmd.c @@ -225,7 +225,7 @@ zip_pmd_config(struct rte_compressdev *dev, NULL, NULL, NULL, - SOCKET_ID_ANY, + RTE_NUMA_ID_ANY, 0); if (zip_buf_mp == NULL) { @@ -246,7 +246,7 @@ zip_pmd_config(struct rte_compressdev *dev, NULL, NULL, NULL, - SOCKET_ID_ANY, + RTE_NUMA_ID_ANY, MEMPOOL_F_NO_SPREAD); if (zip_sg_mp == NULL) { @@ -356,7 +356,7 @@ zip_pmd_qp_release(struct rte_compressdev *dev, uint16_t qp_id) /** Create a ring to place process packets on */ static struct rte_ring * zip_pmd_qp_create_processed_pkts_ring(struct zipvf_qp *qp, - unsigned int ring_size, int socket_id) + unsigned int ring_size, int numa_id) { struct rte_ring *r; @@ -373,14 +373,14 @@ zip_pmd_qp_create_processed_pkts_ring(struct zipvf_qp *qp, return NULL; } - return rte_ring_create(qp->name, ring_size, socket_id, + return rte_ring_create(qp->name, ring_size, numa_id, RING_F_EXACT_SZ); } /** Setup a queue pair */ static int zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, - uint32_t max_inflight_ops, int socket_id) + uint32_t max_inflight_ops, int numa_id) { struct zipvf_qp *qp = NULL; struct zip_vf *vf; @@ -406,8 +406,8 @@ zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, dev->data->dev_id, qp_id); /* Allocate the queue pair data structure. */ - qp = rte_zmalloc_socket(name, sizeof(*qp), - RTE_CACHE_LINE_SIZE, socket_id); + qp = rte_zmalloc_numa(name, sizeof(*qp), + RTE_CACHE_LINE_SIZE, numa_id); if (qp == NULL) { rte_free(name); return (-ENOMEM); @@ -417,7 +417,7 @@ zip_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, /* Create completion queue up to max_inflight_ops */ qp->processed_pkts = zip_pmd_qp_create_processed_pkts_ring(qp, - max_inflight_ops, socket_id); + max_inflight_ops, numa_id); if (qp->processed_pkts == NULL) goto qp_setup_cleanup; @@ -629,7 +629,7 @@ zip_pci_probe(struct rte_pci_driver *pci_drv __rte_unused, struct rte_compressdev *compressdev; struct rte_compressdev_pmd_init_params init_params = { "", - rte_socket_id(), + rte_numa_id(), }; ZIP_PMD_INFO("vendor_id=0x%x device_id=0x%x", -- 2.55.0
