common/mlx5: fix mempool registration

[dpdk.git] / drivers / common / mlx5 / mlx5_common_mp.c

diff --git a/drivers/common/mlx5/mlx5_common_mp.c b/drivers/common/mlx5/mlx5_common_mp.c
index da55143..a7a671b 100644 (file)
--- a/drivers/common/mlx5/mlx5_common_mp.c
+++ b/drivers/common/mlx5/mlx5_common_mp.c
@@ -10,13 +10,14 @@
 #include <rte_errno.h>
 
 #include "mlx5_common_mp.h"
-#include "mlx5_common_utils.h"
+#include "mlx5_common_log.h"
+#include "mlx5_malloc.h"
 
 /**
  * Request Memory Region creation to the primary process.
  *
- * @param[in] mp_id
- *   ID of the MP process.
+ * @param cdev
+ *   Pointer to the mlx5 common device.
  * @param addr
  *   Target virtual address to register.
  *
@@ -24,23 +25,71 @@
  *   0 on success, a negative errno value otherwise and rte_errno is set.
  */
 int
-mlx5_mp_req_mr_create(struct mlx5_mp_id *mp_id, uintptr_t addr)
+mlx5_mp_req_mr_create(struct mlx5_common_device *cdev, uintptr_t addr)
 {
        struct rte_mp_msg mp_req;
        struct rte_mp_msg *mp_res;
        struct rte_mp_reply mp_rep;
        struct mlx5_mp_param *req = (struct mlx5_mp_param *)mp_req.param;
+       struct mlx5_mp_arg_mr_manage *arg = &req->args.mr_manage;
        struct mlx5_mp_param *res;
        struct timespec ts = {.tv_sec = MLX5_MP_REQ_TIMEOUT_SEC, .tv_nsec = 0};
        int ret;
 
        MLX5_ASSERT(rte_eal_process_type() == RTE_PROC_SECONDARY);
-       mp_init_msg(mp_id, &mp_req, MLX5_MP_REQ_CREATE_MR);
-       req->args.addr = addr;
+       mp_init_port_agnostic_msg(&mp_req, MLX5_MP_REQ_CREATE_MR);
+       arg->addr = addr;
+       arg->cdev = cdev;
        ret = rte_mp_request_sync(&mp_req, &mp_rep, &ts);
        if (ret) {
-               DRV_LOG(ERR, "port %u request to primary process failed",
-                       mp_id->port_id);
+               DRV_LOG(ERR, "Create MR request to primary process failed.");
+               return -rte_errno;
+       }
+       MLX5_ASSERT(mp_rep.nb_received == 1);
+       mp_res = &mp_rep.msgs[0];
+       res = (struct mlx5_mp_param *)mp_res->param;
+       ret = res->result;
+       if (ret)
+               rte_errno = -ret;
+       mlx5_free(mp_rep.msgs);
+       return ret;
+}
+
+/**
+ * @param cdev
+ *   Pointer to the mlx5 common device.
+ * @param mempool
+ *   Mempool to register or unregister.
+ * @param reg
+ *   True to register the mempool, False to unregister.
+ */
+int
+mlx5_mp_req_mempool_reg(struct mlx5_common_device *cdev,
+                       struct rte_mempool *mempool, bool reg,
+                       bool is_extmem)
+{
+       struct rte_mp_msg mp_req;
+       struct rte_mp_msg *mp_res;
+       struct rte_mp_reply mp_rep;
+       struct mlx5_mp_param *req = (struct mlx5_mp_param *)mp_req.param;
+       struct mlx5_mp_arg_mr_manage *arg = &req->args.mr_manage;
+       struct mlx5_mp_param *res;
+       struct timespec ts = {.tv_sec = MLX5_MP_REQ_TIMEOUT_SEC, .tv_nsec = 0};
+       enum mlx5_mp_req_type type;
+       int ret;
+
+       MLX5_ASSERT(rte_eal_process_type() == RTE_PROC_SECONDARY);
+       type = reg ? MLX5_MP_REQ_MEMPOOL_REGISTER :
+                    MLX5_MP_REQ_MEMPOOL_UNREGISTER;
+       mp_init_port_agnostic_msg(&mp_req, type);
+       arg->mempool = mempool;
+       arg->is_extmem = is_extmem;
+       arg->cdev = cdev;
+       ret = rte_mp_request_sync(&mp_req, &mp_rep, &ts);
+       if (ret) {
+               DRV_LOG(ERR,
+                       "Mempool %sregister request to primary process failed.",
+                       reg ? "" : "un");
                return -rte_errno;
        }
        MLX5_ASSERT(mp_rep.nb_received == 1);
@@ -49,7 +98,7 @@ mlx5_mp_req_mr_create(struct mlx5_mp_id *mp_id, uintptr_t addr)
        ret = res->result;
        if (ret)
                rte_errno = -ret;
-       free(mp_rep.msgs);
+       mlx5_free(mp_rep.msgs);
        return ret;
 }
 
@@ -89,7 +138,7 @@ mlx5_mp_req_queue_state_modify(struct mlx5_mp_id *mp_id,
        mp_res = &mp_rep.msgs[0];
        res = (struct mlx5_mp_param *)mp_res->param;
        ret = res->result;
-       free(mp_rep.msgs);
+       mlx5_free(mp_rep.msgs);
        return ret;
 }
 
@@ -136,7 +185,7 @@ mlx5_mp_req_verbs_cmd_fd(struct mlx5_mp_id *mp_id)
        DRV_LOG(DEBUG, "port %u command FD from primary is %d",
                mp_id->port_id, ret);
 exit:
-       free(mp_rep.msgs);
+       mlx5_free(mp_rep.msgs);
        return ret;
 }