typedef void (*delete_fn) (ssvm_private_t *);
static init_fn master_init_fns[SSVM_N_SEGMENT_TYPES] =
- { ssvm_master_init_shm, ssvm_master_init_memfd };
+ { ssvm_master_init_shm, ssvm_master_init_memfd, ssvm_master_init_private };
static init_fn slave_init_fns[SSVM_N_SEGMENT_TYPES] =
- { ssvm_slave_init_shm, ssvm_slave_init_memfd };
+ { ssvm_slave_init_shm, ssvm_slave_init_memfd, ssvm_slave_init_private };
static delete_fn delete_fns[SSVM_N_SEGMENT_TYPES] =
- { ssvm_delete_shm, ssvm_delete_memfd };
+ { ssvm_delete_shm, ssvm_delete_memfd, ssvm_delete_private };
int
ssvm_master_init_shm (ssvm_private_t * ssvm)
{
int ssvm_fd, mh_flags = MHEAP_FLAG_DISABLE_VM | MHEAP_FLAG_THREAD_SAFE;
- svm_main_region_t *smr = svm_get_root_rp ()->data_base;
clib_mem_vm_map_t mapa = { 0 };
u8 junk = 0, *ssvm_filename;
ssvm_shared_header_t *sh;
- uword page_size;
+ uword page_size, requested_va = 0;
void *oldheap;
if (ssvm->ssvm_size == 0)
if (fchmod (ssvm_fd, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP) < 0)
clib_unix_warning ("ssvm segment chmod");
- if (fchown (ssvm_fd, smr->uid, smr->gid) < 0)
- clib_unix_warning ("ssvm segment chown");
+ if (svm_get_root_rp ())
+ {
+ /* TODO: is this really needed? */
+ svm_main_region_t *smr = svm_get_root_rp ()->data_base;
+ if (fchown (ssvm_fd, smr->uid, smr->gid) < 0)
+ clib_unix_warning ("ssvm segment chown");
+ }
if (lseek (ssvm_fd, ssvm->ssvm_size, SEEK_SET) < 0)
{
page_size = clib_mem_vm_get_page_size (ssvm_fd);
if (ssvm->requested_va)
- clib_mem_vm_randomize_va (&ssvm->requested_va, min_log2 (page_size));
+ {
+ requested_va = ssvm->requested_va;
+ clib_mem_vm_randomize_va (&requested_va, min_log2 (page_size));
+ }
- mapa.requested_va = ssvm->requested_va;
+ mapa.requested_va = requested_va;
mapa.size = ssvm->ssvm_size;
mapa.fd = ssvm_fd;
if (clib_mem_vm_ext_map (&mapa))
close (memfd->fd);
}
+/**
+ * Initialize segment in a private heap
+ */
+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;
+ 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);
+ if (heap == 0)
+ {
+ clib_unix_warning ("mheap alloc");
+ return -1;
+ }
+ heap_header = mheap_header (heap);
+ heap_header->flags |= MHEAP_FLAG_THREAD_SAFE;
+
+ ssvm->ssvm_size = rnd_size;
+ ssvm->i_am_master = 1;
+ ssvm->my_pid = getpid ();
+ ssvm->requested_va = ~0;
+
+ /* Allocate a [sic] shared memory header, in process memory... */
+ sh = clib_mem_alloc_aligned (sizeof (*sh), CLIB_CACHE_LINE_BYTES);
+ ssvm->sh = sh;
+
+ memset (sh, 0, sizeof (*sh));
+ sh->heap = heap;
+ sh->type = SSVM_SEGMENT_PRIVATE;
+
+ return 0;
+}
+
+int
+ssvm_slave_init_private (ssvm_private_t * ssvm)
+{
+ clib_warning ("BUG: this should not be called!");
+ return -1;
+}
+
+void
+ssvm_delete_private (ssvm_private_t * ssvm)
+{
+ vec_free (ssvm->name);
+ mheap_free (ssvm->sh->heap);
+ clib_mem_free (ssvm->sh);
+}
+
int
ssvm_master_init (ssvm_private_t * ssvm, ssvm_segment_type_t type)
{