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/nitrox/nitrox_sym.c | 10 +++++----- drivers/crypto/nitrox/nitrox_sym_reqmgr.c | 4 ++-- drivers/crypto/nitrox/nitrox_sym_reqmgr.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/crypto/nitrox/nitrox_sym.c b/drivers/crypto/nitrox/nitrox_sym.c index 510d6059b1..5f7a37573c 100644 --- a/drivers/crypto/nitrox/nitrox_sym.c +++ b/drivers/crypto/nitrox/nitrox_sym.c @@ -170,7 +170,7 @@ nitrox_sym_dev_stats_reset(struct rte_cryptodev *cdev) static int nitrox_sym_dev_qp_setup(struct rte_cryptodev *cdev, uint16_t qp_id, const struct rte_cryptodev_qp_conf *qp_conf, - int socket_id) + int numa_id) { struct nitrox_sym_device *sym_dev = cdev->data->dev_private; struct nitrox_device *ndev = sym_dev->ndev; @@ -190,9 +190,9 @@ nitrox_sym_dev_qp_setup(struct rte_cryptodev *cdev, uint16_t qp_id, return err; } - qp = rte_zmalloc_socket("nitrox PMD qp", sizeof(*qp), + qp = rte_zmalloc_numa("nitrox PMD qp", sizeof(*qp), RTE_CACHE_LINE_SIZE, - socket_id); + numa_id); if (!qp) { NITROX_LOG_LINE(ERR, "Failed to allocate nitrox qp"); return -ENOMEM; @@ -202,12 +202,12 @@ nitrox_sym_dev_qp_setup(struct rte_cryptodev *cdev, uint16_t qp_id, qp->qno = qp_id; err = nitrox_qp_setup(qp, ndev->bar_addr, cdev->data->name, qp_conf->nb_descriptors, NPS_PKT_IN_INSTR_SIZE, - socket_id); + numa_id); if (unlikely(err)) goto qp_setup_err; qp->sr_mp = nitrox_sym_req_pool_create(cdev, qp->count, qp_id, - socket_id); + numa_id); if (unlikely(!qp->sr_mp)) goto req_pool_err; diff --git a/drivers/crypto/nitrox/nitrox_sym_reqmgr.c b/drivers/crypto/nitrox/nitrox_sym_reqmgr.c index 7751c1a9fc..dd2809935c 100644 --- a/drivers/crypto/nitrox/nitrox_sym_reqmgr.c +++ b/drivers/crypto/nitrox/nitrox_sym_reqmgr.c @@ -888,7 +888,7 @@ req_pool_obj_init(__rte_unused struct rte_mempool *mp, struct rte_mempool * nitrox_sym_req_pool_create(struct rte_cryptodev *cdev, uint32_t nobjs, - uint16_t qp_id, int socket_id) + uint16_t qp_id, int numa_id) { char softreq_pool_name[RTE_RING_NAMESIZE]; struct rte_mempool *mp; @@ -899,7 +899,7 @@ nitrox_sym_req_pool_create(struct rte_cryptodev *cdev, uint32_t nobjs, RTE_ALIGN_MUL_CEIL(nobjs, 64), sizeof(struct nitrox_softreq), 64, 0, NULL, NULL, req_pool_obj_init, NULL, - socket_id, 0); + numa_id, 0); if (unlikely(!mp)) NITROX_LOG_LINE(ERR, "Failed to create req pool, qid %d, err %d", qp_id, rte_errno); diff --git a/drivers/crypto/nitrox/nitrox_sym_reqmgr.h b/drivers/crypto/nitrox/nitrox_sym_reqmgr.h index fa2637bdb8..37e557360f 100644 --- a/drivers/crypto/nitrox/nitrox_sym_reqmgr.h +++ b/drivers/crypto/nitrox/nitrox_sym_reqmgr.h @@ -17,7 +17,7 @@ int nitrox_check_se_req(struct nitrox_softreq *sr, struct rte_crypto_op **op); void *nitrox_sym_instr_addr(struct nitrox_softreq *sr); struct rte_mempool *nitrox_sym_req_pool_create(struct rte_cryptodev *cdev, uint32_t nobjs, uint16_t qp_id, - int socket_id); + int numa_id); void nitrox_sym_req_pool_free(struct rte_mempool *mp); #endif /* _NITROX_SYM_REQMGR_H_ */ -- 2.55.0
