#include <vppinfra/clib.h> /* uword, etc */
#include <vppinfra/clib_error.h>
-#if USE_DLMALLOC == 0
-#include <vppinfra/mheap_bootstrap.h>
-#else
#include <vppinfra/dlmalloc.h>
-#endif
#include <vppinfra/os.h>
#include <vppinfra/string.h> /* memcpy, clib_memset */
#define CLIB_MAX_MHEAPS 256
#define CLIB_MAX_NUMAS 8
+typedef enum
+{
+ CLIB_MEM_PAGE_SZ_UNKNOWN = 0,
+ CLIB_MEM_PAGE_SZ_DEFAULT = 1,
+ CLIB_MEM_PAGE_SZ_DEFAULT_HUGE = 2,
+ CLIB_MEM_PAGE_SZ_4K = 12,
+ CLIB_MEM_PAGE_SZ_16K = 14,
+ CLIB_MEM_PAGE_SZ_64K = 16,
+ CLIB_MEM_PAGE_SZ_1M = 20,
+ CLIB_MEM_PAGE_SZ_2M = 21,
+ CLIB_MEM_PAGE_SZ_16M = 24,
+ CLIB_MEM_PAGE_SZ_32M = 25,
+ CLIB_MEM_PAGE_SZ_512M = 29,
+ CLIB_MEM_PAGE_SZ_1G = 30,
+ CLIB_MEM_PAGE_SZ_16G = 34,
+} clib_mem_page_sz_t;
+
+typedef struct
+{
+ /* log2 system page size */
+ clib_mem_page_sz_t log2_page_sz;
+
+ /* log2 system default hugepage size */
+ clib_mem_page_sz_t log2_default_hugepage_sz;
+
+ /* bitmap of available numa nodes */
+ u32 numa_node_bitmap;
+
+ /* per CPU heaps */
+ void *per_cpu_mheaps[CLIB_MAX_MHEAPS];
+
+ /* per NUMA heaps */
+ void *per_numa_mheaps[CLIB_MAX_NUMAS];
+} clib_mem_main_t;
+
+extern clib_mem_main_t clib_mem_main;
+
/* Unspecified NUMA socket */
#define VEC_NUMA_UNSPECIFIED (0xFF)
-/* Per CPU heaps. */
-extern void *clib_per_cpu_mheaps[CLIB_MAX_MHEAPS];
-extern void *clib_per_numa_mheaps[CLIB_MAX_NUMAS];
-
always_inline void *
clib_mem_get_per_cpu_heap (void)
{
int cpu = os_get_thread_index ();
- return clib_per_cpu_mheaps[cpu];
+ return clib_mem_main.per_cpu_mheaps[cpu];
}
always_inline void *
clib_mem_set_per_cpu_heap (u8 * new_heap)
{
int cpu = os_get_thread_index ();
- void *old = clib_per_cpu_mheaps[cpu];
- clib_per_cpu_mheaps[cpu] = new_heap;
+ void *old = clib_mem_main.per_cpu_mheaps[cpu];
+ clib_mem_main.per_cpu_mheaps[cpu] = new_heap;
return old;
}
always_inline void *
clib_mem_get_per_numa_heap (u32 numa_id)
{
- ASSERT (numa_id < ARRAY_LEN (clib_per_numa_mheaps));
- return clib_per_numa_mheaps[numa_id];
+ ASSERT (numa_id < ARRAY_LEN (clib_mem_main.per_numa_mheaps));
+ return clib_mem_main.per_numa_mheaps[numa_id];
}
always_inline void *
clib_mem_set_per_numa_heap (u8 * new_heap)
{
int numa = os_get_numa_index ();
- void *old = clib_per_numa_mheaps[numa];
- clib_per_numa_mheaps[numa] = new_heap;
+ void *old = clib_mem_main.per_numa_mheaps[numa];
+ clib_mem_main.per_numa_mheaps[numa] = new_heap;
return old;
}
int i;
if (__os_thread_index != 0)
return;
- for (i = 0; i < ARRAY_LEN (clib_per_cpu_mheaps); i++)
- if (clib_atomic_bool_cmp_and_swap (&clib_per_cpu_mheaps[i],
- 0, clib_per_cpu_mheaps[0]))
+ for (i = 0; i < ARRAY_LEN (clib_mem_main.per_cpu_mheaps); i++)
+ if (clib_atomic_bool_cmp_and_swap (&clib_mem_main.per_cpu_mheaps[i],
+ 0, clib_mem_main.per_cpu_mheaps[0]))
{
os_set_thread_index (i);
break;
always_inline uword
clib_mem_size_nocheck (void *p)
{
-#if USE_DLMALLOC == 0
- mheap_elt_t *e = mheap_user_pointer_to_elt (p);
- return mheap_elt_data_bytes (e);
-#else
return mspace_usable_size_with_delta (p);
-#endif
}
/* Memory allocator which may call os_out_of_memory() if it fails */
}
cpu = os_get_thread_index ();
- heap = clib_per_cpu_mheaps[cpu];
-
-#if USE_DLMALLOC == 0
- uword offset;
- heap = mheap_get_aligned (heap, size, align, align_offset, &offset);
- clib_per_cpu_mheaps[cpu] = heap;
- if (PREDICT_TRUE (offset != ~0))
- p = heap + offset;
-#else
+ heap = clib_mem_main.per_cpu_mheaps[cpu];
+
p = mspace_get_aligned (heap, size, align, align_offset);
-#endif /* USE_DLMALLOC */
if (PREDICT_FALSE (0 == p))
{
always_inline uword
clib_mem_is_heap_object (void *p)
{
-#if USE_DLMALLOC == 0
- void *heap = clib_mem_get_per_cpu_heap ();
- uword offset = (uword) p - (uword) heap;
- mheap_elt_t *e, *n;
-
- if (offset >= vec_len (heap))
- return 0;
-
- e = mheap_elt_at_uoffset (heap, offset);
- n = mheap_next_elt (e);
-
- /* Check that heap forward and reverse pointers agree. */
- return e->n_user_data == n->prev_n_user_data;
-#else
void *heap = clib_mem_get_per_cpu_heap ();
return mspace_is_heap_object (heap, p);
-#endif /* USE_DLMALLOC */
}
always_inline void
CLIB_MEM_POISON (p, clib_mem_size_nocheck (p));
-#if USE_DLMALLOC == 0
- mheap_put (heap, (u8 *) p - heap);
-#else
mspace_put (heap, p);
-#endif
}
always_inline void *
return clib_mem_set_per_cpu_heap (heap);
}
+void clib_mem_main_init ();
void *clib_mem_init (void *heap, uword size);
void *clib_mem_init_thread_safe (void *memory, uword memory_size);
void *clib_mem_init_thread_safe_numa (void *memory, uword memory_size,
clib_mem_vm_free (void *addr, uword size)
{
munmap (addr, size);
- CLIB_MEM_POISON (addr, size);
}
always_inline void *
u64 clib_mem_get_fd_page_size (int fd);
uword clib_mem_get_default_hugepage_size (void);
int clib_mem_get_fd_log2_page_size (int fd);
+uword clib_mem_vm_reserve (uword start, uword size,
+ clib_mem_page_sz_t log2_page_sz);
u64 *clib_mem_vm_get_paddr (void *mem, int log2_page_size, int n_pages);
+void clib_mem_destroy_mspace (void *mspace);
+void clib_mem_destroy (void);
typedef struct
{
} clib_mem_vm_map_t;
clib_error_t *clib_mem_vm_ext_map (clib_mem_vm_map_t * a);
-void clib_mem_vm_randomize_va (uword * requested_va, u32 log2_page_size);
+void clib_mem_vm_randomize_va (uword * requested_va,
+ clib_mem_page_sz_t log2_page_size);
void mheap_trace (void *v, int enable);
uword clib_mem_trace_enable_disable (uword enable);
void clib_mem_trace (int enable);
Code Review / vpp.git / blobdiff