close (ssvm_fd);
- CLIB_MEM_UNPOISON (sh, sizeof (*sh));
+ clib_mem_unpoison (sh, sizeof (*sh));
sh->server_pid = ssvm->my_pid;
sh->ssvm_size = ssvm->ssvm_size;
sh->ssvm_va = pointer_to_uword (sh);
return SSVM_API_ERROR_MMAP;
}
sh->client_pid = getpid ();
+ close (ssvm_fd);
return 0;
}
int
ssvm_server_init_memfd (ssvm_private_t * memfd)
{
- int log2_page_size, n_pages;
- uword page_size;
+ uword page_size, n_pages;
ssvm_shared_header_t *sh;
+ int log2_page_size;
void *oldheap;
if (memfd->ssvm_size == 0)
if (memfd->fd == CLIB_MEM_ERROR)
{
- clib_unix_warning (0, "failed to create memfd");
+ clib_unix_warning ("failed to create memfd");
return SSVM_API_ERROR_CREATE_FAILURE;
}
log2_page_size = clib_mem_get_fd_log2_page_size (memfd->fd);
if (log2_page_size == 0)
{
- clib_unix_warning (0, "cannot determine page size");
+ clib_unix_warning ("cannot determine page size");
return SSVM_API_ERROR_CREATE_FAILURE;
}
if ((ftruncate (memfd->fd, n_pages << log2_page_size)) == -1)
{
- clib_unix_warning (0, "memfd ftruncate failure");
+ clib_unix_warning ("memfd ftruncate failure");
return SSVM_API_ERROR_CREATE_FAILURE;
}
sh->ssvm_va = pointer_to_uword (sh);
sh->type = SSVM_SEGMENT_MEMFD;
- page_size = 1 << log2_page_size;
+ page_size = 1ULL << log2_page_size;
sh->heap = clib_mem_create_heap (((u8 *) sh) + page_size,
memfd->ssvm_size - page_size,
1 /* locked */ , "ssvm server memfd");
int
ssvm_client_init_memfd (ssvm_private_t * memfd)
{
- clib_mem_vm_map_t mapa = { 0 };
+ int mmap_flags = MAP_SHARED;
ssvm_shared_header_t *sh;
uword page_size;
/*
* Map the segment once, to look at the shared header
*/
- mapa.fd = memfd->fd;
- mapa.size = page_size;
+ sh = (void *) mmap (0, page_size, PROT_READ | PROT_WRITE, MAP_SHARED,
+ memfd->fd, 0);
- if (clib_mem_vm_ext_map (&mapa))
+ if (sh == MAP_FAILED)
{
- clib_unix_warning ("client research mmap (fd %d)", mapa.fd);
+ clib_unix_warning ("client research mmap (fd %d)", memfd->fd);
close (memfd->fd);
return SSVM_API_ERROR_MMAP;
}
- sh = mapa.addr;
memfd->requested_va = sh->ssvm_va;
memfd->ssvm_size = sh->ssvm_size;
- clib_mem_vm_free (sh, page_size);
+ munmap (sh, page_size);
+
+ if (memfd->requested_va)
+ mmap_flags |= MAP_FIXED;
/*
* Remap the segment at the 'right' address
*/
- mapa.requested_va = memfd->requested_va;
- mapa.size = memfd->ssvm_size;
- if (clib_mem_vm_ext_map (&mapa))
+ sh = (void *) mmap (uword_to_pointer (memfd->requested_va, void *),
+ memfd->ssvm_size,
+ PROT_READ | PROT_WRITE, mmap_flags, memfd->fd, 0);
+
+ if (sh == MAP_FAILED)
{
clib_unix_warning ("client final mmap");
close (memfd->fd);
return SSVM_API_ERROR_MMAP;
}
- sh = mapa.addr;
sh->client_pid = getpid ();
memfd->sh = sh;
return 0;
if (memfd->is_server)
clib_mem_vm_unmap (memfd->sh);
else
- clib_mem_vm_free (memfd->sh, memfd->ssvm_size);
+ munmap (memfd->sh, memfd->ssvm_size);
close (memfd->fd);
}
{
uword page_size, log2_page_size, rnd_size = 0;
ssvm_shared_header_t *sh;
- void *oldheap;
- u8 *heap;
+ clib_mem_heap_t *heap, *oldheap;
log2_page_size = clib_mem_get_log2_page_size ();
if (log2_page_size == 0)
{
- clib_unix_warning (0, "cannot determine page size");
+ clib_unix_warning ("cannot determine page size");
return SSVM_API_ERROR_CREATE_FAILURE;
}
- page_size = 1 << log2_page_size;
+ page_size = 1ULL << log2_page_size;
rnd_size = clib_max (ssvm->ssvm_size + (page_size - 1), ssvm->ssvm_size);
rnd_size &= ~(page_size - 1);
clib_memset (sh, 0, sizeof (*sh));
sh->heap = heap;
sh->ssvm_size = rnd_size;
- sh->ssvm_va = pointer_to_uword (heap);
+ sh->ssvm_va = pointer_to_uword (sh);
sh->type = SSVM_SEGMENT_PRIVATE;
oldheap = ssvm_push_heap (sh);