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/crypto/armv8/rte_armv8_pmd.c | 6 +++--- drivers/crypto/armv8/rte_armv8_pmd_ops.c | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/crypto/armv8/rte_armv8_pmd.c b/drivers/crypto/armv8/rte_armv8_pmd.c index 582dbadbdd..86378ddf4d 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd.c +++ b/drivers/crypto/armv8/rte_armv8_pmd.c @@ -807,7 +807,7 @@ cryptodev_armv8_crypto_init(struct rte_vdev_device *vdev) struct rte_cryptodev_pmd_init_params init_params = { "", sizeof(struct armv8_crypto_private), - rte_socket_id(), + rte_numa_id(), RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS }; const char *name; @@ -835,7 +835,7 @@ cryptodev_armv8_crypto_uninit(struct rte_vdev_device *vdev) ARMV8_CRYPTO_LOG_INFO( "Closing ARMv8 crypto device %s on numa socket %u", - name, rte_socket_id()); + name, rte_numa_id()); cryptodev = rte_cryptodev_pmd_get_named_dev(name); if (cryptodev == NULL) @@ -857,6 +857,6 @@ RTE_LOG_REGISTER_DEFAULT(crypto_armv8_log_type, ERR); RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_ARMV8_PMD, armv8_crypto_pmd_drv); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_ARMV8_PMD, "max_nb_queue_pairs=<int> " - "socket_id=<int>"); + "numa_id=<int>"); RTE_PMD_REGISTER_CRYPTO_DRIVER(armv8_crypto_drv, armv8_crypto_pmd_drv.driver, cryptodev_driver_id); diff --git a/drivers/crypto/armv8/rte_armv8_pmd_ops.c b/drivers/crypto/armv8/rte_armv8_pmd_ops.c index c4964bc112..7d78ac94b9 100644 --- a/drivers/crypto/armv8/rte_armv8_pmd_ops.c +++ b/drivers/crypto/armv8/rte_armv8_pmd_ops.c @@ -190,7 +190,7 @@ armv8_crypto_pmd_qp_set_unique_name(struct rte_cryptodev *dev, /** Create a ring to place processed operations on */ static struct rte_ring * armv8_crypto_pmd_qp_create_processed_ops_ring(struct armv8_crypto_qp *qp, - unsigned int ring_size, int socket_id) + unsigned int ring_size, int numa_id) { struct rte_ring *r; @@ -209,7 +209,7 @@ armv8_crypto_pmd_qp_create_processed_ops_ring(struct armv8_crypto_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_SP_ENQ | RING_F_SC_DEQ); } @@ -218,7 +218,7 @@ armv8_crypto_pmd_qp_create_processed_ops_ring(struct armv8_crypto_qp *qp, static int armv8_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, const struct rte_cryptodev_qp_conf *qp_conf, - int socket_id) + int numa_id) { struct armv8_crypto_qp *qp = NULL; @@ -227,8 +227,8 @@ armv8_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, armv8_crypto_pmd_qp_release(dev, qp_id); /* Allocate the queue pair data structure. */ - qp = rte_zmalloc_socket("ARMv8 PMD Queue Pair", sizeof(*qp), - RTE_CACHE_LINE_SIZE, socket_id); + qp = rte_zmalloc_numa("ARMv8 PMD Queue Pair", sizeof(*qp), + RTE_CACHE_LINE_SIZE, numa_id); if (qp == NULL) return -ENOMEM; @@ -239,7 +239,7 @@ armv8_crypto_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, goto qp_setup_cleanup; qp->processed_ops = armv8_crypto_pmd_qp_create_processed_ops_ring(qp, - qp_conf->nb_descriptors, socket_id); + qp_conf->nb_descriptors, numa_id); if (qp->processed_ops == NULL) goto qp_setup_cleanup; -- 2.55.0
