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/openssl/rte_openssl_pmd.c | 4 ++-- drivers/crypto/openssl/rte_openssl_pmd_ops.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index 1b33470c8f..c105d6a263 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -4218,7 +4218,7 @@ cryptodev_openssl_probe(struct rte_vdev_device *vdev) struct rte_cryptodev_pmd_init_params init_params = { "", sizeof(struct openssl_private), - rte_socket_id(), + rte_numa_id(), RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS }; const char *name; @@ -4265,7 +4265,7 @@ RTE_PMD_REGISTER_VDEV(CRYPTODEV_NAME_OPENSSL_PMD, cryptodev_openssl_pmd_drv); RTE_PMD_REGISTER_PARAM_STRING(CRYPTODEV_NAME_OPENSSL_PMD, "max_nb_queue_pairs=<int> " - "socket_id=<int>"); + "numa_id=<int>"); RTE_PMD_REGISTER_CRYPTO_DRIVER(openssl_crypto_drv, cryptodev_openssl_pmd_drv.driver, cryptodev_driver_id); RTE_LOG_REGISTER_DEFAULT(openssl_logtype_driver, INFO); diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c index d3718c28e4..d6a2dfb549 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c +++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c @@ -1080,7 +1080,7 @@ openssl_pmd_qp_set_unique_name(struct rte_cryptodev *dev, /** Create a ring to place processed operations on */ static struct rte_ring * openssl_pmd_qp_create_processed_ops_ring(struct openssl_qp *qp, - unsigned int ring_size, int socket_id) + unsigned int ring_size, int numa_id) { struct rte_ring *r; @@ -1099,7 +1099,7 @@ openssl_pmd_qp_create_processed_ops_ring(struct openssl_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); } @@ -1108,7 +1108,7 @@ openssl_pmd_qp_create_processed_ops_ring(struct openssl_qp *qp, static int openssl_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 openssl_qp *qp = NULL; @@ -1117,8 +1117,8 @@ openssl_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, openssl_pmd_qp_release(dev, qp_id); /* Allocate the queue pair data structure. */ - qp = rte_zmalloc_socket("OPENSSL PMD Queue Pair", sizeof(*qp), - RTE_CACHE_LINE_SIZE, socket_id); + qp = rte_zmalloc_numa("OPENSSL PMD Queue Pair", sizeof(*qp), + RTE_CACHE_LINE_SIZE, numa_id); if (qp == NULL) return -ENOMEM; @@ -1129,7 +1129,7 @@ openssl_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, goto qp_setup_cleanup; qp->processed_ops = openssl_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
