if rte malloc is called to allocate memory of size
is between multiple of hugepage size minus malloc_header_len
and hugepage size rte_malloc fails to allocate memory.
this fix replaces malloc_elem_trailer_len with
malloc_elem_overhead in try_expand_heap() to include
malloc_elem_header_len when calculating n_seg.

Bugzilla ID: 800

Signed-off-by: Fidaullah Noonari <fidaullah.noon...@emumba.com>
---
 lib/eal/common/malloc_heap.c | 2 +-
 lib/eal/common/malloc_mp.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/eal/common/malloc_heap.c b/lib/eal/common/malloc_heap.c
index a3d26fcbea..27a52266ad 100644
--- a/lib/eal/common/malloc_heap.c
+++ b/lib/eal/common/malloc_heap.c
@@ -403,7 +403,7 @@ try_expand_heap_primary(struct malloc_heap *heap, uint64_t 
pg_sz,
        bool callback_triggered = false;
 
        alloc_sz = RTE_ALIGN_CEIL(align + elt_size +
-                       MALLOC_ELEM_TRAILER_LEN, pg_sz);
+                       MALLOC_ELEM_OVERHEAD, pg_sz);
        n_segs = alloc_sz / pg_sz;
 
        /* we can't know in advance how many pages we'll need, so we malloc */
diff --git a/lib/eal/common/malloc_mp.c b/lib/eal/common/malloc_mp.c
index 207b90847e..2b8eb51067 100644
--- a/lib/eal/common/malloc_mp.c
+++ b/lib/eal/common/malloc_mp.c
@@ -250,7 +250,7 @@ handle_alloc_request(const struct malloc_mp_req *m,
        }
 
        alloc_sz = RTE_ALIGN_CEIL(ar->align + ar->elt_size +
-                       MALLOC_ELEM_TRAILER_LEN, ar->page_sz);
+                       MALLOC_ELEM_OVERHEAD, ar->page_sz);
        n_segs = alloc_sz / ar->page_sz;
 
        /* we can't know in advance how many pages we'll need, so we malloc */
-- 
2.25.1

Reply via email to