/*
- * Copyright (c) 2015 Cisco and/or its affiliates.
+ * Copyright (c) 2015-2019 Cisco and/or its affiliates.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at:
int
ssvm_master_init_shm (ssvm_private_t * ssvm)
{
- int ssvm_fd, mh_flags = MHEAP_FLAG_DISABLE_VM | MHEAP_FLAG_THREAD_SAFE;
+ int ssvm_fd;
+#if USE_DLMALLOC == 0
+ int mh_flags = MHEAP_FLAG_DISABLE_VM | MHEAP_FLAG_THREAD_SAFE;
+#endif
clib_mem_vm_map_t mapa = { 0 };
u8 junk = 0, *ssvm_filename;
ssvm_shared_header_t *sh;
return SSVM_API_ERROR_SET_SIZE;
}
- page_size = clib_mem_vm_get_page_size (ssvm_fd);
+ page_size = clib_mem_get_fd_page_size (ssvm_fd);
if (ssvm->requested_va)
{
requested_va = ssvm->requested_va;
sh->ssvm_size = ssvm->ssvm_size;
sh->ssvm_va = pointer_to_uword (sh);
sh->type = SSVM_SEGMENT_SHM;
+#if USE_DLMALLOC == 0
sh->heap = mheap_alloc_with_flags (((u8 *) sh) + page_size,
ssvm->ssvm_size - page_size, mh_flags);
+#else
+ sh->heap = create_mspace_with_base (((u8 *) sh) + page_size,
+ ssvm->ssvm_size - page_size,
+ 1 /* locked */ );
+ mspace_disable_expand (sh->heap);
+#endif
oldheap = ssvm_push_heap (sh);
sh->name = format (0, "%s", ssvm->name, 0);
return SSVM_API_ERROR_SLAVE_TIMEOUT;
re_map_it:
- ssvm->requested_va = (u64) sh->ssvm_va;
+ ssvm->requested_va = sh->ssvm_va;
ssvm->ssvm_size = sh->ssvm_size;
munmap (sh, MMAP_PAGESIZE);
vec_free (fn);
vec_free (ssvm->name);
- munmap ((void *) ssvm->requested_va, ssvm->ssvm_size);
+ munmap ((void *) ssvm->sh, ssvm->ssvm_size);
}
/**
int
ssvm_master_init_memfd (ssvm_private_t * memfd)
{
- uword page_size, flags = MHEAP_FLAG_DISABLE_VM | MHEAP_FLAG_THREAD_SAFE;
+ uword page_size;
ssvm_shared_header_t *sh;
void *oldheap;
clib_mem_vm_alloc_t alloc = { 0 };
memfd->my_pid = getpid ();
memfd->i_am_master = 1;
- page_size = 1 << alloc.log2_page_size;
+ page_size = 1ull << alloc.log2_page_size;
sh = memfd->sh;
sh->master_pid = memfd->my_pid;
sh->ssvm_size = memfd->ssvm_size;
sh->ssvm_va = pointer_to_uword (sh);
sh->type = SSVM_SEGMENT_MEMFD;
+
+#if USE_DLMALLOC == 0
+ uword flags = MHEAP_FLAG_DISABLE_VM | MHEAP_FLAG_THREAD_SAFE;
+
sh->heap = mheap_alloc_with_flags (((u8 *) sh) + page_size,
memfd->ssvm_size - page_size, flags);
-
+#else
+ sh->heap = create_mspace_with_base (((u8 *) sh) + page_size,
+ memfd->ssvm_size - page_size,
+ 1 /* locked */ );
+ mspace_disable_expand (sh->heap);
+#endif
oldheap = ssvm_push_heap (sh);
sh->name = format (0, "%s", memfd->name, 0);
ssvm_pop_heap (oldheap);
memfd->i_am_master = 0;
- page_size = clib_mem_vm_get_page_size (memfd->fd);
+ page_size = clib_mem_get_fd_page_size (memfd->fd);
if (!page_size)
{
clib_unix_warning ("page size unknown");
int
ssvm_master_init_private (ssvm_private_t * ssvm)
{
- u32 pagesize = clib_mem_get_page_size ();
ssvm_shared_header_t *sh;
- mheap_t *heap_header;
- u64 rnd_size = 0;
+ u32 pagesize = clib_mem_get_page_size ();
+ u32 rnd_size = 0;
u8 *heap;
- rnd_size = (ssvm->ssvm_size + (pagesize - 1)) & ~(pagesize - 1);
- rnd_size = clib_min (rnd_size, ((u64) 1 << 32) - pagesize);
- heap = mheap_alloc (0, rnd_size);
+ rnd_size = clib_max (ssvm->ssvm_size + (pagesize - 1), ssvm->ssvm_size);
+ rnd_size &= ~(pagesize - 1);
+
+#if USE_DLMALLOC == 0
+ {
+ mheap_t *heap_header;
+
+ heap = mheap_alloc (0, rnd_size);
+ if (heap == 0)
+ {
+ clib_unix_warning ("mheap alloc");
+ return -1;
+ }
+ heap_header = mheap_header (heap);
+ heap_header->flags |= MHEAP_FLAG_THREAD_SAFE;
+ }
+#else
+ heap = create_mspace (rnd_size, 1 /* locked */ );
if (heap == 0)
{
clib_unix_warning ("mheap alloc");
return -1;
}
- heap_header = mheap_header (heap);
- heap_header->flags |= MHEAP_FLAG_THREAD_SAFE;
+
+ mspace_disable_expand (heap);
+#endif
ssvm->ssvm_size = rnd_size;
ssvm->i_am_master = 1;
sh = clib_mem_alloc_aligned (sizeof (*sh), CLIB_CACHE_LINE_BYTES);
ssvm->sh = sh;
- memset (sh, 0, sizeof (*sh));
+ clib_memset (sh, 0, sizeof (*sh));
sh->heap = heap;
+ sh->ssvm_va = pointer_to_uword (heap);
sh->type = SSVM_SEGMENT_PRIVATE;
+ sh->name = ssvm->name;
return 0;
}
ssvm_delete_private (ssvm_private_t * ssvm)
{
vec_free (ssvm->name);
+#if USE_DLMALLOC == 0
mheap_free (ssvm->sh->heap);
+#else
+ destroy_mspace (ssvm->sh->heap);
+#endif
clib_mem_free (ssvm->sh);
}