[PATCH 071/227] crypto/mlx5: use NUMA node terminology

Chengwen Feng chengwen.feng at linux.dev
Tue Nov 3 15:50:29 CET 2026


From: Chengwen Feng <fengchengwen at huawei.com>

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 <fengchengwen at huawei.com>
---
 drivers/crypto/mlx5/mlx5_crypto.c     |  2 +-
 drivers/crypto/mlx5/mlx5_crypto_gcm.c | 16 ++++++++--------
 drivers/crypto/mlx5/mlx5_crypto_xts.c | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/crypto/mlx5/mlx5_crypto.c b/drivers/crypto/mlx5/mlx5_crypto.c
index 821dd54b31..c668b2d04a 100644
--- a/drivers/crypto/mlx5/mlx5_crypto.c
+++ b/drivers/crypto/mlx5/mlx5_crypto.c
@@ -353,7 +353,7 @@ mlx5_crypto_dev_probe(struct mlx5_common_device *cdev,
 	struct rte_cryptodev_pmd_init_params init_params = {
 		.name = "",
 		.private_data_size = sizeof(struct mlx5_crypto_priv),
-		.socket_id = cdev->dev->numa_node,
+		.numa_id = cdev->dev->numa_node,
 		.max_nb_queue_pairs =
 				RTE_CRYPTODEV_PMD_DEFAULT_MAX_NB_QUEUE_PAIRS,
 	};
diff --git a/drivers/crypto/mlx5/mlx5_crypto_gcm.c b/drivers/crypto/mlx5/mlx5_crypto_gcm.c
index d0f01dab4a..078162e7b4 100644
--- a/drivers/crypto/mlx5/mlx5_crypto_gcm.c
+++ b/drivers/crypto/mlx5/mlx5_crypto_gcm.c
@@ -264,7 +264,7 @@ mlx5_crypto_gcm_init_qp(struct mlx5_crypto_qp *qp)
 
 static inline int
 mlx5_crypto_gcm_umr_qp_setup(struct rte_cryptodev *dev, struct mlx5_crypto_qp *qp,
-			     int socket_id)
+			     int numa_id)
 {
 	struct mlx5_crypto_priv *priv = dev->data->dev_private;
 	struct mlx5_devx_qp_attr attr = {0};
@@ -284,7 +284,7 @@ mlx5_crypto_gcm_umr_qp_setup(struct rte_cryptodev *dev, struct mlx5_crypto_qp *q
 	attr.cd_master = 1;
 	ret = mlx5_devx_qp_create(priv->cdev->ctx, &qp->umr_qp_obj,
 				  attr.num_of_send_wqbbs * MLX5_SEND_WQE_BB,
-				  &attr, socket_id);
+				  &attr, numa_id);
 	if (ret) {
 		DRV_LOG(ERR, "Failed to create UMR QP.");
 		return -1;
@@ -301,7 +301,7 @@ mlx5_crypto_gcm_umr_qp_setup(struct rte_cryptodev *dev, struct mlx5_crypto_qp *q
 static int
 mlx5_crypto_gcm_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 mlx5_crypto_priv *priv = dev->data->dev_private;
 	struct mlx5_hca_attr *attr = &priv->cdev->config.hca_attr;
@@ -332,8 +332,8 @@ mlx5_crypto_gcm_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 	alloc_size = RTE_ALIGN(alloc_size, RTE_CACHE_LINE_SIZE);
 	alloc_size += (sizeof(struct rte_crypto_op *) +
 		       extra_obj_size) * entries;
-	qp = rte_zmalloc_socket(__func__, alloc_size, RTE_CACHE_LINE_SIZE,
-				socket_id);
+	qp = rte_zmalloc_numa(__func__, alloc_size, RTE_CACHE_LINE_SIZE,
+				numa_id);
 	if (qp == NULL) {
 		DRV_LOG(ERR, "Failed to allocate qp memory.");
 		rte_errno = ENOMEM;
@@ -377,7 +377,7 @@ mlx5_crypto_gcm_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 	qp->cq_entries_n = rte_align32pow2(entries * (mlx5_crypto_is_ipsec_opt(priv) ? 1 : 3));
 	ret = mlx5_devx_cq_create(priv->cdev->ctx, &qp->cq_obj,
 				  rte_log2_u32(qp->cq_entries_n),
-				  &cq_attr, socket_id);
+				  &cq_attr, numa_id);
 	if (ret != 0) {
 		DRV_LOG(ERR, "Failed to create CQ.");
 		goto err;
@@ -391,7 +391,7 @@ mlx5_crypto_gcm_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 	qp_attr.cd_slave_send = !mlx5_crypto_is_ipsec_opt(priv);
 	ret = mlx5_devx_qp_create(priv->cdev->ctx, &qp->qp_obj,
 				  qp_attr.num_of_send_wqbbs * MLX5_WQE_SIZE,
-				  &qp_attr, socket_id);
+				  &qp_attr, numa_id);
 	if (ret != 0) {
 		DRV_LOG(ERR, "Failed to create QP.");
 		goto err;
@@ -403,7 +403,7 @@ mlx5_crypto_gcm_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 	qp->ops = (struct rte_crypto_op **)(qp + 1);
 	if (!mlx5_crypto_is_ipsec_opt(priv)) {
 		qp->mkey = (struct mlx5_devx_obj **)(qp->ops + entries);
-		if (mlx5_crypto_gcm_umr_qp_setup(dev, qp, socket_id)) {
+		if (mlx5_crypto_gcm_umr_qp_setup(dev, qp, numa_id)) {
 			DRV_LOG(ERR, "Failed to setup UMR QP.");
 			goto err;
 		}
diff --git a/drivers/crypto/mlx5/mlx5_crypto_xts.c b/drivers/crypto/mlx5/mlx5_crypto_xts.c
index badde267a7..26b2bcbe1c 100644
--- a/drivers/crypto/mlx5/mlx5_crypto_xts.c
+++ b/drivers/crypto/mlx5/mlx5_crypto_xts.c
@@ -460,7 +460,7 @@ mlx5_crypto_gcm_mkey_klm_update(struct mlx5_crypto_priv *priv,
 static int
 mlx5_crypto_xts_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 				 const struct rte_cryptodev_qp_conf *qp_conf,
-				 int socket_id)
+				 int numa_id)
 {
 	struct mlx5_crypto_priv *priv = dev->data->dev_private;
 	struct mlx5_devx_qp_attr attr = {0};
@@ -486,15 +486,15 @@ mlx5_crypto_xts_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 	alloc_size += (sizeof(struct rte_crypto_op *) +
 		       sizeof(struct mlx5_devx_obj *)) *
 		       (size_t)RTE_BIT32(log_nb_desc);
-	qp = rte_zmalloc_socket(__func__, alloc_size, RTE_CACHE_LINE_SIZE,
-				socket_id);
+	qp = rte_zmalloc_numa(__func__, alloc_size, RTE_CACHE_LINE_SIZE,
+				numa_id);
 	if (qp == NULL) {
 		DRV_LOG(ERR, "Failed to allocate QP memory.");
 		rte_errno = ENOMEM;
 		return -rte_errno;
 	}
 	if (mlx5_devx_cq_create(priv->cdev->ctx, &qp->cq_obj, log_nb_desc,
-				&cq_attr, socket_id) != 0) {
+				&cq_attr, numa_id) != 0) {
 		DRV_LOG(ERR, "Failed to create CQ.");
 		goto error;
 	}
@@ -509,7 +509,7 @@ mlx5_crypto_xts_queue_pair_setup(struct rte_cryptodev *dev, uint16_t qp_id,
 		mlx5_ts_format_conv(priv->cdev->config.hca_attr.qp_ts_format);
 	ret = mlx5_devx_qp_create(priv->cdev->ctx, &qp->qp_obj,
 					attr.num_of_send_wqbbs * MLX5_WQE_SIZE,
-					&attr, socket_id);
+					&attr, numa_id);
 	if (ret) {
 		DRV_LOG(ERR, "Failed to create QP.");
 		goto error;
-- 
2.55.0



More information about the dev mailing list