Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize mlx5 mempool get extmem #70

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Optimize mlx5 mempool get extmem #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dac886f
Optimized mlx5_mempool_get_extmem
john-romein Sep 25, 2023
4e262c0
coding style changes
john-romein Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 20 additions & 49 deletions drivers/common/mlx5/mlx5_common_mr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1389,63 +1389,23 @@ mlx5_mempool_get_chunks(struct rte_mempool *mp, struct mlx5_range **out,
return 0;
}

struct mlx5_mempool_get_extmem_data {
struct mlx5_range *heap;
unsigned int heap_size;
int ret;
};

static void
mlx5_mempool_get_extmem_cb(struct rte_mempool *mp, void *opaque,
void *obj, unsigned int obj_idx)
{
struct mlx5_mempool_get_extmem_data *data = opaque;
struct mlx5_range *heap = opaque;
struct rte_mbuf *mbuf = obj;
uintptr_t addr = (uintptr_t)mbuf->buf_addr;
struct mlx5_range *seg, *heap;
struct rte_memseg_list *msl;
size_t page_size;
uintptr_t page_start;
unsigned int pos = 0, len = data->heap_size, delta;

RTE_SET_USED(mp);
RTE_SET_USED(obj_idx);
if (data->ret < 0)
return;
/* Binary search for an already visited page. */
while (len > 1) {
delta = len / 2;
if (addr < data->heap[pos + delta].start) {
len = delta;
} else {
pos += delta;
len -= delta;
}
}
if (data->heap != NULL) {
seg = &data->heap[pos];
if (seg->start <= addr && addr < seg->end)
return;
}
/* Determine the page boundaries and remember them. */
heap = realloc(data->heap, sizeof(heap[0]) * (data->heap_size + 1));
if (heap == NULL) {
free(data->heap);
data->heap = NULL;
data->ret = -1;
return;
}
data->heap = heap;
data->heap_size++;
seg = &heap[data->heap_size - 1];
msl = rte_mem_virt2memseg_list((void *)addr);
page_size = msl != NULL ? msl->page_sz : rte_mem_page_size();
page_start = RTE_PTR_ALIGN_FLOOR(addr, page_size);
seg->start = page_start;
seg->end = page_start + page_size;
/* Maintain the heap order. */
qsort(data->heap, data->heap_size, sizeof(heap[0]),
mlx5_range_compare_start);
heap[obj_idx].start = page_start;
heap[obj_idx].end = page_start + page_size;
}

/**
Expand All @@ -1457,15 +1417,26 @@ static int
mlx5_mempool_get_extmem(struct rte_mempool *mp, struct mlx5_range **out,
unsigned int *out_n)
{
struct mlx5_mempool_get_extmem_data data;
unsigned int out_size = 1;
struct mlx5_range *heap;

DRV_LOG(DEBUG, "Recovering external pinned pages of mempool %s",
mp->name);
memset(&data, 0, sizeof(data));
rte_mempool_obj_iter(mp, mlx5_mempool_get_extmem_cb, &data);
*out = data.heap;
*out_n = data.heap_size;
return data.ret;
heap = malloc(mp->size * sizeof(struct mlx5_range));
if (heap == NULL)
return -1;
rte_mempool_obj_iter(mp, mlx5_mempool_get_extmem_cb, heap);
qsort(heap, mp->size, sizeof(heap[0]), mlx5_range_compare_start);
/* remove duplicates */
for (unsigned int i = 1; i < mp->size; i++)
if (heap[out_size - 1].start != heap[i].start)
heap[out_size++] = heap[i];
heap = realloc(heap, out_size * sizeof(struct mlx5_range));
if (heap == NULL)
return -1;
*out = heap;
*out_n = out_size;
return 0;
}

/**
Expand Down