d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

common/mlx5: convert data path objects to unified malloc

Browse Source 
This commit allocates the data path object page and B-tree table memory
from unified malloc function with explicit flag MLX5_MEM_RTE.

Signed-off-by: Suanming Mou <suanmingm@mellanox.com>
Acked-by: Matan Azrad <matan@mellanox.com>
This commit is contained in:
Suanming Mou 2020-06-28 16:36:15 +08:00 committed by Ferruh Yigit
parent 66914d19d1
commit fd970a5475
2 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/common/mlx5/mlx5_common.c
View File

@ -13,6 +13,7 @@
#include "mlx5_common.h"
#include "mlx5_common_os.h"
#include "mlx5_common_utils.h"
#include "mlx5_malloc.h"
int mlx5_common_logtype;
@ -165,8 +166,9 @@ mlx5_alloc_dbr_page(void *ctx)
struct mlx5_devx_dbr_page *page;
/* Allocate space for door-bell page and management data. */
page = rte_calloc_socket(__func__, 1, sizeof(struct mlx5_devx_dbr_page),
RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
page = mlx5_malloc(MLX5_MEM_RTE | MLX5_MEM_ZERO,
sizeof(struct mlx5_devx_dbr_page),
RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
if (!page) {
DRV_LOG(ERR, "cannot allocate dbr page");
return NULL;
@ -176,7 +178,7 @@ mlx5_alloc_dbr_page(void *ctx)
MLX5_DBR_PAGE_SIZE, 0);
if (!page->umem) {
DRV_LOG(ERR, "cannot umem reg dbr page");
rte_free(page);
mlx5_free(page);
return NULL;
}
return page;
@ -257,7 +259,7 @@ mlx5_release_dbr(struct mlx5_dbr_page_list *head, uint32_t umem_id,
LIST_REMOVE(page, next);
if (page->umem)
ret = -mlx5_glue->devx_umem_dereg(page->umem);
rte_free(page);
mlx5_free(page);
} else {
/* Mark in bitmap that this door-bell is not in use. */
offset /= MLX5_DBR_SIZE;

31
drivers/common/mlx5/mlx5_common_mr.c
View File

@ -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));
}
@ -443,7 +445,7 @@ mr_free(struct mlx5_mr *mr, mlx5_dereg_mr_t dereg_mr_cb)
dereg_mr_cb(&mr->pmd_mr);
if (mr->ms_bmp != NULL)
rte_bitmap_free(mr->ms_bmp);
rte_free(mr);
mlx5_free(mr);
}
void
@ -650,11 +652,9 @@ mlx5_mr_create_primary(void *pd,
(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);
@ -1033,10 +1033,9 @@ mlx5_create_mr_ext(void *pd, uintptr_t addr, size_t len, int socket_id,
{
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;
reg_mr_cb(pd, (void *)addr, len, &mr->pmd_mr);
@ -1044,7 +1043,7 @@ mlx5_create_mr_ext(void *pd, uintptr_t addr, size_t len, int socket_id,
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. */