common/mlx5/linux: replace malloc and free in glue

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

diff --git a/drivers/common/mlx5/mlx5_common_mr.c b/drivers/common/mlx5/mlx5_common_mr.c
index 4ce7975..23324c0 100644 (file)
--- a/drivers/common/mlx5/mlx5_common_mr.c
+++ b/drivers/common/mlx5/mlx5_common_mr.c
@@ -12,6 +12,7 @@
 #include "mlx5_common_mp.h"
 #include "mlx5_common_mr.h"
 #include "mlx5_common_utils.h"
+#include "mlx5_malloc.h"
 
 struct mr_find_contig_memsegs_data {
        uintptr_t addr;
@@ -47,7 +48,8 @@ mr_btree_expand(struct mlx5_mr_btree *bt, int n)
         * Initially cache_bh[] will be given practically enough space and once
         * it is expanded, expansion wouldn't be needed again ever.
         */
-       mem = rte_realloc(bt->table, n * sizeof(struct mr_cache_entry), 0);
+       mem = mlx5_realloc(bt->table, MLX5_MEM_RTE | MLX5_MEM_ZERO,
+                          n * sizeof(struct mr_cache_entry), 0, SOCKET_ID_ANY);
        if (mem == NULL) {
                /* Not an error, B-tree search will be skipped. */
                DRV_LOG(WARNING, "failed to expand MR B-tree (%p) table",
@@ -180,9 +182,9 @@ mlx5_mr_btree_init(struct mlx5_mr_btree *bt, int n, int socket)
        }
        MLX5_ASSERT(!bt->table && !bt->size);
        memset(bt, 0, sizeof(*bt));
-       bt->table = rte_calloc_socket("B-tree table",
-                                     n, sizeof(struct mr_cache_entry),
-                                     0, socket);
+       bt->table = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO,
+                               sizeof(struct mr_cache_entry) * n,
+                               0, socket);
        if (bt->table == NULL) {
                rte_errno = ENOMEM;
                DEBUG("failed to allocate memory for btree cache on socket %d",
@@ -212,7 +214,7 @@ mlx5_mr_btree_free(struct mlx5_mr_btree *bt)
                return;
        DEBUG("freeing B-tree %p with table %p",
              (void *)bt, (void *)bt->table);
-       rte_free(bt->table);
+       mlx5_free(bt->table);
        memset(bt, 0, sizeof(*bt));
 }
 
@@ -435,15 +437,15 @@ mlx5_mr_lookup_cache(struct mlx5_mr_share_cache *share_cache,
  *   Pointer to MR to free.
  */
 static void
-mr_free(struct mlx5_mr *mr)
+mr_free(struct mlx5_mr *mr, mlx5_dereg_mr_t dereg_mr_cb)
 {
        if (mr == NULL)
                return;
        DRV_LOG(DEBUG, "freeing MR(%p):", (void *)mr);
-       mlx5_common_verbs_dereg_mr(&mr->pmd_mr);
+       dereg_mr_cb(&mr->pmd_mr);
        if (mr->ms_bmp != NULL)
                rte_bitmap_free(mr->ms_bmp);
-       rte_free(mr);
+       mlx5_free(mr);
 }
 
 void
@@ -490,7 +492,7 @@ mlx5_mr_garbage_collect(struct mlx5_mr_share_cache *share_cache)
                struct mlx5_mr *mr = mr_next;
 
                mr_next = LIST_NEXT(mr, mr);
-               mr_free(mr);
+               mr_free(mr, share_cache->dereg_mr_cb);
        }
 }
 
@@ -650,11 +652,9 @@ alloc_resources:
              (void *)addr, data.start, data.end, msl->page_sz, ms_n);
        /* Size of memory for bitmap. */
        bmp_size = rte_bitmap_get_memory_footprint(ms_n);
