net/mlx5: fix memory socket selection in ASO management

In ASO objects creation (WQE, CQE and MR), socket number is given as
a parameter.

The selection was wrongly socket 0 hardcoded even if the user didn't
configure memory for this socket.

This patch replaces the selection to default socket (SOCKET_ID_ANY).

Fixes: f935ed4b645a ("net/mlx5: support flow hit action for aging")
Cc: stable@dpdk.org
Signed-off-by: Michael Baum <michaelba@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>

diff --git a/drivers/net/mlx5/mlx5_flow_aso.c b/drivers/net/mlx5/mlx5_flow_aso.c
index ddf4328dec27f9e45c6a63c5e48ad1da73d4520b..eb7fc43da34d84b4f43cd4d55398c1408f1c8ffd 100644 (file)
--- a/drivers/net/mlx5/mlx5_flow_aso.c
+++ b/drivers/net/mlx5/mlx5_flow_aso.c
@@ -13,50 +13,6 @@
 #include "mlx5.h"
 #include "mlx5_flow.h"
 
-/**
- * Destroy Completion Queue used for ASO access.
- *
- * @param[in] cq
- *   ASO CQ to destroy.
- */
-static void
-mlx5_aso_cq_destroy(struct mlx5_aso_cq *cq)
-{
-       if (cq->cq_obj.cq)
-               mlx5_devx_cq_destroy(&cq->cq_obj);
-       memset(cq, 0, sizeof(*cq));
-}
-
-/**
- * Create Completion Queue used for ASO access.
- *
- * @param[in] ctx
- *   Context returned from mlx5 open_device() glue function.
- * @param[in/out] cq
- *   Pointer to CQ to create.
- * @param[in] log_desc_n
- *   Log of number of descriptors in queue.
- * @param[in] socket
- *   Socket to use for allocation.
- * @param[in] uar_page_id
- *   UAR page ID to use.
- *
- * @return
- *   0 on success, a negative errno value otherwise and rte_errno is set.
- */
-static int
-mlx5_aso_cq_create(void *ctx, struct mlx5_aso_cq *cq, uint16_t log_desc_n,
-                  int socket, int uar_page_id)
-{
-       struct mlx5_devx_cq_attr attr = {
-               .uar_page_id = uar_page_id,
-       };
-
-       cq->log_desc_n = log_desc_n;
-       cq->cq_ci = 0;
-       return mlx5_devx_cq_create(ctx, &cq->cq_obj, log_desc_n, &attr, socket);
-}
-
 /**
  * Free MR resources.
  *
@@ -84,21 +40,18 @@ mlx5_aso_dereg_mr(struct mlx5_common_device *cdev, struct mlx5_pmd_mr *mr)
  *   Size of MR buffer.
  * @param[in/out] mr
  *   Pointer to MR to create.
- * @param[in] socket
- *   Socket to use for allocation.
  *
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
 mlx5_aso_reg_mr(struct mlx5_common_device *cdev, size_t length,
-               struct mlx5_pmd_mr *mr, int socket)
+               struct mlx5_pmd_mr *mr)
 {
-
        int ret;
 
        mr->addr = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO, length, 4096,
-                              socket);
+                              SOCKET_ID_ANY);
        if (!mr->addr) {
                DRV_LOG(ERR, "Failed to create ASO bits mem for MR.");
                return -1;
@@ -122,7 +75,7 @@ static void
 mlx5_aso_destroy_sq(struct mlx5_aso_sq *sq)
 {
        mlx5_devx_sq_destroy(&sq->sq_obj);
-       mlx5_aso_cq_destroy(&sq->cq);
+       mlx5_devx_cq_destroy(&sq->cq.cq_obj);
        memset(sq, 0, sizeof(*sq));
 }
 
@@ -226,35 +179,31 @@ mlx5_aso_ct_init_sq(struct mlx5_aso_sq *sq)
 /**
  * Create Send Queue used for ASO access.
  *
- * @param[in] ctx
- *   Context returned from mlx5 open_device() glue function.
+ * @param[in] cdev
+ *   Pointer to the mlx5 common device.
  * @param[in/out] sq
  *   Pointer to SQ to create.
- * @param[in] socket
- *   Socket to use for allocation.
  * @param[in] uar
  *   User Access Region object.
- * @param[in] pdn
- *   Protection Domain number to use.
- * @param[in] log_desc_n
- *   Log of number of descriptors in queue.
- * @param[in] ts_format
- *   timestamp format supported by the queue.
  *
  * @return
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 static int
-mlx5_aso_sq_create(void *ctx, struct mlx5_aso_sq *sq, int socket, void *uar,
-                  uint32_t pdn, uint16_t log_desc_n, uint32_t ts_format)
+mlx5_aso_sq_create(struct mlx5_common_device *cdev, struct mlx5_aso_sq *sq,
+                  void *uar)
 {
-       struct mlx5_devx_create_sq_attr attr = {
+       struct mlx5_devx_cq_attr cq_attr = {
+               .uar_page_id = mlx5_os_get_devx_uar_page_id(uar),
+       };
+       struct mlx5_devx_create_sq_attr sq_attr = {
                .user_index = 0xFFFF,
                .wq_attr = (struct mlx5_devx_wq_attr){
-                       .pd = pdn,
+                       .pd = cdev->pdn,
                        .uar_page = mlx5_os_get_devx_uar_page_id(uar),
                },
-               .ts_format = mlx5_ts_format_conv(ts_format),
+               .ts_format =
+                       mlx5_ts_format_conv(cdev->config.hca_attr.sq_ts_format),
        };
        struct mlx5_devx_modify_sq_attr modify_attr = {
                .state = MLX5_SQC_STATE_RDY,
@@ -262,14 +211,18 @@ mlx5_aso_sq_create(void *ctx, struct mlx5_aso_sq *sq, int socket, void *uar,
        uint16_t log_wqbb_n;
        int ret;
 
-       if (mlx5_aso_cq_create(ctx, &sq->cq, log_desc_n, socket,
-                              mlx5_os_get_devx_uar_page_id(uar)))
+       if (mlx5_devx_cq_create(cdev->ctx, &sq->cq.cq_obj,
+                               MLX5_ASO_QUEUE_LOG_DESC, &cq_attr,
+                               SOCKET_ID_ANY))
                goto error;
-       sq->log_desc_n = log_desc_n;
-       attr.cqn = sq->cq.cq_obj.cq->id;
+       sq->cq.cq_ci = 0;
+       sq->cq.log_desc_n = MLX5_ASO_QUEUE_LOG_DESC;
+       sq->log_desc_n = MLX5_ASO_QUEUE_LOG_DESC;
+       sq_attr.cqn = sq->cq.cq_obj.cq->id;
        /* for mlx5_aso_wqe that is twice the size of mlx5_wqe */
