malloc: move all locking to heap

[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 45ec2a1..ea041e2 100644 (file)
--- a/lib/librte_eal/common/malloc_elem.c
+++ b/lib/librte_eal/common/malloc_elem.c
@@ -69,6 +69,7 @@ elem_start_pt(struct malloc_elem *elem, size_t size, unsigned align,
        if ((new_data_start & bmask) != ((end_pt - 1) & bmask)) {
                end_pt = RTE_ALIGN_FLOOR(end_pt, bound);
                new_data_start = RTE_ALIGN_FLOOR((end_pt - size), align);
+               end_pt = new_data_start + size;
                if (((end_pt - 1) & bmask) != (new_data_start & bmask))
                        return NULL;
        }
@@ -242,10 +243,6 @@ join_elem(struct malloc_elem *elem1, struct malloc_elem *elem2)
 int
 malloc_elem_free(struct malloc_elem *elem)
 {
-       if (!malloc_elem_cookies_ok(elem) || elem->state != ELEM_BUSY)
-               return -1;
-
-       rte_spinlock_lock(&(elem->heap->lock));
        size_t sz = elem->size - sizeof(*elem) - MALLOC_ELEM_TRAILER_LEN;
        uint8_t *ptr = (uint8_t *)&elem[1];
        struct malloc_elem *next = RTE_PTR_ADD(elem, elem->size);
@@ -273,8 +270,6 @@ malloc_elem_free(struct malloc_elem *elem)
 
        memset(ptr, 0, sz);
 
-       rte_spinlock_unlock(&(elem->heap->lock));
-
        return 0;
 }
 
@@ -291,11 +286,10 @@ malloc_elem_resize(struct malloc_elem *elem, size_t size)
                return 0;
 
        struct malloc_elem *next = RTE_PTR_ADD(elem, elem->size);
-       rte_spinlock_lock(&elem->heap->lock);
        if (next ->state != ELEM_FREE)
-               goto err_return;
+               return -1;
        if (elem->size + next->size < new_size)
-               goto err_return;
+               return -1;
 
        /* we now know the element fits, so remove from free list,
         * join the two
@@ -310,10 +304,5 @@ malloc_elem_resize(struct malloc_elem *elem, size_t size)
                split_elem(elem, split_pt);
                malloc_elem_free_list_insert(split_pt);
        }
-       rte_spinlock_unlock(&elem->heap->lock);
        return 0;
-
-err_return:
-       rte_spinlock_unlock(&elem->heap->lock);
-       return -1;
 }