Modify pages_map() to support mapping uncommitted virtual memory.
If the OS overcommits: - Commit all mappings in pages_map() regardless of whether the caller requested committed memory. - Linux-specific: Specify MAP_NORESERVE to avoid unfortunate interactions with heuristic overcommit mode during fork(2). This resolves #193.
This commit is contained in:
parent
dc391adc65
commit
c2f970c32b
@ -305,6 +305,7 @@ case "${host}" in
|
|||||||
*-*-freebsd*)
|
*-*-freebsd*)
|
||||||
CFLAGS="$CFLAGS"
|
CFLAGS="$CFLAGS"
|
||||||
abi="elf"
|
abi="elf"
|
||||||
|
AC_DEFINE([JEMALLOC_SYSCTL_VM_OVERCOMMIT], [ ])
|
||||||
AC_DEFINE([JEMALLOC_PURGE_MADVISE_FREE], [ ])
|
AC_DEFINE([JEMALLOC_PURGE_MADVISE_FREE], [ ])
|
||||||
force_lazy_lock="1"
|
force_lazy_lock="1"
|
||||||
;;
|
;;
|
||||||
@ -329,6 +330,7 @@ case "${host}" in
|
|||||||
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
|
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
|
||||||
abi="elf"
|
abi="elf"
|
||||||
AC_DEFINE([JEMALLOC_HAS_ALLOCA_H])
|
AC_DEFINE([JEMALLOC_HAS_ALLOCA_H])
|
||||||
|
AC_DEFINE([JEMALLOC_PROC_SYS_VM_OVERCOMMIT_MEMORY], [ ])
|
||||||
AC_DEFINE([JEMALLOC_PURGE_MADVISE_DONTNEED], [ ])
|
AC_DEFINE([JEMALLOC_PURGE_MADVISE_DONTNEED], [ ])
|
||||||
AC_DEFINE([JEMALLOC_THREADED_INIT], [ ])
|
AC_DEFINE([JEMALLOC_THREADED_INIT], [ ])
|
||||||
AC_DEFINE([JEMALLOC_USE_CXX_THROW], [ ])
|
AC_DEFINE([JEMALLOC_USE_CXX_THROW], [ ])
|
||||||
|
@ -214,6 +214,15 @@
|
|||||||
#undef JEMALLOC_ZONE
|
#undef JEMALLOC_ZONE
|
||||||
#undef JEMALLOC_ZONE_VERSION
|
#undef JEMALLOC_ZONE_VERSION
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Methods for determining whether the OS overcommits.
|
||||||
|
* JEMALLOC_PROC_SYS_VM_OVERCOMMIT_MEMORY: Linux's
|
||||||
|
* /proc/sys/vm.overcommit_memory file.
|
||||||
|
* JEMALLOC_SYSCTL_VM_OVERCOMMIT: FreeBSD's vm.overcommit sysctl.
|
||||||
|
*/
|
||||||
|
#undef JEMALLOC_SYSCTL_VM_OVERCOMMIT
|
||||||
|
#undef JEMALLOC_PROC_SYS_VM_OVERCOMMIT_MEMORY
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Methods for purging unused pages differ between operating systems.
|
* Methods for purging unused pages differ between operating systems.
|
||||||
*
|
*
|
||||||
|
@ -9,13 +9,14 @@
|
|||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
#ifdef JEMALLOC_H_EXTERNS
|
#ifdef JEMALLOC_H_EXTERNS
|
||||||
|
|
||||||
void *pages_map(void *addr, size_t size);
|
void *pages_map(void *addr, size_t size, bool *commit);
|
||||||
void pages_unmap(void *addr, size_t size);
|
void pages_unmap(void *addr, size_t size);
|
||||||
void *pages_trim(void *addr, size_t alloc_size, size_t leadsize,
|
void *pages_trim(void *addr, size_t alloc_size, size_t leadsize,
|
||||||
size_t size);
|
size_t size, bool *commit);
|
||||||
bool pages_commit(void *addr, size_t size);
|
bool pages_commit(void *addr, size_t size);
|
||||||
bool pages_decommit(void *addr, size_t size);
|
bool pages_decommit(void *addr, size_t size);
|
||||||
bool pages_purge(void *addr, size_t size);
|
bool pages_purge(void *addr, size_t size);
|
||||||
|
void pages_boot(void);
|
||||||
|
|
||||||
#endif /* JEMALLOC_H_EXTERNS */
|
#endif /* JEMALLOC_H_EXTERNS */
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
@ -398,6 +398,7 @@ opt_utrace
|
|||||||
opt_xmalloc
|
opt_xmalloc
|
||||||
opt_zero
|
opt_zero
|
||||||
p2rz
|
p2rz
|
||||||
|
pages_boot
|
||||||
pages_commit
|
pages_commit
|
||||||
pages_decommit
|
pages_decommit
|
||||||
pages_map
|
pages_map
|
||||||
|
@ -16,18 +16,16 @@ chunk_alloc_mmap_slow(size_t size, size_t alignment, bool *zero, bool *commit)
|
|||||||
do {
|
do {
|
||||||
void *pages;
|
void *pages;
|
||||||
size_t leadsize;
|
size_t leadsize;
|
||||||
pages = pages_map(NULL, alloc_size);
|
pages = pages_map(NULL, alloc_size, commit);
|
||||||
if (pages == NULL)
|
if (pages == NULL)
|
||||||
return (NULL);
|
return (NULL);
|
||||||
leadsize = ALIGNMENT_CEILING((uintptr_t)pages, alignment) -
|
leadsize = ALIGNMENT_CEILING((uintptr_t)pages, alignment) -
|
||||||
(uintptr_t)pages;
|
(uintptr_t)pages;
|
||||||
ret = pages_trim(pages, alloc_size, leadsize, size);
|
ret = pages_trim(pages, alloc_size, leadsize, size, commit);
|
||||||
} while (ret == NULL);
|
} while (ret == NULL);
|
||||||
|
|
||||||
assert(ret != NULL);
|
assert(ret != NULL);
|
||||||
*zero = true;
|
*zero = true;
|
||||||
if (!*commit)
|
|
||||||
*commit = pages_decommit(ret, size);
|
|
||||||
return (ret);
|
return (ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -54,7 +52,7 @@ chunk_alloc_mmap(void *new_addr, size_t size, size_t alignment, bool *zero,
|
|||||||
assert(alignment != 0);
|
assert(alignment != 0);
|
||||||
assert((alignment & chunksize_mask) == 0);
|
assert((alignment & chunksize_mask) == 0);
|
||||||
|
|
||||||
ret = pages_map(new_addr, size);
|
ret = pages_map(new_addr, size, commit);
|
||||||
if (ret == NULL || ret == new_addr)
|
if (ret == NULL || ret == new_addr)
|
||||||
return (ret);
|
return (ret);
|
||||||
assert(new_addr == NULL);
|
assert(new_addr == NULL);
|
||||||
@ -66,8 +64,6 @@ chunk_alloc_mmap(void *new_addr, size_t size, size_t alignment, bool *zero,
|
|||||||
|
|
||||||
assert(ret != NULL);
|
assert(ret != NULL);
|
||||||
*zero = true;
|
*zero = true;
|
||||||
if (!*commit)
|
|
||||||
*commit = pages_decommit(ret, size);
|
|
||||||
return (ret);
|
return (ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1272,6 +1272,7 @@ malloc_init_hard_a0_locked(tsd_t *tsd)
|
|||||||
abort();
|
abort();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
pages_boot();
|
||||||
if (base_boot())
|
if (base_boot())
|
||||||
return (true);
|
return (true);
|
||||||
if (chunk_boot())
|
if (chunk_boot())
|
||||||
|
116
src/pages.c
116
src/pages.c
@ -1,29 +1,49 @@
|
|||||||
#define JEMALLOC_PAGES_C_
|
#define JEMALLOC_PAGES_C_
|
||||||
#include "jemalloc/internal/jemalloc_internal.h"
|
#include "jemalloc/internal/jemalloc_internal.h"
|
||||||
|
|
||||||
|
#ifdef JEMALLOC_SYSCTL_VM_OVERCOMMIT
|
||||||
|
#include <sys/sysctl.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/******************************************************************************/
|
||||||
|
/* Data. */
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
|
# define PAGES_PROT_COMMIT (PROT_READ | PROT_WRITE)
|
||||||
|
# define PAGES_PROT_DECOMMIT (PROT_NONE)
|
||||||
|
static int mmap_flags;
|
||||||
|
#endif
|
||||||
|
static bool os_overcommits;
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
|
||||||
void *
|
void *
|
||||||
pages_map(void *addr, size_t size)
|
pages_map(void *addr, size_t size, bool *commit)
|
||||||
{
|
{
|
||||||
void *ret;
|
void *ret;
|
||||||
|
|
||||||
assert(size != 0);
|
assert(size != 0);
|
||||||
|
|
||||||
|
if (os_overcommits)
|
||||||
|
*commit = true;
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
/*
|
/*
|
||||||
* If VirtualAlloc can't allocate at the given address when one is
|
* If VirtualAlloc can't allocate at the given address when one is
|
||||||
* given, it fails and returns NULL.
|
* given, it fails and returns NULL.
|
||||||
*/
|
*/
|
||||||
ret = VirtualAlloc(addr, size, MEM_COMMIT | MEM_RESERVE,
|
ret = VirtualAlloc(addr, size, MEM_RESERVE | (*commit ? MEM_COMMIT : 0),
|
||||||
PAGE_READWRITE);
|
PAGE_READWRITE);
|
||||||
#else
|
#else
|
||||||
/*
|
/*
|
||||||
* We don't use MAP_FIXED here, because it can cause the *replacement*
|
* We don't use MAP_FIXED here, because it can cause the *replacement*
|
||||||
* of existing mappings, and we only want to create new mappings.
|
* of existing mappings, and we only want to create new mappings.
|
||||||
*/
|
*/
|
||||||
ret = mmap(addr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON,
|
{
|
||||||
-1, 0);
|
int prot = *commit ? PAGES_PROT_COMMIT : PAGES_PROT_DECOMMIT;
|
||||||
|
|
||||||
|
ret = mmap(addr, size, prot, mmap_flags, -1, 0);
|
||||||
|
}
|
||||||
assert(ret != NULL);
|
assert(ret != NULL);
|
||||||
|
|
||||||
if (ret == MAP_FAILED)
|
if (ret == MAP_FAILED)
|
||||||
@ -67,7 +87,8 @@ pages_unmap(void *addr, size_t size)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void *
|
void *
|
||||||
pages_trim(void *addr, size_t alloc_size, size_t leadsize, size_t size)
|
pages_trim(void *addr, size_t alloc_size, size_t leadsize, size_t size,
|
||||||
|
bool *commit)
|
||||||
{
|
{
|
||||||
void *ret = (void *)((uintptr_t)addr + leadsize);
|
void *ret = (void *)((uintptr_t)addr + leadsize);
|
||||||
|
|
||||||
@ -77,7 +98,7 @@ pages_trim(void *addr, size_t alloc_size, size_t leadsize, size_t size)
|
|||||||
void *new_addr;
|
void *new_addr;
|
||||||
|
|
||||||
pages_unmap(addr, alloc_size);
|
pages_unmap(addr, alloc_size);
|
||||||
new_addr = pages_map(ret, size);
|
new_addr = pages_map(ret, size, commit);
|
||||||
if (new_addr == ret)
|
if (new_addr == ret)
|
||||||
return (ret);
|
return (ret);
|
||||||
if (new_addr)
|
if (new_addr)
|
||||||
@ -101,17 +122,17 @@ static bool
|
|||||||
pages_commit_impl(void *addr, size_t size, bool commit)
|
pages_commit_impl(void *addr, size_t size, bool commit)
|
||||||
{
|
{
|
||||||
|
|
||||||
#ifndef _WIN32
|
if (os_overcommits)
|
||||||
/*
|
return (true);
|
||||||
* The following decommit/commit implementation is functional, but
|
|
||||||
* always disabled because it doesn't add value beyong improved
|
#ifdef _WIN32
|
||||||
* debugging (at the cost of extra system calls) on systems that
|
return (commit ? (addr != VirtualAlloc(addr, size, MEM_COMMIT,
|
||||||
* overcommit.
|
PAGE_READWRITE)) : (!VirtualFree(addr, size, MEM_DECOMMIT)));
|
||||||
*/
|
#else
|
||||||
if (false) {
|
{
|
||||||
int prot = commit ? (PROT_READ | PROT_WRITE) : PROT_NONE;
|
int prot = commit ? PAGES_PROT_COMMIT : PAGES_PROT_DECOMMIT;
|
||||||
void *result = mmap(addr, size, prot, MAP_PRIVATE | MAP_ANON |
|
void *result = mmap(addr, size, prot, mmap_flags | MAP_FIXED,
|
||||||
MAP_FIXED, -1, 0);
|
-1, 0);
|
||||||
if (result == MAP_FAILED)
|
if (result == MAP_FAILED)
|
||||||
return (true);
|
return (true);
|
||||||
if (result != addr) {
|
if (result != addr) {
|
||||||
@ -125,7 +146,6 @@ pages_commit_impl(void *addr, size_t size, bool commit)
|
|||||||
return (false);
|
return (false);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
return (true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool
|
bool
|
||||||
@ -171,3 +191,63 @@ pages_purge(void *addr, size_t size)
|
|||||||
return (unzeroed);
|
return (unzeroed);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef JEMALLOC_SYSCTL_VM_OVERCOMMIT
|
||||||
|
static bool
|
||||||
|
os_overcommits_sysctl(void)
|
||||||
|
{
|
||||||
|
int vm_overcommit;
|
||||||
|
size_t sz;
|
||||||
|
|
||||||
|
sz = sizeof(vm_overcommit);
|
||||||
|
if (sysctlbyname("vm.overcommit", &vm_overcommit, &sz, NULL, 0) != 0)
|
||||||
|
return (false); /* Error. */
|
||||||
|
|
||||||
|
return ((vm_overcommit & 0x3) == 0);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef JEMALLOC_PROC_SYS_VM_OVERCOMMIT_MEMORY
|
||||||
|
static bool
|
||||||
|
os_overcommits_proc(void)
|
||||||
|
{
|
||||||
|
int fd;
|
||||||
|
char buf[1];
|
||||||
|
ssize_t nread;
|
||||||
|
|
||||||
|
fd = open("/proc/sys/vm/overcommit_memory", O_RDONLY);
|
||||||
|
if (fd == -1)
|
||||||
|
return (false); /* Error. */
|
||||||
|
|
||||||
|
nread = read(fd, &buf, sizeof(buf));
|
||||||
|
if (nread < 1)
|
||||||
|
return (false); /* Error. */
|
||||||
|
/*
|
||||||
|
* /proc/sys/vm/overcommit_memory meanings:
|
||||||
|
* 0: Heuristic overcommit.
|
||||||
|
* 1: Always overcommit.
|
||||||
|
* 2: Never overcommit.
|
||||||
|
*/
|
||||||
|
return (buf[0] == '0' || buf[0] == '1');
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void
|
||||||
|
pages_boot(void)
|
||||||
|
{
|
||||||
|
|
||||||
|
#ifndef _WIN32
|
||||||
|
mmap_flags = MAP_PRIVATE | MAP_ANON;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef JEMALLOC_SYSCTL_VM_OVERCOMMIT
|
||||||
|
os_overcommits = os_overcommits_sysctl();
|
||||||
|
#elif defined(JEMALLOC_PROC_SYS_VM_OVERCOMMIT_MEMORY)
|
||||||
|
os_overcommits = os_overcommits_proc();
|
||||||
|
# ifdef MAP_NORESERVE
|
||||||
|
if (os_overcommits)
|
||||||
|
mmap_flags |= MAP_NORESERVE;
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
os_overcommits = false;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user