-       log_wqbb_n = log_desc_n + 1;
-       ret = mlx5_devx_sq_create(ctx, &sq->sq_obj, log_wqbb_n, &attr, socket);
+       log_wqbb_n = sq->log_desc_n + 1;
+       ret = mlx5_devx_sq_create(cdev->ctx, &sq->sq_obj, log_wqbb_n, &sq_attr,
+                                 SOCKET_ID_ANY);
        if (ret) {
                DRV_LOG(ERR, "Can't create SQ object.");
                rte_errno = ENOMEM;
@@ -313,34 +266,28 @@ mlx5_aso_queue_init(struct mlx5_dev_ctx_shared *sh,
        switch (aso_opc_mod) {
        case ASO_OPC_MOD_FLOW_HIT:
                if (mlx5_aso_reg_mr(cdev, (MLX5_ASO_AGE_ACTIONS_PER_POOL / 8) *
-                                   sq_desc_n, &sh->aso_age_mng->aso_sq.mr, 0))
+                                   sq_desc_n, &sh->aso_age_mng->aso_sq.mr))
                        return -1;
-               if (mlx5_aso_sq_create(cdev->ctx, &sh->aso_age_mng->aso_sq, 0,
-                                      sh->tx_uar.obj, cdev->pdn,
-                                      MLX5_ASO_QUEUE_LOG_DESC,
-                                      cdev->config.hca_attr.sq_ts_format)) {
+               if (mlx5_aso_sq_create(cdev, &sh->aso_age_mng->aso_sq,
+                                      sh->tx_uar.obj)) {
                        mlx5_aso_dereg_mr(cdev, &sh->aso_age_mng->aso_sq.mr);
                        return -1;
                }
                mlx5_aso_age_init_sq(&sh->aso_age_mng->aso_sq);
                break;
        case ASO_OPC_MOD_POLICER:
-               if (mlx5_aso_sq_create(cdev->ctx, &sh->mtrmng->pools_mng.sq, 0,
-                                      sh->tx_uar.obj, cdev->pdn,
-                                      MLX5_ASO_QUEUE_LOG_DESC,
-                                      cdev->config.hca_attr.sq_ts_format))
+               if (mlx5_aso_sq_create(cdev, &sh->mtrmng->pools_mng.sq,
+                                      sh->tx_uar.obj))
                        return -1;
                mlx5_aso_mtr_init_sq(&sh->mtrmng->pools_mng.sq);
                break;
        case ASO_OPC_MOD_CONNECTION_TRACKING:
                /* 64B per object for query. */
                if (mlx5_aso_reg_mr(cdev, 64 * sq_desc_n,
-                                   &sh->ct_mng->aso_sq.mr, 0))
+                                   &sh->ct_mng->aso_sq.mr))
                        return -1;
-               if (mlx5_aso_sq_create(cdev->ctx, &sh->ct_mng->aso_sq, 0,
-                                      sh->tx_uar.obj, cdev->pdn,
-                                      MLX5_ASO_QUEUE_LOG_DESC,
-                                      cdev->config.hca_attr.sq_ts_format)) {
+               if (mlx5_aso_sq_create(cdev, &sh->ct_mng->aso_sq,
+                                      sh->tx_uar.obj)) {
                        mlx5_aso_dereg_mr(cdev, &sh->ct_mng->aso_sq.mr);
                        return -1;
                }