In rte_mempool_obj_iter(), when element boundary coincides with page boundary,
even if a single page is required per object, a loop checks that the next page
is contiguous and drops the first one otherwise.
This commit checks subsequent pages only when several are required per object.
Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Reviewed-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
rte_mempool_obj_iter_t obj_iter, void *obj_iter_arg)
{
uint32_t i, j, k;
rte_mempool_obj_iter_t obj_iter, void *obj_iter_arg)
{
uint32_t i, j, k;
uintptr_t end, start, va;
uintptr_t pg_sz;
uintptr_t end, start, va;
uintptr_t pg_sz;
start = RTE_ALIGN_CEIL(va, align);
end = start + elt_sz;
start = RTE_ALIGN_CEIL(va, align);
end = start + elt_sz;
- pgn = (end >> pg_shift) - (start >> pg_shift);
+ /* index of the first page for the next element. */
+ pgf = (end >> pg_shift) - (start >> pg_shift);
+
+ /* index of the last page for the current element. */
+ pgn = ((end - 1) >> pg_shift) - (start >> pg_shift);
- /* do we have enough space left for the next element. */
+ /* do we have enough space left for the element. */
if (pgn >= pg_num)
break;
if (pgn >= pg_num)
break;
obj_iter(obj_iter_arg, (void *)start,
(void *)end, i);
va = end;
obj_iter(obj_iter_arg, (void *)start,
(void *)end, i);
va = end;
i++;
} else {
va = RTE_ALIGN_CEIL((va + 1), pg_sz);
i++;
} else {
va = RTE_ALIGN_CEIL((va + 1), pg_sz);