/*-
* BSD LICENSE
- *
- * Copyright(c) 2010-2013 Intel Corporation. All rights reserved.
+ *
+ * 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
* * 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
malloc_heap_add_memzone(struct malloc_heap *heap, size_t size, unsigned align)
{
const unsigned mz_flags = 0;
- const size_t min_size = get_malloc_memzone_size();
+ const size_t block_size = get_malloc_memzone_size();
/* ensure the data we want to allocate will fit in the memzone */
- size_t mz_size = size + align + MALLOC_ELEM_OVERHEAD * 2;
- if (mz_size < min_size)
- mz_size = min_size;
+ 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++);
- const struct rte_memzone *mz = rte_memzone_reserve(mz_name, mz_size,
- heap->numa_socket, mz_flags);
+ 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, numa_socket,
+ mz_flags);
+ if (mz == NULL)
+ mz_size /= 2;
+ } while (mz == NULL && mz_size > min_size);
if (mz == NULL)
return -1;
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);
start_elem->next_free = heap->free_head;
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.
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);
* 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;
/* Initialise variables for heap */