Loading...
--- libmalloc/libmalloc-792.80.2/src/vm.c
+++ libmalloc/libmalloc-283.40.1/src/vm.c
@@ -23,20 +23,13 @@
#include "internal.h"
-#if !MALLOC_TARGET_EXCLAVES
-volatile uintptr_t entropic_base = 0;
static volatile uintptr_t entropic_address = 0;
static volatile uintptr_t entropic_limit = 0;
MALLOC_NOEXPORT
-struct mvm_guarded_range_config_s malloc_guarded_range_config = {0};
-#endif // !MALLOC_TARGET_EXCLAVES
-
-MALLOC_NOEXPORT
uint64_t malloc_entropy[2] = {0, 0};
#define ENTROPIC_KABILLION 0x10000000 /* 256Mb */
-#define ENTROPIC_USER_RANGE_SIZE 0x200000000ULL /* 8Gb */
// <rdar://problem/22277891> align 64bit ARM shift to 32MB PTE entries
#if MALLOC_TARGET_IOS && MALLOC_TARGET_64BIT
@@ -49,17 +42,15 @@
mvm_aslr_init(void)
{
// Prepare ASLR
-#if MALLOC_TARGET_EXCLAVES
- arc4random_buf(malloc_entropy, sizeof(malloc_entropy));
-#elif defined(__i386__) || defined(__x86_64__) || defined(__arm64__) || TARGET_OS_DRIVERKIT || (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
-#if defined(__i386__)
+#if __i386__ || __x86_64__ || __arm64__ || (TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR)
+#if __i386__
uintptr_t stackbase = 0x8fe00000;
int entropic_bits = 3;
-#elif defined(__x86_64__)
+#elif __x86_64__
uintptr_t stackbase = USRSTACK64;
int entropic_bits = 16;
-#elif defined(__arm64__)
-#if defined(__LP64__)
+#elif __arm64__
+#if __LP64__
uintptr_t stackbase = USRSTACK64;
int entropic_bits = 7;
#else // __LP64__
@@ -74,32 +65,7 @@
if (mvm_aslr_enabled()) {
if (0 == entropic_address) {
- uintptr_t t = stackbase - MAXSSIZ - ((uintptr_t)(malloc_entropy[1] &
- ((1 << entropic_bits) - 1)) << ENTROPIC_SHIFT);
-#if MALLOC_TARGET_IOS && MALLOC_TARGET_64BIT
- uintptr_t addr = 0;
-
- /* If kernel VM user ranges are enabled mach_vm_allocate/map will provide memory
- * in the upper VM address range. This range is randomized per process. For now
- * we do not have this metadata plumbed through so we make a single allocation
- * with the appropriate tag to determine where our heap is. If we are given an
- * allocation above where we expect then we can safely assume VM ranges are enabled.
- *
- * If so we do not need to apply further entropy but do need to ensure
- * we mask off the address to a PTE boundary.
- */
- if (KERN_SUCCESS == mach_vm_allocate(mach_task_self(), (mach_vm_address_t *)&addr,
- vm_page_quanta_size, VM_FLAGS_ANYWHERE | VM_MAKE_TAG(VM_MEMORY_MALLOC_TINY))) {
- // Fall through and use existing base if addr < stackbase
- if (addr > stackbase) {
- t = (addr + ENTROPIC_USER_RANGE_SIZE) & ~((1 << ENTROPIC_SHIFT) - 1);
- OSAtomicCompareAndSwapLong(0, addr, (volatile long *)&entropic_base);
- }
-
- mach_vm_deallocate(mach_task_self(), addr, vm_page_quanta_size);
- }
-#endif // MALLOC_TARGET_IOS && MALLOC_TARGET_64BIT
-
+ uintptr_t t = stackbase - MAXSSIZ - ((uintptr_t)(malloc_entropy[1] & ((1 << entropic_bits) - 1)) << ENTROPIC_SHIFT);
OSAtomicCompareAndSwapLong(0, t, (volatile long *)&entropic_limit);
OSAtomicCompareAndSwapLong(0, t - ENTROPIC_KABILLION, (volatile long *)&entropic_address);
}
@@ -113,165 +79,11 @@
#endif // TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR
}
-#if !MALLOC_TARGET_EXCLAVES
-static size_t
-mvm_random_page_aligned(uint32_t upper_bound)
-{
- uint32_t max_pages = upper_bound / PAGE_SIZE;
- uint32_t pages = arc4random_uniform(max_pages + 1);
- return pages * PAGE_SIZE;
-}
-
-// The "guarded range" is a synthetic VA range that we create in order to
-// randomize the distance of malloc metadata from the fixed mappings that
-// are laid out at process launch.
-//
-// We implement this by mapping a PROT_NONE region: the size of this region is
-// randomly chosen between 4M and 5M. Within that region, we then punch a 1M
-// carveout, by deallocating a random piece of the guarded region VA.
-// The address of this carveout is then passed as a hint in mvm_allocate_plat
-// (whenever the provided address is zero), to nudge the VM into serving the
-// requested mappings through the carveout.
-//
-// Specifically, this is aimed at randomizing the distance between the binary's
-// __DATA segment and the malloc metadata allocated at process launch, namely
-// the initial zone allocation. Moreover, by having a variable-length tail at
-// the end of the region, we also randomize the distance between __DATA and
-// the regions mapped after malloc's metadata.
-//
-// rdar://146578480
-void
-mvm_guarded_range_init(void)
-{
- size_t tail_size = mvm_random_page_aligned(MiB(1));
- size_t range_size = MiB(4) + tail_size;
- size_t carveout_size = MiB(1);
- size_t carveout_max_offset = range_size - carveout_size - 2 * PAGE_SIZE;
- size_t carveout_offset = mvm_random_page_aligned((uint32_t)carveout_max_offset);
- mach_vm_address_t range_addr = 0;
- mach_vm_address_t carveout_addr = 0;
- kern_return_t kr = KERN_FAILURE;
-
- // Reserve an inaccessible VA range.
- kr = mach_vm_map(mach_task_self(), &range_addr, range_size, 0,
- VM_FLAGS_ANYWHERE | VM_MAKE_TAG(VM_MEMORY_MALLOC),
- MEMORY_OBJECT_NULL, 0, FALSE, VM_PROT_NONE, VM_PROT_NONE,
- VM_INHERIT_DEFAULT);
- if (kr != KERN_SUCCESS) {
- malloc_zone_error(MALLOC_ABORT_ON_ERROR, false,
- "Failed to map guarded range: %d\n", kr);
- }
-
- // Punch a hole through the inaccessible VA range, creating a sub-region
- // that can be used by the VM to satisfy mapping requests.
- carveout_addr = range_addr + PAGE_SIZE + carveout_offset;
- kr = mach_vm_deallocate(mach_task_self(), carveout_addr, carveout_size);
- if (kr != KERN_SUCCESS) {
- malloc_zone_error(MALLOC_ABORT_ON_ERROR, false,
- "Failed to create carveout at 0x%lx"
- " in malloc guarded range 0x%lx: %d\n",
- (unsigned long) carveout_addr, (unsigned long) range_addr, kr);
- }
-
- malloc_guarded_range_config = (struct mvm_guarded_range_config_s){
- .base_address = range_addr,
- .size = range_size,
- .carveout_address = carveout_addr
- };
-}
-#endif // !MALLOC_TARGET_EXCLAVES
-
-void * __sized_by_or_null(size)
-mvm_allocate_plat(uintptr_t addr, size_t size, uint8_t align, int flags, int debug_flags, int vm_page_label, plat_map_t *map_out)
-{
- void * __unsafe_indexable mapped;
- kern_return_t kr;
-
- if (addr && (flags & VM_FLAGS_ANYWHERE)) {
- // Pass MALLOC_ABORT_ON_ERROR to make this call abort
- malloc_zone_error(MALLOC_ABORT_ON_ERROR | debug_flags, false,
- "Unsupported anywhere allocation at address 0x%lx of size 0x%lx with flags %d\n",
- (unsigned long) addr, (unsigned long) size, flags);
- }
-#if MALLOC_TARGET_EXCLAVES
- // Memory will be reserved and/or populated, and the handle initialized
- const _liblibc_map_type_t type = LIBLIBC_MAP_TYPE_PRIVATE |
- ((flags & VM_FLAGS_ANYWHERE) ? LIBLIBC_MAP_TYPE_NONE : LIBLIBC_MAP_TYPE_FIXED) |
- ((debug_flags & MALLOC_CAN_FAULT) ? LIBLIBC_MAP_TYPE_FAULTABLE : LIBLIBC_MAP_TYPE_NONE) |
-#if CONFIG_MTE
- ((debug_flags & MALLOC_MTE_TAGGABLE) ? LIBLIBC_MAP_TYPE_MEMTAG : LIBLIBC_MAP_TYPE_NONE) |
-#endif // CONFIG_MTE
- ((debug_flags & MALLOC_NO_POPULATE) ? LIBLIBC_MAP_TYPE_NOCOMMIT : LIBLIBC_MAP_TYPE_NONE) |
- ((debug_flags & DISABLE_ASLR) ? LIBLIBC_MAP_TYPE_NORAND : LIBLIBC_MAP_TYPE_NONE);
- const _liblibc_map_perm_t perm = LIBLIBC_MAP_PERM_READ |
- LIBLIBC_MAP_PERM_WRITE;
- mapped = mmap_plat(map_out, addr, size, perm, type, align,
- (unsigned)vm_page_label);
- kr = errno;
- // This message is not printed on non-exclaves targets. Certain code paths,
- // like xzm_segment_group_try_realloc_huge_chunk, may fail under normal
- // conditions, and would print a spurious message, but are disabled on
- // exclaves.
- if (!mapped) {
- malloc_zone_error(debug_flags, false,
- "Failed to allocate memory at address 0x%lx of size 0x%lx with flags %d: %d\n", addr, size, flags, kr);
- }
-#else
- (void)map_out;
- if (debug_flags & (MALLOC_CAN_FAULT | MALLOC_NO_POPULATE)) {
- // Pass MALLOC_ABORT_ON_ERROR to make this call abort
- malloc_zone_error(MALLOC_ABORT_ON_ERROR | debug_flags, false,
- "Unsupported unpopulated allocation at address 0x%lx of size 0x%lx with flags %d\n",
- (unsigned long) addr, (unsigned long) size, flags);
- }
-
- if (debug_flags & MALLOC_GUARDED_METADATA) {
- if (addr || vm_page_label != VM_MEMORY_MALLOC) {
- malloc_zone_error(MALLOC_ABORT_ON_ERROR | debug_flags, false,
- "Unsupported guarded metadata allocation at address 0x%lx of size 0x%lx with flags %d and label %d\n",
- (unsigned long) addr, (unsigned long) size, flags, vm_page_label);
- }
- // Pass the address of the carveout as a hint.
- addr = (uintptr_t)malloc_guarded_range_config.base_address;
- }
-
-#if CONFIG_MTE
- if (debug_flags & MALLOC_MTE_TAGGABLE) {
- flags |= VM_FLAGS_MTE;
- }
-#endif
-
- mach_vm_address_t vm_addr = addr;
- mach_vm_offset_t allocation_mask = ((mach_vm_offset_t)1 << align) - 1;
- kr = mach_vm_map(mach_task_self(), &vm_addr, (mach_vm_size_t)size,
- allocation_mask, flags | VM_MAKE_TAG(vm_page_label),
- MEMORY_OBJECT_NULL, 0, FALSE, VM_PROT_DEFAULT, VM_PROT_ALL,
- VM_INHERIT_DEFAULT);
- mapped = (kr == KERN_SUCCESS) ? (void *)vm_addr : NULL;
-#endif // MALLOC_TARGET_EXCLAVES
-
- return __unsafe_forge_bidi_indexable(void *, mapped, size);
-}
-
-void * __sized_by_or_null(size)
-mvm_allocate_pages(size_t size, uint8_t align, uint32_t debug_flags,
- int vm_page_label)
-{
- return mvm_allocate_pages_plat(size, align, debug_flags, vm_page_label, NULL);
-}
-
-void * __sized_by_or_null(size)
-mvm_allocate_pages_plat(size_t size, uint8_t align, uint32_t debug_flags,
- int vm_page_label, plat_map_t *map_out)
-{
-#if MALLOC_TARGET_EXCLAVES
- return mvm_allocate_plat(0, size, align, VM_FLAGS_ANYWHERE, debug_flags, vm_page_label, map_out);
-#else
- (void)map_out;
- boolean_t add_prelude_guard_page = debug_flags & MALLOC_ADD_PRELUDE_GUARD_PAGE;
- boolean_t add_postlude_guard_page = debug_flags & MALLOC_ADD_POSTLUDE_GUARD_PAGE;
+void *
+mvm_allocate_pages(size_t size, unsigned char align, unsigned debug_flags, int vm_page_label)
+{
+ boolean_t add_guard_pages = debug_flags & MALLOC_ADD_GUARD_PAGES;
boolean_t purgeable = debug_flags & MALLOC_PURGEABLE;
- boolean_t use_entropic_range = !(debug_flags & DISABLE_ASLR);
mach_vm_address_t vm_addr;
uintptr_t addr;
mach_vm_size_t allocation_size = round_page_quanta(size);
@@ -282,80 +94,33 @@
if (!allocation_size) {
allocation_size = vm_page_quanta_size;
}
- if (add_postlude_guard_page || add_prelude_guard_page) {
- if (add_prelude_guard_page && align > vm_page_quanta_shift) {
+ if (add_guard_pages) {
+ if (align > vm_page_quanta_shift) {
/* <rdar://problem/16601499> alignment greater than pagesize needs more work */
- allocation_size += (1 << align) + large_vm_page_quanta_size;
+ allocation_size += (1 << align) + vm_page_quanta_size;
} else {
- allocation_size += add_prelude_guard_page && add_postlude_guard_page ?
- 2 * large_vm_page_quanta_size : large_vm_page_quanta_size;
+ allocation_size += 2 * vm_page_quanta_size;
}
}
if (purgeable) {
alloc_flags |= VM_FLAGS_PURGABLE;
}
-
-#if CONFIG_MTE
- if (debug_flags & MALLOC_MTE_TAGGABLE) {
- alloc_flags |= VM_FLAGS_MTE;
- }
-#endif
-
if (allocation_size < size) { // size_t arithmetic wrapped!
return NULL;
}
-retry:
- vm_addr = use_entropic_range ? entropic_address : vm_page_quanta_size;
- kr = mach_vm_map(mach_task_self(), &vm_addr, allocation_size,
- allocation_mask, alloc_flags, MEMORY_OBJECT_NULL, 0, FALSE,
- VM_PROT_DEFAULT, VM_PROT_ALL, VM_INHERIT_DEFAULT);
- if (kr == KERN_NO_SPACE && use_entropic_range) {
- vm_addr = vm_page_quanta_size;
- kr = mach_vm_map(mach_task_self(), &vm_addr, allocation_size,
- allocation_mask, alloc_flags, MEMORY_OBJECT_NULL, 0, FALSE,
- VM_PROT_DEFAULT, VM_PROT_ALL, VM_INHERIT_DEFAULT);
- }
+ vm_addr = vm_page_quanta_size;
+ kr = mach_vm_map(mach_task_self(), &vm_addr, allocation_size, allocation_mask, alloc_flags, MEMORY_OBJECT_NULL, 0, FALSE,
+ VM_PROT_DEFAULT, VM_PROT_ALL, VM_INHERIT_DEFAULT);
if (kr) {
- if (kr != KERN_NO_SPACE) {
- malloc_zone_error(debug_flags, false, "can't allocate region\n:"
- "*** mach_vm_map(size=%lu, flags: %x) failed (error code=%d)\n",
- size, debug_flags, kr);
- }
+ malloc_zone_error(debug_flags, false, "can't allocate region\n*** mach_vm_map(size=%lu) failed (error code=%d)\n", size, kr);
return NULL;
}
addr = (uintptr_t)vm_addr;
- if (use_entropic_range) {
- // Don't allow allocation to rise above entropic_limit (for tidiness).
- if (addr + allocation_size > entropic_limit) { // Exhausted current range?
- uintptr_t t = entropic_address;
- uintptr_t u = t - ENTROPIC_KABILLION;
-
- // provided we don't wrap, deallocate and retry, in theexpanded
- // entropic range
- if (u < t && u >= entropic_base) {
- mach_vm_deallocate(mach_task_self(), vm_addr, allocation_size);
- OSAtomicCompareAndSwapLong(t, u,
- (volatile long *)&entropic_address); // Just one reduction please
- goto retry;
- }
- // fall through to use what we got
- }
-
- if (addr < entropic_address) { // we wrapped to find this allocation, expand the entropic range
- uintptr_t t = entropic_address;
- uintptr_t u = t - ENTROPIC_KABILLION;
- if (u < t && u >= entropic_base) {
- OSAtomicCompareAndSwapLong(t, u, (volatile long *)&entropic_address); // Just one reduction please
- }
- // fall through to use what we got
- }
- }
-
- if (add_postlude_guard_page || add_prelude_guard_page) {
- if (add_prelude_guard_page && align > vm_page_quanta_shift) {
+ if (add_guard_pages) {
+ if (align > vm_page_quanta_shift) {
/* <rdar://problem/16601499> calculate the first address inside the alignment padding
* where we can place the guard page and still be aligned.
*
@@ -363,9 +128,9 @@
* |leading|gp| alloc |gp| t |
* |-----------------------------------------------------------|
*/
- uintptr_t alignaddr = ((addr + large_vm_page_quanta_size) + (1 << align) - 1) & ~((1 << align) - 1);
- size_t leading = alignaddr - addr - large_vm_page_quanta_size;
- size_t trailing = (1 << align) - large_vm_page_quanta_size - leading;
+ uintptr_t alignaddr = ((addr + vm_page_quanta_size) + (1 << align) - 1) & ~((1 << align) - 1);
+ size_t leading = alignaddr - addr - vm_page_quanta_size;
+ size_t trailing = (1 << align) - vm_page_quanta_size - leading;
/* Unmap the excess area. */
kr = mach_vm_deallocate(mach_task_self(), addr, leading);
@@ -376,177 +141,134 @@
return NULL;
}
- if (trailing) {
- kr = mach_vm_deallocate(mach_task_self(), addr + allocation_size - trailing, trailing);
- if (kr) {
- malloc_zone_error(debug_flags, false, "can't unmap excess trailing guard region\n"
- "*** mach_vm_deallocate(addr=%p, size=%lu) failed (code=%d)\n",
- (void *)(addr + allocation_size - trailing), trailing, kr);
- return NULL;
- }
+ kr = mach_vm_deallocate(mach_task_self(), addr + allocation_size - trailing, trailing);
+ if (kr) {
+ malloc_zone_error(debug_flags, false, "can't unmap excess trailing guard region\n"
+ "*** mach_vm_deallocate(addr=%p, size=%lu) failed (code=%d)\n",
+ (void *)(addr + allocation_size - trailing), trailing, kr);
+ return NULL;
}
addr = alignaddr;
- } else if (add_prelude_guard_page) {
- addr += large_vm_page_quanta_size;
- }
- mvm_protect_plat((void *)addr, size, PROT_NONE, debug_flags, map_out);
+ } else {
+ addr += vm_page_quanta_size;
+ }
+ mvm_protect((void *)addr, size, PROT_NONE, debug_flags);
}
return (void *)addr;
-#endif // MALLOC_TARGET_EXCLAVES
+}
+
+void *
+mvm_allocate_pages_securely(size_t size, unsigned char align, int vm_page_label, uint32_t debug_flags)
+{
+ mach_vm_address_t vm_addr;
+ uintptr_t addr;
+ mach_vm_size_t allocation_size = round_page_quanta(size);
+ mach_vm_offset_t allocation_mask = ((mach_vm_offset_t)1 << align) - 1;
+ int alloc_flags = VM_FLAGS_ANYWHERE | VM_MAKE_TAG(vm_page_label);
+ kern_return_t kr;
+
+ if (debug_flags & DISABLE_ASLR) {
+ return mvm_allocate_pages(size, align, 0, vm_page_label);
+ }
+
+ if (!allocation_size) {
+ allocation_size = vm_page_quanta_size;
+ }
+ if (allocation_size < size) { // size_t arithmetic wrapped!
+ return NULL;
+ }
+
+retry:
+ vm_addr = entropic_address;
+ kr = mach_vm_map(mach_task_self(), &vm_addr, allocation_size, allocation_mask, alloc_flags, MEMORY_OBJECT_NULL, 0, FALSE,
+ VM_PROT_DEFAULT, VM_PROT_ALL, VM_INHERIT_DEFAULT);
+ if (kr == KERN_NO_SPACE) {
+ vm_addr = vm_page_quanta_size;
+ kr = mach_vm_map(mach_task_self(), &vm_addr, allocation_size, allocation_mask, alloc_flags, MEMORY_OBJECT_NULL, 0, FALSE,
+ VM_PROT_DEFAULT, VM_PROT_ALL, VM_INHERIT_DEFAULT);
+ }
+ if (kr) {
+ malloc_zone_error(debug_flags, false, "can't allocate region securely\n",
+ "*** mach_vm_map(size=%lu) failed (error code=%d)\n", size, kr);
+ return NULL;
+ }
+ addr = (uintptr_t)vm_addr;
+
+ // Don't allow allocation to rise above entropic_limit (for tidiness).
+ if (addr + allocation_size > entropic_limit) { // Exhausted current range?
+ uintptr_t t = entropic_address;
+ uintptr_t u = t - ENTROPIC_KABILLION;
+
+ if (u < t) { // provided we don't wrap, deallocate and retry, in the expanded entropic range
+ mach_vm_deallocate(mach_task_self(), vm_addr, allocation_size);
+ OSAtomicCompareAndSwapLong(t, u, (volatile long *)&entropic_address); // Just one reduction please
+ goto retry;
+ }
+ // fall through to use what we got
+ }
+
+ if (addr < entropic_address) { // we wrapped to find this allocation, expand the entropic range
+ uintptr_t t = entropic_address;
+ uintptr_t u = t - ENTROPIC_KABILLION;
+ if (u < t) {
+ OSAtomicCompareAndSwapLong(t, u, (volatile long *)&entropic_address); // Just one reduction please
+ }
+ // fall through to use what we got
+ }
+ return (void *)addr;
}
void
-mvm_deallocate_plat(void * __sized_by(size) addr, size_t size, int debug_flags, plat_map_t *map)
-{
- kern_return_t kr;
-
-#if MALLOC_TARGET_EXCLAVES
- kr = munmap_plat(map, addr, size) ? KERN_SUCCESS : errno;
-#else
- (void)map;
- kr = mach_vm_deallocate(mach_task_self(), (mach_vm_address_t)addr,
- (mach_vm_size_t)size);
-#endif // MALLOC_TARGET_EXCLAVES
-
- if (kr != KERN_SUCCESS) {
- malloc_zone_error(debug_flags, false,
- "Failed to deallocate at address %p of size 0x%lx: %d\n", addr, size, kr);
- }
-}
-
-void
-mvm_deallocate_pages(void * __sized_by(size) addr, size_t size,
- unsigned debug_flags)
-{
- mvm_deallocate_pages_plat(addr, size, debug_flags, NULL);
-}
-
-void
-mvm_deallocate_pages_plat(void * __sized_by(size) addr, size_t size,
- unsigned debug_flags, plat_map_t *map)
-{
-#if MALLOC_TARGET_EXCLAVES
- if (debug_flags & (MALLOC_ADD_GUARD_PAGE_FLAGS | MALLOC_PURGEABLE)) {
- malloc_zone_error(MALLOC_ABORT_ON_ERROR | debug_flags, true,
- "Unsupported deallocation debug flags %u\n", debug_flags);
- }
- mvm_deallocate_plat(addr, size, debug_flags, map);
-#else
- (void)map;
- boolean_t added_prelude_guard_page = debug_flags & MALLOC_ADD_PRELUDE_GUARD_PAGE;
- boolean_t added_postlude_guard_page = debug_flags & MALLOC_ADD_POSTLUDE_GUARD_PAGE;
+mvm_deallocate_pages(void *addr, size_t size, unsigned debug_flags)
+{
+ boolean_t add_guard_pages = debug_flags & MALLOC_ADD_GUARD_PAGES;
mach_vm_address_t vm_addr = (mach_vm_address_t)addr;
mach_vm_size_t allocation_size = size;
-
- if (added_prelude_guard_page) {
- vm_addr -= large_vm_page_quanta_size;
- allocation_size += large_vm_page_quanta_size;
- }
- if (added_postlude_guard_page) {
- allocation_size += large_vm_page_quanta_size;
- }
- mvm_deallocate_plat(__unsafe_forge_bidi_indexable(void *, vm_addr,
- allocation_size), (size_t)allocation_size, debug_flags, NULL);
-#endif // MALLOC_TARGET_EXCLAVES
+ kern_return_t kr;
+
+ if (add_guard_pages) {
+ vm_addr -= vm_page_quanta_size;
+ allocation_size += 2 * vm_page_quanta_size;
+ }
+ kr = mach_vm_deallocate(mach_task_self(), vm_addr, allocation_size);
+ if (kr) {
+ malloc_zone_error(debug_flags, false, "Can't deallocate_pages region at %p\n", addr);
+ }
}
void
-mvm_protect(void * __sized_by(size) address, size_t size, unsigned protection,
- unsigned debug_flags)
-{
- mvm_protect_plat(address, size, protection, debug_flags, NULL);
-}
-
-void
-mvm_protect_plat(void * __sized_by(size) address, size_t size, unsigned protection,
- unsigned debug_flags, plat_map_t *map)
-{
-#if MALLOC_TARGET_EXCLAVES
- const _liblibc_map_perm_t perm =
- ((protection & PROT_READ) ? LIBLIBC_MAP_PERM_READ : LIBLIBC_MAP_PERM_NONE) |
- ((protection & PROT_WRITE) ? LIBLIBC_MAP_PERM_WRITE : LIBLIBC_MAP_PERM_NONE) |
- ((protection & PROT_EXEC) ? LIBLIBC_MAP_PERM_EXECUTE : LIBLIBC_MAP_PERM_NONE);
- if (debug_flags & (MALLOC_ADD_GUARD_PAGE_FLAGS | MALLOC_PURGEABLE)) {
- malloc_zone_error(MALLOC_ABORT_ON_ERROR | debug_flags, true,
- "Unsupported deallocation debug flags %u\n", debug_flags);
- }
- if (!mprotect_plat(map, address, size, perm)) {
- malloc_zone_error(MALLOC_ABORT_ON_ERROR | debug_flags, true,
- "Unsupported deallocation address %p or size %lu: %d\n", address, size, errno);
- }
-#else
- (void)map;
+mvm_protect(void *address, size_t size, unsigned protection, unsigned debug_flags)
+{
kern_return_t err;
- if ((debug_flags & MALLOC_ADD_PRELUDE_GUARD_PAGE) && !(debug_flags & MALLOC_DONT_PROTECT_PRELUDE)) {
- err = mprotect((void *)((uintptr_t)address - large_vm_page_quanta_size), large_vm_page_quanta_size, protection);
+ if (!(debug_flags & MALLOC_DONT_PROTECT_PRELUDE)) {
+ err = mprotect((void *)((uintptr_t)address - vm_page_quanta_size), vm_page_quanta_size, protection);
if (err) {
malloc_report(ASL_LEVEL_ERR, "*** can't mvm_protect(%u) region for prelude guard page at %p\n", protection,
- (void *)((uintptr_t)address - large_vm_page_quanta_size));
- }
- }
- if ((debug_flags & MALLOC_ADD_POSTLUDE_GUARD_PAGE) && !(debug_flags & MALLOC_DONT_PROTECT_POSTLUDE)) {
- err = mprotect((void *)(round_page_quanta(((uintptr_t)address + size))), large_vm_page_quanta_size, protection);
+ (void *)((uintptr_t)address - vm_page_quanta_size));
+ }
+ }
+ if (!(debug_flags & MALLOC_DONT_PROTECT_POSTLUDE)) {
+ err = mprotect((void *)(round_page_quanta(((uintptr_t)address + size))), vm_page_quanta_size, protection);
if (err) {
malloc_report(ASL_LEVEL_ERR, "*** can't mvm_protect(%u) region for postlude guard page at %p\n", protection,
(void *)((uintptr_t)address + size));
}
}
-#endif // MALLOC_TARGET_EXCLAVES
-}
-
-int
-mvm_madvise(void * __sized_by(sz) addr, size_t sz, int advice, unsigned debug_flags)
-{
- return mvm_madvise_plat(addr, sz, advice, debug_flags, NULL);
-}
-
-int
-mvm_madvise_plat(void * __sized_by(sz) addr, size_t sz, int advice, unsigned debug_flags, plat_map_t *map)
-{
- kern_return_t kr;
-
-#if MALLOC_TARGET_EXCLAVES
- if ((debug_flags & (MALLOC_ADD_GUARD_PAGE_FLAGS | MALLOC_PURGEABLE))) {
- malloc_zone_error(MALLOC_ABORT_ON_ERROR | debug_flags, true,
- "Unsupported debug flags %u\n", debug_flags);
- }
-
- kr = !madvise_plat(map, addr, sz, advice) ? KERN_SUCCESS : errno;
- if (kr != KERN_SUCCESS) {
- malloc_zone_error(debug_flags, false,
- "Failed to madvise %d at address %p of size 0x%lx: %d\n", advice,
- addr, sz, kr);
- }
-#else
- (void)map;
- kr = !madvise(addr, sz, advice) ? KERN_SUCCESS : errno;
-#endif // MALLOC_TARGET_EXCLAVES
-
- return !(kr == KERN_SUCCESS);
-}
-
-#if !defined(TESTING_XZONE_MALLOC)
+}
int
mvm_madvise_free(void *rack, void *r, uintptr_t pgLo, uintptr_t pgHi, uintptr_t *last, boolean_t scribble)
{
- return mvm_madvise_free_plat(rack, r, pgLo, pgHi, last, scribble, NULL);
-}
-
-int
-mvm_madvise_free_plat(void *rack, void *r, uintptr_t pgLo, uintptr_t pgHi, uintptr_t *last, boolean_t scribble, plat_map_t *map)
-{
if (pgHi > pgLo) {
size_t len = pgHi - pgLo;
- void *ptr = __unsafe_forge_bidi_indexable(void *, pgLo, len);
-
- if (scribble && malloc_zero_policy != MALLOC_ZERO_ON_FREE) {
- memset(ptr, SCRUBBLE_BYTE, len); // Scribble on MADV_FREEd memory
- }
-
-#if MALLOC_TARGET_IOS
+
+ if (scribble) {
+ memset((void *)pgLo, SCRUBBLE_BYTE, len); // Scribble on MADV_FREEd memory
+ }
+
+#if TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR
if (last) {
if (*last == pgLo) {
return 0;
@@ -554,131 +276,20 @@
*last = pgLo;
}
-#endif // MALLOC_TARGET_IOS
-
-#if MALLOC_TARGET_EXCLAVES
- if (mvm_madvise_plat(ptr, len, CONFIG_MADVISE_STYLE, 0, map)) {
- return 1;
- }
-#else
+#endif // TARGET_OS_IPHONE && !TARGET_OS_SIMULATOR
+
MAGMALLOC_MADVFREEREGION(rack, r, (void *)pgLo, (int)len); // DTrace USDT Probe
- if (mvm_madvise(ptr, len, CONFIG_MADVISE_STYLE, 0)) {
+ if (-1 == madvise((void *)pgLo, len, CONFIG_MADVISE_STYLE)) {
/* -1 return: VM map entry change makes this unfit for reuse. Something evil lurks. */
#if DEBUG_MADVISE
malloc_zone_error(NULL, false,
"madvise_free_range madvise(..., MADV_FREE_REUSABLE) failed for %p, length=%d\n",
(void *)pgLo, len);
-#endif // DEBUG_MADVISE
+#endif
return 1;
} else {
MALLOC_TRACE(TRACE_madvise, (uintptr_t)r, (uintptr_t)pgLo, len, CONFIG_MADVISE_STYLE);
}
-#endif // MALLOC_TARGET_EXCLAVES
}
return 0;
}
-
-#if CONFIG_MAGAZINE_DEFERRED_RECLAIM
-static mach_vm_reclaim_ring_t reclaim_buffer;
-static _malloc_lock_s reclaim_buffer_lock = _MALLOC_LOCK_INIT;
-
-mach_vm_reclaim_error_t
-mvm_deferred_reclaim_init(void)
-{
- // Pick a sane minimum number of entries and let vm_reclaim round up
- // to a page boundary. The intention is for the initial size to be
- // one page. We don't support ringbuffer growth on the legacy DRC, so
- // the maximum size will be unmodified.
- mach_vm_reclaim_count_t capacity = mach_vm_reclaim_round_capacity(512);
- return mach_vm_reclaim_ring_allocate(&reclaim_buffer, capacity, capacity);
-}
-
-
-bool
-mvm_reclaim_mark_used(mach_vm_reclaim_id_t id, mach_vm_address_t ptr, mach_vm_size_t size, unsigned int debug_flags)
-{
- mach_vm_reclaim_error_t kr;
- mach_vm_reclaim_state_t state;
- bool update_accounting;
-
- if (id == VM_RECLAIM_ID_NULL) {
- // Region was never entered into ring
- // FIXME: Understand why the all cache entries aren't being
- // assigned reclaim IDs (rdar://137709029)
- return true;
- }
-
- if (debug_flags & MALLOC_ADD_GUARD_PAGE_FLAGS) {
- if (os_add_overflow(size, 2 * large_vm_page_quanta_size, &size)) {
- return false;
- }
- ptr -= large_vm_page_quanta_size;
- }
- _malloc_lock_lock(&reclaim_buffer_lock);
- kr = mach_vm_reclaim_try_cancel(reclaim_buffer, id, ptr, size,
- VM_RECLAIM_DEALLOCATE, &state, &update_accounting);
- MALLOC_ASSERT(kr == VM_RECLAIM_SUCCESS);
- _malloc_lock_unlock(&reclaim_buffer_lock);
- if (update_accounting) {
- mach_vm_reclaim_update_kernel_accounting(reclaim_buffer);
- }
- return mach_vm_reclaim_is_reusable(state);
-}
-
-mach_vm_reclaim_id_t
-mvm_reclaim_mark_free(mach_vm_address_t ptr, mach_vm_size_t size, unsigned int debug_flags)
-{
- mach_vm_reclaim_error_t kr;
- mach_vm_reclaim_id_t id;
- bool should_update_kernel_accounting = false;
- if (debug_flags & MALLOC_ADD_GUARD_PAGE_FLAGS) {
- if (os_add_overflow(size, 2 * large_vm_page_quanta_size, &size)) {
- return VM_RECLAIM_ID_NULL;
- }
- ptr -= large_vm_page_quanta_size;
- }
-
- _malloc_lock_lock(&reclaim_buffer_lock);
-
- do {
- id = VM_RECLAIM_ID_NULL;
- kr = mach_vm_reclaim_try_enter(reclaim_buffer, ptr, size,
- VM_RECLAIM_DEALLOCATE, &id, &should_update_kernel_accounting);
- MALLOC_ASSERT(kr == VM_RECLAIM_SUCCESS);
- if (id == VM_RECLAIM_ID_NULL) {
- mach_vm_reclaim_count_t capacity;
- kr = mach_vm_reclaim_ring_capacity(reclaim_buffer, &capacity);
- MALLOC_ASSERT(kr == VM_RECLAIM_SUCCESS);
- kr = mach_vm_reclaim_ring_flush(reclaim_buffer, capacity);
- MALLOC_ASSERT(kr == VM_RECLAIM_SUCCESS);
- }
- } while (id == VM_RECLAIM_ID_NULL);
-
- _malloc_lock_unlock(&reclaim_buffer_lock);
-
- if (should_update_kernel_accounting) {
- mach_vm_reclaim_update_kernel_accounting(reclaim_buffer);
- }
- return id;
-}
-
-bool
-mvm_reclaim_is_available(mach_vm_reclaim_id_t id)
-{
- mach_vm_reclaim_error_t err;
- mach_vm_reclaim_state_t state;
-
- if (id == VM_RECLAIM_ID_NULL) {
- // Region was never entered into ring
- // FIXME: Understand why the all cache entries aren't being
- // assigned reclaim IDs (rdar://137709029)
- return true;
- }
-
- err = mach_vm_reclaim_query_state(reclaim_buffer, id, VM_RECLAIM_DEALLOCATE, &state);
- MALLOC_ASSERT(err == VM_RECLAIM_SUCCESS);
- return mach_vm_reclaim_is_reusable(state);
-}
-#endif // CONFIG_MAGAZINE_DEFERRED_RECLAIM
-
-#endif // !defined(TESTING_XZONE_MALLOC)