eal: fix PRNG init with HPET enabled

[dpdk.git] / lib / librte_eal / common / malloc_elem.c

diff --git a/lib/librte_eal/common/malloc_elem.c b/lib/librte_eal/common/malloc_elem.c
index d54a528..885d004 100644 (file)
--- a/lib/librte_eal/common/malloc_elem.c
+++ b/lib/librte_eal/common/malloc_elem.c
@@ -23,6 +23,17 @@
 #include "malloc_elem.h"
 #include "malloc_heap.h"
 
+/*
+ * If debugging is enabled, freed memory is set to poison value
+ * to catch buggy programs. Otherwise, freed memory is set to zero
+ * to avoid having to zero in zmalloc
+ */
+#ifdef RTE_MALLOC_DEBUG
+#define MALLOC_POISON         0x6b
+#else
+#define MALLOC_POISON         0
+#endif
+
 size_t
 malloc_elem_find_max_iova_contig(struct malloc_elem *elem, size_t align)
 {
@@ -296,6 +307,11 @@ split_elem(struct malloc_elem *elem, struct malloc_elem *split_pt)
        elem->next = split_pt;
        elem->size = old_elem_size;
        set_trailer(elem);
+       if (elem->pad) {
+               /* Update inner padding inner element size. */
+               elem = RTE_PTR_ADD(elem, elem->pad);
+               elem->size = old_elem_size - elem->pad;
+       }
 }
 
 /*
@@ -471,6 +487,10 @@ join_elem(struct malloc_elem *elem1, struct malloc_elem *elem2)
        else
                elem1->heap->last = elem1;
        elem1->next = next;
+       if (elem1->pad) {
+               struct malloc_elem *inner = RTE_PTR_ADD(elem1, elem1->pad);
+               inner->size = elem1->size - elem1->pad;
+       }
 }
 
 struct malloc_elem *
@@ -494,7 +514,7 @@ malloc_elem_join_adjacent_free(struct malloc_elem *elem)
                join_elem(elem, elem->next);
 
                /* erase header, trailer and pad */
-               memset(erase, 0, erase_len);
+               memset(erase, MALLOC_POISON, erase_len);
        }
 
        /*
@@ -518,7 +538,7 @@ malloc_elem_join_adjacent_free(struct malloc_elem *elem)
                join_elem(new_elem, elem);
 
                /* erase header, trailer and pad */
-               memset(erase, 0, erase_len);
+               memset(erase, MALLOC_POISON, erase_len);
 
                elem = new_elem;
        }
@@ -549,7 +569,8 @@ malloc_elem_free(struct malloc_elem *elem)
        /* decrease heap's count of allocated elements */
        elem->heap->alloc_count--;
 
-       memset(ptr, 0, data_len);
+       /* poison memory */
+       memset(ptr, MALLOC_POISON, data_len);
 
        return elem;
 }