-       mr = rte_zmalloc_socket(NULL,
-                               RTE_ALIGN_CEIL(sizeof(*mr),
-                                              RTE_CACHE_LINE_SIZE) +
-                               bmp_size,
-                               RTE_CACHE_LINE_SIZE, msl->socket_id);
+       mr = mlx5_malloc(MLX5_MEM_RTE |  MLX5_MEM_ZERO,
+                        RTE_ALIGN_CEIL(sizeof(*mr), RTE_CACHE_LINE_SIZE) +
+                        bmp_size, RTE_CACHE_LINE_SIZE, msl->socket_id);
        if (mr == NULL) {
                DEBUG("Unable to allocate memory for a new MR of"
                      " address (%p).", (void *)addr);
@@ -702,7 +702,7 @@ alloc_resources:
                data.start = RTE_ALIGN_FLOOR(addr, msl->page_sz);
                data.end = data.start + msl->page_sz;
                rte_mcfg_mem_read_unlock();
-               mr_free(mr);
+               mr_free(mr, share_cache->dereg_mr_cb);
                goto alloc_resources;
        }
        MLX5_ASSERT(data.msl == data_re.msl);
@@ -725,7 +725,7 @@ alloc_resources:
                 * Must be unlocked before calling rte_free() because
                 * mlx5_mr_mem_event_free_cb() can be called inside.
                 */
-               mr_free(mr);
+               mr_free(mr, share_cache->dereg_mr_cb);
                return entry->lkey;
        }
        /*
@@ -760,12 +760,12 @@ alloc_resources:
        mr->ms_bmp_n = len / msl->page_sz;
        MLX5_ASSERT(ms_idx_shift + mr->ms_bmp_n <= ms_n);
        /*
-        * Finally create a verbs MR for the memory chunk. ibv_reg_mr() can be
-        * called with holding the memory lock because it doesn't use
+        * Finally create an MR for the memory chunk. Verbs: ibv_reg_mr() can
+        * be called with holding the memory lock because it doesn't use
         * mlx5_alloc_buf_extern() which eventually calls rte_malloc_socket()
         * through mlx5_alloc_verbs_buf().
         */
-       mlx5_common_verbs_reg_mr(pd, (void *)data.start, len, &mr->pmd_mr);
+       share_cache->reg_mr_cb(pd, (void *)data.start, len, &mr->pmd_mr);
        if (mr->pmd_mr.obj == NULL) {
                DEBUG("Fail to create an MR for address (%p)",
                      (void *)addr);
@@ -801,7 +801,7 @@ err_nolock:
         * calling rte_free() because mlx5_mr_mem_event_free_cb() can be called
         * inside.
         */
-       mr_free(mr);
+       mr_free(mr, share_cache->dereg_mr_cb);
        return UINT32_MAX;
 }
 
@@ -1028,22 +1028,22 @@ mlx5_mr_flush_local_cache(struct mlx5_mr_ctrl *mr_ctrl)
  *   Pointer to MR structure on success, NULL otherwise.
  */
 struct mlx5_mr *
-mlx5_create_mr_ext(void *pd, uintptr_t addr, size_t len, int socket_id)
+mlx5_create_mr_ext(void *pd, uintptr_t addr, size_t len, int socket_id,
+                  mlx5_reg_mr_t reg_mr_cb)
 {
        struct mlx5_mr *mr = NULL;
 
-       mr = rte_zmalloc_socket(NULL,
-                               RTE_ALIGN_CEIL(sizeof(*mr),
-                                              RTE_CACHE_LINE_SIZE),
-                               RTE_CACHE_LINE_SIZE, socket_id);
+       mr = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO,
+                        RTE_ALIGN_CEIL(sizeof(*mr), RTE_CACHE_LINE_SIZE),
+                        RTE_CACHE_LINE_SIZE, socket_id);
        if (mr == NULL)
                return NULL;
-       mlx5_common_verbs_reg_mr(pd, (void *)addr, len, &mr->pmd_mr);
+       reg_mr_cb(pd, (void *)addr, len, &mr->pmd_mr);
        if (mr->pmd_mr.obj == NULL) {
                DRV_LOG(WARNING,
                        "Fail to create MR for address (%p)",
                        (void *)addr);
-               rte_free(mr);
+               mlx5_free(mr);
                return NULL;
        }
        mr->msl = NULL; /* Mark it is external memory. */