X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Flibrte_malloc%2Fmalloc_heap.c;h=94be0afe139bdbafebaad1abce125182e6a8077a;hb=63dd47b9a5fe097190ae6b690806675504fca228;hp=5bdff27fed88dd199b4c25a16483ba3757578f0e;hpb=e9d48c0072d36eb6423b45fba4ec49d0def6c36f;p=dpdk.git diff --git a/lib/librte_malloc/malloc_heap.c b/lib/librte_malloc/malloc_heap.c index 5bdff27fed..94be0afe13 100644 --- a/lib/librte_malloc/malloc_heap.c +++ b/lib/librte_malloc/malloc_heap.c @@ -1,13 +1,13 @@ /*- * BSD LICENSE - * + * * Copyright(c) 2010-2014 Intel Corporation. All rights reserved. * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * + * * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * Redistributions in binary form must reproduce the above copyright @@ -17,7 +17,7 @@ * * Neither the name of Intel Corporation nor the names of its * contributors may be used to endorse or promote products derived * from this software without specific prior written permission. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -82,21 +82,23 @@ malloc_heap_add_memzone(struct malloc_heap *heap, size_t size, unsigned align) /* ensure the data we want to allocate will fit in the memzone */ const size_t min_size = size + align + MALLOC_ELEM_OVERHEAD * 2; const struct rte_memzone *mz = NULL; + struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config; + unsigned numa_socket = heap - mcfg->malloc_heaps; size_t mz_size = min_size; if (mz_size < block_size) mz_size = block_size; char mz_name[RTE_MEMZONE_NAMESIZE]; - rte_snprintf(mz_name, sizeof(mz_name), "MALLOC_S%u_HEAP_%u", - heap->numa_socket, heap->mz_count++); + snprintf(mz_name, sizeof(mz_name), "MALLOC_S%u_HEAP_%u", + numa_socket, heap->mz_count++); /* try getting a block. if we fail and we don't need as big a block * as given in the config, we can shrink our request and try again */ do { - mz = rte_memzone_reserve(mz_name, mz_size, - heap->numa_socket, mz_flags); + mz = rte_memzone_reserve(mz_name, mz_size, numa_socket, + mz_flags); if (mz == NULL) mz_size /= 2; } while (mz == NULL && mz_size > min_size); @@ -110,80 +112,37 @@ malloc_heap_add_memzone(struct malloc_heap *heap, size_t size, unsigned align) end_elem = RTE_PTR_ALIGN_FLOOR(end_elem, CACHE_LINE_SIZE); const unsigned elem_size = (uintptr_t)end_elem - (uintptr_t)start_elem; - malloc_elem_init(start_elem, heap, elem_size); + malloc_elem_init(start_elem, heap, mz, elem_size); malloc_elem_mkend(end_elem, start_elem); + malloc_elem_free_list_insert(start_elem); - start_elem->next_free = heap->free_head; - heap->free_head = start_elem; /* increase heap total size by size of new memzone */ heap->total_size+=mz_size - MALLOC_ELEM_OVERHEAD; return 0; } -/* - * initialise a malloc heap object. The heap is locked with a private - * lock while being initialised. This function should only be called the - * first time a thread calls malloc - if even then, as heaps are per-socket - * not per-thread. - */ -static void -malloc_heap_init(struct malloc_heap *heap) -{ - struct rte_mem_config *mcfg = rte_eal_get_configuration()->mem_config; - - rte_eal_mcfg_wait_complete(mcfg); - while (heap->initialised != INITIALISED) { - if (rte_atomic32_cmpset( - (volatile uint32_t*)&heap->initialised, - NOT_INITIALISED, INITIALISING)) { - - heap->free_head = NULL; - heap->mz_count = 0; - heap->alloc_count = 0; - heap->total_size = 0; - /* - * Find NUMA socket of heap that is being initialised, so that - * malloc_heaps[n].numa_socket == n - */ - heap->numa_socket = heap - mcfg->malloc_heaps; - rte_spinlock_init(&heap->lock); - heap->initialised = INITIALISED; - } - } -} - /* * Iterates through the freelist for a heap to find a free element * which can store data of the required size and with the requested alignment. - * Returns null on failure, or pointer to element on success, with the pointer - * to the previous element in the list, if any, being returned in a parameter - * (to make removing the element from the free list faster). + * Returns null on failure, or pointer to element on success. */ static struct malloc_elem * -find_suitable_element(struct malloc_heap *heap, size_t size, - unsigned align, struct malloc_elem **prev) +find_suitable_element(struct malloc_heap *heap, size_t size, unsigned align) { - struct malloc_elem *elem, *min_elem, *min_prev; - size_t min_sz; - - elem = heap->free_head; - min_elem = NULL; - min_prev = NULL; - min_sz = (size_t) SIZE_MAX; - *prev = NULL; - - while(elem){ - if (malloc_elem_can_hold(elem, size, align)) { - if (min_sz > elem->size) { - min_elem = elem; - *prev = min_prev; - min_sz = elem->size; - } + size_t idx; + struct malloc_elem *elem; + + for (idx = malloc_elem_free_list_index(size); + idx < RTE_HEAP_NUM_FREELISTS; idx++) + { + for (elem = LIST_FIRST(&heap->free_head[idx]); + !!elem; elem = LIST_NEXT(elem, free_list)) + { + if (malloc_elem_can_hold(elem, size, align)) + return elem; } - min_prev = elem; - elem = elem->next_free; } - return (min_elem); + return NULL; } /* @@ -196,21 +155,17 @@ void * malloc_heap_alloc(struct malloc_heap *heap, const char *type __attribute__((unused)), size_t size, unsigned align) { - if (!heap->initialised) - malloc_heap_init(heap); - size = CACHE_LINE_ROUNDUP(size); align = CACHE_LINE_ROUNDUP(align); rte_spinlock_lock(&heap->lock); - struct malloc_elem *prev, *elem = find_suitable_element(heap, - size, align, &prev); + struct malloc_elem *elem = find_suitable_element(heap, size, align); if (elem == NULL){ if ((malloc_heap_add_memzone(heap, size, align)) == 0) - elem = find_suitable_element(heap, size, align, &prev); + elem = find_suitable_element(heap, size, align); } if (elem != NULL){ - elem = malloc_elem_alloc(elem, size, align, prev); + elem = malloc_elem_alloc(elem, size, align); /* increase heap's count of allocated elements */ heap->alloc_count++; } @@ -223,13 +178,11 @@ malloc_heap_alloc(struct malloc_heap *heap, * Function to retrieve data for heap on given socket */ int -malloc_heap_get_stats(struct malloc_heap *heap, +malloc_heap_get_stats(const struct malloc_heap *heap, struct rte_malloc_socket_stats *socket_stats) { - if (!heap->initialised) - return -1; - - struct malloc_elem *elem = heap->free_head; + size_t idx; + struct malloc_elem *elem; /* Initialise variables for heap */ socket_stats->free_count = 0; @@ -237,13 +190,15 @@ malloc_heap_get_stats(struct malloc_heap *heap, socket_stats->greatest_free_size = 0; /* Iterate through free list */ - while(elem) { - socket_stats->free_count++; - socket_stats->heap_freesz_bytes += elem->size; - if (elem->size > socket_stats->greatest_free_size) - socket_stats->greatest_free_size = elem->size; - - elem = elem->next_free; + for (idx = 0; idx < RTE_HEAP_NUM_FREELISTS; idx++) { + for (elem = LIST_FIRST(&heap->free_head[idx]); + !!elem; elem = LIST_NEXT(elem, free_list)) + { + socket_stats->free_count++; + socket_stats->heap_freesz_bytes += elem->size; + if (elem->size > socket_stats->greatest_free_size) + socket_stats->greatest_free_size = elem->size; + } } /* Get stats on overall heap and allocated memory on this heap */ socket_stats->heap_totalsz_bytes = heap->total_size;