X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvppinfra%2Fmem.h;h=65b25f004a73aaba1a10518dcd3f9bf4d01f394f;hb=refs%2Fchanges%2F16%2F15916%2F4;hp=69ab880317d6e441234ef3ec8b8dddecb40d3a86;hpb=01914ce45729833cec88c65689de9a0336cd40cc;p=vpp.git diff --git a/src/vppinfra/mem.h b/src/vppinfra/mem.h index 69ab880317d..65b25f004a7 100644 --- a/src/vppinfra/mem.h +++ b/src/vppinfra/mem.h @@ -44,9 +44,15 @@ #include /* uword, etc */ #include + +#if USE_DLMALLOC == 0 #include +#else +#include +#endif + #include -#include /* memcpy, memset */ +#include /* memcpy, clib_memset */ #include #define CLIB_MAX_MHEAPS 256 @@ -76,7 +82,7 @@ clib_mem_alloc_aligned_at_offset (uword size, uword align, uword align_offset, int os_out_of_memory_on_failure) { void *heap, *p; - uword offset, cpu; + uword cpu; if (align_offset > align) { @@ -88,6 +94,9 @@ clib_mem_alloc_aligned_at_offset (uword size, uword align, uword align_offset, 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; @@ -105,6 +114,17 @@ clib_mem_alloc_aligned_at_offset (uword size, uword align, uword align_offset, os_out_of_memory (); return 0; } +#else + p = mspace_get_aligned (heap, size, align, align_offset); + if (PREDICT_FALSE (p == 0)) + { + if (os_out_of_memory_on_failure) + os_out_of_memory (); + return 0; + } + + return p; +#endif /* USE_DLMALLOC */ } /* Memory allocator which calls os_out_of_memory() when it fails */ @@ -161,6 +181,7 @@ clib_mem_alloc_aligned_or_null (uword size, uword align) 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; @@ -173,6 +194,11 @@ clib_mem_is_heap_object (void *p) /* 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 @@ -183,7 +209,11 @@ clib_mem_free (void *p) /* Make sure object is in the correct heap. */ ASSERT (clib_mem_is_heap_object (p)); +#if USE_DLMALLOC == 0 mheap_put (heap, (u8 *) p - heap); +#else + mspace_put (heap, p); +#endif #if CLIB_DEBUG > 0 VALGRIND_FREELIKE_BLOCK (p, 0); @@ -202,7 +232,7 @@ clib_mem_realloc (void *p, uword new_size, uword old_size) copy_size = old_size; else copy_size = new_size; - clib_memcpy (q, p, copy_size); + clib_memcpy_fast (q, p, copy_size); clib_mem_free (p); } return q; @@ -211,9 +241,14 @@ clib_mem_realloc (void *p, uword new_size, uword old_size) always_inline uword clib_mem_size (void *p) { - ASSERT (clib_mem_is_heap_object (p)); +#if USE_DLMALLOC == 0 mheap_elt_t *e = mheap_user_pointer_to_elt (p); + ASSERT (clib_mem_is_heap_object (p)); return mheap_elt_data_bytes (e); +#else + ASSERT (clib_mem_is_heap_object (p)); + return mspace_usable_size_with_delta (p); +#endif } always_inline void * @@ -229,6 +264,7 @@ clib_mem_set_heap (void *heap) } void *clib_mem_init (void *heap, uword size); +void *clib_mem_init_thread_safe (void *memory, uword memory_size); void clib_mem_exit (void); @@ -312,7 +348,7 @@ always_inline void * clib_mem_vm_map (void *addr, uword size) { void *mmap_addr; - uword flags = MAP_PRIVATE | MAP_FIXED; + uword flags = MAP_PRIVATE | MAP_FIXED | MAP_ANONYMOUS; mmap_addr = mmap (addr, size, (PROT_READ | PROT_WRITE), flags, -1, 0); if (mmap_addr == (void *) -1) @@ -328,29 +364,48 @@ typedef struct #define CLIB_MEM_VM_F_NUMA_PREFER (1 << 2) #define CLIB_MEM_VM_F_NUMA_FORCE (1 << 3) #define CLIB_MEM_VM_F_HUGETLB_PREALLOC (1 << 4) +#define CLIB_MEM_VM_F_LOCKED (1 << 5) u32 flags; /**< vm allocation flags:
CLIB_MEM_VM_F_SHARED: request shared memory, file - destiptor will be provided on successful allocation. + descriptor will be provided on successful allocation.
CLIB_MEM_VM_F_HUGETLB: request hugepages.
CLIB_MEM_VM_F_NUMA_PREFER: numa_node field contains valid numa node preference.
CLIB_MEM_VM_F_NUMA_FORCE: fail if setting numa policy fails.
CLIB_MEM_VM_F_HUGETLB_PREALLOC: pre-allocate hugepages if number of available pages is not sufficient. +
CLIB_MEM_VM_F_LOCKED: request locked memory. */ char *name; /**< Name for memory allocation, set by caller. */ uword size; /**< Allocation size, set by caller. */ int numa_node; /**< numa node preference. Valid if CLIB_MEM_VM_F_NUMA_PREFER set. */ void *addr; /**< Pointer to allocated memory, set on successful allocation. */ - int fd; /**< File desriptor, set on successful allocation if CLIB_MEM_VM_F_SHARED is set. */ + int fd; /**< File descriptor, set on successful allocation if CLIB_MEM_VM_F_SHARED is set. */ int log2_page_size; /* Page size in log2 format, set on successful allocation. */ int n_pages; /* Number of pages. */ + uword requested_va; /**< Request fixed position mapping */ } clib_mem_vm_alloc_t; +clib_error_t *clib_mem_create_fd (char *name, int *fdp); +clib_error_t *clib_mem_create_hugetlb_fd (char *name, int *fdp); clib_error_t *clib_mem_vm_ext_alloc (clib_mem_vm_alloc_t * a); -int clib_mem_vm_get_log2_page_size (int fd); +void clib_mem_vm_ext_free (clib_mem_vm_alloc_t * a); +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); u64 *clib_mem_vm_get_paddr (void *mem, int log2_page_size, int n_pages); +typedef struct +{ + uword size; /**< Map size */ + int fd; /**< File descriptor to be mapped */ + uword requested_va; /**< Request fixed position mapping */ + void *addr; /**< Pointer to mapped memory, if successful */ +} 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 mheap_trace (void *v, int enable); #include /* clib_panic */