Loading...
--- libmalloc/libmalloc-374.120.1/src/malloc.c
+++ libmalloc/libmalloc-283/src/malloc.c
@@ -47,20 +47,12 @@
*/
int32_t malloc_num_zones = 0;
int32_t malloc_num_zones_allocated = 0;
-malloc_zone_t **malloc_zones = (malloc_zone_t **)0xdeaddeaddeaddead;
+malloc_zone_t **malloc_zones = 0;
malloc_logger_t *malloc_logger = NULL;
-
-static uint32_t initial_num_zones;
-static malloc_zone_t *initial_scalable_zone;
-static malloc_zone_t *initial_nano_zone;
-static bool has_injected_zone0;
+static malloc_zone_t *initial_default_zone = NULL;
unsigned malloc_debug_flags = 0;
-bool malloc_tracing_enabled = false;
-bool malloc_space_efficient_enabled = false;
-bool malloc_medium_space_efficient_enabled = true;
-
-bool malloc_quarantine_enabled = false;
+boolean_t malloc_tracing_enabled = false;
unsigned malloc_check_start = 0; // 0 means don't check
unsigned malloc_check_counter = 0;
@@ -69,15 +61,20 @@
static int malloc_check_sleep = 100; // default 100 second sleep
static int malloc_check_abort = 0; // default is to sleep, not abort
-static struct _malloc_msl_symbols msl = {};
-
-// TODO delete this, its only used some deprecated functions like turn_on_stack_logging,
-// which have been replaced by functions in MallocStackLogging.framework
-// (like msl_turn_on_stack_logging)
-static struct msl_dylib {
-
+static os_once_t _malloc_initialize_pred;
+
+static
+struct msl {
void *dylib;
+ void (*handle_memory_event) (unsigned long event);
+ boolean_t (*stack_logging_locked) (void);
+ void (*fork_prepare) (void);
+ void (*fork_parent) (void);
+ void (*fork_child) (void);
+
+
+ // TODO delete these ones
kern_return_t (*get_frames_for_address)(task_t task,
mach_vm_address_t address,
mach_vm_address_t *stack_frames_buffer,
@@ -99,7 +96,7 @@
mach_vm_address_t *out_frames_buffer,
uint32_t *out_frames_count,
uint32_t max_frames);
-} msld = {};
+} msl = {};
/*
* Counters that coordinate zone destruction (in malloc_zone_unregister) with
@@ -140,8 +137,6 @@
static const char medium_enabled_boot_arg[] = "malloc_medium_zone";
static const char max_medium_magazines_boot_arg[] = "malloc_max_medium_magazines";
static const char medium_activation_threshold_boot_arg[] = "malloc_medium_activation_threshold";
-static const char medium_space_efficient_boot_arg[] = "malloc_medium_space_efficient";
-static const char medium_madvise_dram_scale_divisor_boot_arg[] = "malloc_medium_madvise_dram_scale_divisor";
#endif // CONFIG_MEDIUM_ALLOCATOR
/********* Utilities ************/
@@ -161,7 +156,6 @@
#endif // TARGET_OS_DRIVERKIT
void __malloc_init(const char *apple[]);
-static void _malloc_initialize(const char *apple[], const char *bootargs);
static int
__entropy_from_kernel(const char *str)
@@ -191,32 +185,6 @@
}
}
return idx;
-}
-
-#if TARGET_OS_OSX && defined(__x86_64__)
-static uint64_t
-__is_translated(void)
-{
- return (*(uint64_t*)_COMM_PAGE_CPU_CAPABILITIES64) & kIsTranslated;
-}
-#endif /* TARGET_OS_OSX */
-
-
-#define LIBMALLOC_EXPERIMENT_FACTORS_KEY "MallocExperiment="
-#define LIBMALLOC_EXPERIMENT_DISABLE_MEDIUM (1ULL)
-static void
-__malloc_init_experiments(const char *str)
-{
- uint64_t experiment_factors = 0;
- str = strchr(str, '=');
- if (str) {
- experiment_factors = strtoull_l(str + 1, NULL, 16, NULL);
- }
- switch (experiment_factors) {
- case LIBMALLOC_EXPERIMENT_DISABLE_MEDIUM:
- magazine_medium_enabled = false;
- break;
- }
}
static void
@@ -255,16 +223,6 @@
}
#if CONFIG_MEDIUM_ALLOCATOR
-#if TARGET_OS_OSX
-#if defined(__x86_64__)
- if (__is_translated()) {
- magazine_medium_active_threshold = 0;
- }
-#elif defined(__arm64__)
- magazine_medium_active_threshold = 0;
-#endif
-#endif /* TARGET_OS_OSX */
-
flag = malloc_common_value_for_key_copy(bootargs, medium_enabled_boot_arg,
value_buf, sizeof(value_buf));
if (flag) {
@@ -300,34 +258,10 @@
"malloc_max_medium_magazines must be positive - ignored.\n");
}
}
-
- flag = malloc_common_value_for_key_copy(bootargs,
- medium_space_efficient_boot_arg, value_buf, sizeof(value_buf));
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp) {
- malloc_medium_space_efficient_enabled = (value != 0);
- }
- }
-
- flag = malloc_common_value_for_key_copy(bootargs, medium_madvise_dram_scale_divisor_boot_arg, value_buf, sizeof(value_buf));
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && value >= 0) {
- magazine_medium_madvise_dram_scale_divisor = (uint64_t)value;
- } else {
- malloc_report(ASL_LEVEL_ERR,
- "malloc_medium_madvise_dram_scale_divisor must be positive - ignored.\n");
- }
- }
#endif // CONFIG_MEDIUM_ALLOCATOR
}
-extern malloc_zone_t *force_asan_init_if_present(void)
- asm("_malloc_default_zone");
-
+/* TODO: Investigate adding _malloc_initialize() into this libSystem initializer */
void
__malloc_init(const char *apple[])
{
@@ -336,23 +270,18 @@
// to temporarily allocate at least a page of memory to read the bootargs
// into.
char bootargs[1024] = { '\0' };
- bool allow_bootargs = true;
-#if CONFIG_FEATUREFLAGS_SIMPLE
- allow_bootargs &= os_feature_enabled_simple(libmalloc, EnableBootArgs, false);
+ size_t len = sizeof(bootargs) - 1;
+ if (!sysctlbyname("kern.bootargs", bootargs, &len, NULL, 0) && len > 0) {
+ bootargs[len + 1] = '\0';
+ }
+
+#if CONFIG_NANOZONE
+ // TODO: envp should be passed down from Libsystem
+ const char **envp = (const char **)*_NSGetEnviron();
+ nano_common_init(envp, apple, bootargs);
#endif
-#if defined(_COMM_PAGE_DEV_FIRM)
- allow_bootargs &= !!*((uint32_t *)_COMM_PAGE_DEV_FIRM);
-#endif // _COMM_PAGE_DEV_FIRM
-
- size_t len = sizeof(bootargs) - 1;
- if (allow_bootargs &&
- !sysctlbyname("kern.bootargs", bootargs, &len, NULL, 0) &&
- len > 0) {
- bootargs[len + 1] = '\0';
- }
const char **p;
- const char *malloc_experiments = NULL;
for (p = apple; p && *p; p++) {
if (strstr(*p, "malloc_entropy") == *p) {
int count = __entropy_from_kernel(*p);
@@ -361,9 +290,7 @@
if (sizeof(malloc_entropy) / sizeof(malloc_entropy[0]) == count) {
_malloc_entropy_initialized = true;
}
- }
- if (strstr(*p, LIBMALLOC_EXPERIMENT_FACTORS_KEY) == *p) {
- malloc_experiments = *p;
+ break;
}
}
if (!_malloc_entropy_initialized) {
@@ -371,45 +298,8 @@
_malloc_entropy_initialized = true;
}
- if (malloc_experiments) {
- __malloc_init_experiments(malloc_experiments);
- }
__malloc_init_from_bootargs(bootargs);
mvm_aslr_init();
-
- /*
- * This really is a renamed call to malloc_default_zone() which is
- * interposable and interposed by asan, so that we trigger the lazy
- * initialization of asan _BEFORE_ _malloc_initialize().
- *
- * If we do it after, then _malloc_initialize() then ASAN will replace
- * the system allocator too late and bad things happen.
- */
- force_asan_init_if_present();
-
- _malloc_initialize(apple, bootargs);
-}
-
-static void register_pgm_zone(bool internal_diagnostics);
-static void stack_logging_early_finished(const struct _malloc_late_init *funcs);
-
-// WARNING: The passed _malloc_late_init is a stack variable in
-// libSystem_initializer(). We must not hold on to it.
-//
-// WARNING 2: By the time this is called, malloc() is already used
-// a bunch of times (from libobjc, libxpc, ...).
-void
-__malloc_late_init(const struct _malloc_late_init *mli)
-{
- register_pgm_zone(mli->internal_diagnostics);
- stack_logging_early_finished(mli);
- initial_num_zones = malloc_num_zones;
-
-#if CONFIG_QUARANTINE
- if (malloc_quarantine_enabled) {
- quarantine_reset_environment();
- }
-#endif
}
MALLOC_NOEXPORT malloc_zone_t* lite_zone = NULL;
@@ -660,7 +550,11 @@
/*static*/ boolean_t
has_default_zone0(void)
{
- return !has_injected_zone0;
+ if (!malloc_zones) {
+ return false;
+ }
+
+ return initial_default_zone == malloc_zones[0];
}
static inline malloc_zone_t *find_registered_zone(const void *, size_t *) __attribute__((always_inline));
@@ -688,37 +582,32 @@
return default_zone;
}
}
-
- malloc_zone_t *zone;
- size_t size;
-
- // We assume that the initial zones will never be unregistered concurrently while this code is running so we can have
- // a fast path without synchronization. Callers who really do unregister these (to install their own default zone) need
- // to ensure they establish their zone setup during initialization and before entering a multi-threaded environment.
- for (uint32_t i = 0; i < initial_num_zones; i++) {
- zone = malloc_zones[i];
- size = zone->size(zone, ptr);
-
- if (size) { // Claimed by this zone?
- if (returned_size) {
- *returned_size = size;
- }
-
- // Asan and others replace the zone at position 0 with their own zone.
- // In that case just return that zone as they need this information.
- // Otherwise return the virtual default zone, not the actual zone in position 0.
- if (i == 0 && has_default_zone0()) {
- return default_zone;
- }
-
+
+ // The default zone is registered in malloc_zones[0]. There's no danger that it will ever be unregistered.
+ // So don't advance the FRZ counter yet.
+ malloc_zone_t *zone = malloc_zones[0];
+ size_t size = zone->size(zone, ptr);
+ if (size) { // Claimed by this zone?
+ if (returned_size) {
+ *returned_size = size;
+ }
+
+ // Asan and others replace the zone at position 0 with their own zone.
+ // In that case just return that zone as they need this information.
+ // Otherwise return the virtual default zone, not the actual zone in position 0.
+ if (!has_default_zone0()) {
return zone;
+ } else {
+ return default_zone;
}
}
int32_t volatile *pFRZCounter = pFRZCounterLive; // Capture pointer to the counter of the moment
OSAtomicIncrement32Barrier(pFRZCounter); // Advance this counter -- our thread is in FRZ
+ unsigned index;
int32_t limit = *(int32_t volatile *)&malloc_num_zones;
+ malloc_zone_t **zones = &malloc_zones[1];
// From this point on, FRZ is accessing the malloc_zones[] array without locking
// in order to avoid contention on common operations (such as non-default-zone free()).
@@ -735,8 +624,8 @@
// are still valid). It also ensures that all the pointers in the zones array are
// valid until it returns, so that a stale value in limit is not dangerous.
- for (uint32_t i = initial_num_zones; i < limit; i++) {
- zone = malloc_zones[i];
+ for (index = 1; index < limit; ++index, ++zones) {
+ zone = *zones;
size = zone->size(zone, ptr);
if (size) { // Claimed by this zone?
goto out;
@@ -802,7 +691,7 @@
static void set_flags_from_environment(void);
MALLOC_NOEXPORT void
-malloc_zone_register_while_locked(malloc_zone_t *zone, bool make_default)
+malloc_zone_register_while_locked(malloc_zone_t *zone)
{
size_t protect_size;
unsigned i;
@@ -851,13 +740,6 @@
mprotect(malloc_zones, protect_size, PROT_READ | PROT_WRITE);
}
- if (make_default) {
- memmove(&malloc_zones[1], &malloc_zones[0], malloc_num_zones * sizeof(malloc_zone_t *));
- malloc_zones[0] = zone;
- } else {
- malloc_zones[malloc_num_zones] = zone;
- }
-
/* <rdar://problem/12871662> This store-increment needs to be visible in the correct
* order to any threads in find_registered_zone, such that if the incremented value
* in malloc_num_zones is visible then the pointer write before it must also be visible.
@@ -866,29 +748,30 @@
* ensure the proper store-release operation is performed is to use OSAtomic*Barrier
* to update malloc_num_zones.
*/
+ malloc_zones[malloc_num_zones] = zone;
OSAtomicIncrement32Barrier(&malloc_num_zones);
/* Finally, now that the zone is registered, disallow write access to the
* malloc_zones array */
mprotect(malloc_zones, protect_size, PROT_READ);
-
- // ASan and others interpose on mprotect() to ensure their zone is always at position 0.
- if (make_default && malloc_zones[0] != zone) {
- has_injected_zone0 = true;
- }
-
//malloc_report(ASL_LEVEL_INFO, "Registered malloc_zone %p in malloc_zones %p [%u zones, %u bytes]\n", zone, malloc_zones,
// malloc_num_zones, protect_size);
}
-// This used to be called lazyily because it is using
-// dyld_process_is_restricted() before dyld_init() has run.
-//
-// However this function is safe to use, we keep this function separate
-// if we ever need to have a 2-stage init in the future.
+// To be used in _malloc_initialize_once() only, call that function instead.
static void
-_malloc_initialize(const char *apple[], const char *bootargs)
-{
+_malloc_initialize(void *context __unused)
+{
+ MALLOC_LOCK();
+ unsigned n;
+ malloc_zone_t *zone = NULL;
+
+ if (!_malloc_entropy_initialized) {
+ // Lazy initialization may occur before __malloc_init (rdar://27075409)
+ // TODO: make this a fatal error
+ malloc_report(ASL_LEVEL_ERR, "*** malloc was initialized without entropy\n");
+ }
+
phys_ncpus = *(uint8_t *)(uintptr_t)_COMM_PAGE_PHYSICAL_CPUS;
logical_ncpus = *(uint8_t *)(uintptr_t)_COMM_PAGE_LOGICAL_CPUS;
@@ -928,94 +811,70 @@
}
set_flags_from_environment(); // will only set flags up to two times
-
-#if CONFIG_QUARANTINE
- malloc_quarantine_enabled = quarantine_should_enable();
-#endif
-
-#if CONFIG_NANOZONE
- // TODO: envp should be passed down from Libsystem
- const char **envp = (const char **)*_NSGetEnviron();
-
- // Force magazine_malloc then quarantine is enabled, to avoid speculative
- // out-of-bounds use-after-free reads that nano/nanov2 performs.
- if (!malloc_quarantine_enabled) {
- nano_common_init(envp, apple, bootargs);
- }
-#endif // CONFIG_NANOZONE
-
- initial_scalable_zone = create_scalable_zone(0, malloc_debug_flags);
- malloc_set_zone_name(initial_scalable_zone, DEFAULT_MALLOC_ZONE_STRING);
- malloc_zone_register_while_locked(initial_scalable_zone, /*make_default=*/true);
+ n = malloc_num_zones;
#if CONFIG_NANOZONE
nano_common_configure();
-
- malloc_zone_t *helper_zone = initial_scalable_zone;
+
+ malloc_zone_t *helper_zone = create_scalable_zone(0, malloc_debug_flags);
if (_malloc_engaged_nano == NANO_V2) {
- initial_nano_zone = nanov2_create_zone(helper_zone, malloc_debug_flags);
- }
-
- if (initial_nano_zone) {
- malloc_set_zone_name(initial_nano_zone, DEFAULT_MALLOC_ZONE_STRING);
+ zone = nanov2_create_zone(helper_zone, malloc_debug_flags);
+ } else if (_malloc_engaged_nano == NANO_V1) {
+ zone = nano_create_zone(helper_zone, malloc_debug_flags);
+ }
+
+ if (zone) {
+ malloc_zone_register_while_locked(zone);
+ malloc_zone_register_while_locked(helper_zone);
+
+ // Must call malloc_set_zone_name() *after* helper and nano are hooked together.
+ malloc_set_zone_name(zone, DEFAULT_MALLOC_ZONE_STRING);
malloc_set_zone_name(helper_zone, MALLOC_HELPER_ZONE_STRING);
- malloc_zone_register_while_locked(initial_nano_zone, /*make_default=*/true);
- }
+ } else {
+ zone = helper_zone;
+ malloc_zone_register_while_locked(zone);
+ malloc_set_zone_name(zone, DEFAULT_MALLOC_ZONE_STRING);
+ }
+#else
+ zone = create_scalable_zone(0, malloc_debug_flags);
+ malloc_zone_register_while_locked(zone);
+ malloc_set_zone_name(zone, DEFAULT_MALLOC_ZONE_STRING);
#endif
-#if CONFIG_QUARANTINE
- if (malloc_quarantine_enabled) {
- malloc_zone_t *wrapped_zone = malloc_zones[0];
- malloc_zone_t *quarantine_zone = quarantine_create_zone(wrapped_zone);
- malloc_zone_register_while_locked(quarantine_zone, /*make_default=*/true);
- }
-#endif
-
- initial_num_zones = malloc_num_zones;
-
-#if CONFIG_MEDIUM_ALLOCATOR
- uint64_t memsize = platform_hw_memsize();
- if (memsize >= 8 * magazine_medium_madvise_dram_scale_divisor) {
- magazine_medium_madvise_window_scale_factor = 8;
- } else if (memsize >= 4 * magazine_medium_madvise_dram_scale_divisor) {
- magazine_medium_madvise_window_scale_factor = 4;
- } else if (memsize >= 2 * magazine_medium_madvise_dram_scale_divisor) {
- magazine_medium_madvise_window_scale_factor = 2;
- } else {
- magazine_medium_madvise_window_scale_factor = 1;
- }
-#endif /* CONFIG_MEDIUM_ALLOCATOR */
+ initial_default_zone = zone;
+
+ if (n != 0) { // make the default first, for efficiency
+ unsigned protect_size = malloc_num_zones_allocated * sizeof(malloc_zone_t *);
+ malloc_zone_t *hold = malloc_zones[0];
+
+ if (hold->zone_name && strcmp(hold->zone_name, DEFAULT_MALLOC_ZONE_STRING) == 0) {
+ malloc_set_zone_name(hold, NULL);
+ }
+
+ mprotect(malloc_zones, protect_size, PROT_READ | PROT_WRITE);
+ malloc_zones[0] = malloc_zones[n];
+ malloc_zones[n] = hold;
+ mprotect(malloc_zones, protect_size, PROT_READ);
+ }
// malloc_report(ASL_LEVEL_INFO, "%d registered zones\n", malloc_num_zones);
// malloc_report(ASL_LEVEL_INFO, "malloc_zones is at %p; malloc_num_zones is at %p\n", (unsigned)&malloc_zones,
// (unsigned)&malloc_num_zones);
-}
-
-static bool internal_build;
-static bool
-enable_pgm(void)
-{
- bool other_debug_tool = has_injected_zone0 || malloc_quarantine_enabled;
- return !other_debug_tool && pgm_should_enable(internal_build);
-}
-
-static void
-register_pgm_zone(bool internal_diagnostics)
-{
- if (internal_diagnostics) {
- internal_build = true;
- }
- if (enable_pgm()) {
- malloc_zone_t *wrapped_zone = malloc_zones[0];
- malloc_zone_t *pgm_zone = pgm_create_zone(wrapped_zone);
- malloc_zone_register_while_locked(pgm_zone, /*make_default=*/true);
- }
+ MALLOC_UNLOCK();
+}
+
+MALLOC_ALWAYS_INLINE
+static inline void
+_malloc_initialize_once(void)
+{
+ os_once(&_malloc_initialize_pred, NULL, _malloc_initialize);
}
static inline malloc_zone_t *
inline_malloc_default_zone(void)
{
+ _malloc_initialize_once();
// malloc_report(ASL_LEVEL_INFO, "In inline_malloc_default_zone with %d %d\n", malloc_num_zones, malloc_has_debug_zone);
return malloc_zones[0];
}
@@ -1024,6 +883,41 @@
malloc_default_zone(void)
{
return default_zone;
+}
+
+static inline malloc_zone_t *inline_malloc_default_scalable_zone(void) __attribute__((always_inline));
+static inline malloc_zone_t *
+inline_malloc_default_scalable_zone(void)
+{
+ unsigned index;
+
+ _malloc_initialize_once();
+ // malloc_report(ASL_LEVEL_INFO, "In inline_malloc_default_scalable_zone with %d %d\n", malloc_num_zones,
+ // malloc_has_debug_zone);
+
+ MALLOC_LOCK();
+#if CONFIG_NANOZONE
+ for (index = 0; index < malloc_num_zones; ++index) {
+ malloc_zone_t *z = malloc_zones[index];
+
+ if (z->zone_name && strcmp(z->zone_name, MALLOC_HELPER_ZONE_STRING) == 0) {
+ MALLOC_UNLOCK();
+ return z;
+ }
+ }
+#endif
+ for (index = 0; index < malloc_num_zones; ++index) {
+ malloc_zone_t *z = malloc_zones[index];
+
+ if (z->zone_name && strcmp(z->zone_name, DEFAULT_MALLOC_ZONE_STRING) == 0) {
+ MALLOC_UNLOCK();
+ return z;
+ }
+ }
+ MALLOC_UNLOCK();
+
+ malloc_report(ASL_LEVEL_ERR, "*** malloc_default_scalable_zone() failed to find 'DefaultMallocZone'\n");
+ return NULL; // FIXME: abort() instead?
}
static void *
@@ -1086,7 +980,7 @@
// PR_7288598: Must pass a *scalable* zone (szone) as the helper for create_purgeable_zone().
// Take care that the zone so obtained is not subject to interposing.
//
- malloc_zone_t *tmp = create_purgeable_zone(0, initial_scalable_zone, malloc_debug_flags);
+ malloc_zone_t *tmp = create_purgeable_zone(0, inline_malloc_default_scalable_zone(), malloc_debug_flags);
malloc_zone_register(tmp);
malloc_set_zone_name(tmp, DEFAULT_PUREGEABLE_ZONE_STRING);
if (!OSAtomicCompareAndSwapPtrBarrier(NULL, tmp, (void**)&dpz)) {
@@ -1114,7 +1008,6 @@
malloc_debug_flags = MALLOC_ABORT_ON_CORRUPTION;
}
#endif
-
/*
* Given that all environment variables start with "Malloc" we optimize by scanning quickly
* first the environment, therefore avoiding repeated calls to getenv().
@@ -1146,32 +1039,19 @@
return;
}
- flag = getenv("MallocGuardEdges");
- if (flag) {
- if (!strcmp(flag, "all")) {
- // "MallocGuardEdges=all" adds guard page(s) for every region.
- // Do not do this on 32-bit platforms because there is insufficient
- // address space. These pages are always protected.
-#if MALLOC_TARGET_64BIT
- malloc_debug_flags |= MALLOC_GUARD_ALL | MALLOC_ADD_GUARD_PAGE_FLAGS;
- malloc_debug_flags &= ~(MALLOC_DONT_PROTECT_PRELUDE|MALLOC_DONT_PROTECT_POSTLUDE);
- malloc_report(ASL_LEVEL_INFO, "adding guard pages to all regions\n");
-#endif // MALLOC_TARGET_64BIT
- } else {
- malloc_debug_flags |= MALLOC_ADD_GUARD_PAGE_FLAGS;
- malloc_debug_flags &= ~MALLOC_GUARD_ALL;
- malloc_report(ASL_LEVEL_INFO, "adding guard pages for large allocator blocks\n");
- if (getenv("MallocDoNotProtectPrelude")) {
- malloc_debug_flags |= MALLOC_DONT_PROTECT_PRELUDE;
- malloc_report(ASL_LEVEL_INFO, "... but not protecting prelude guard page\n");
- }
- if (getenv("MallocDoNotProtectPostlude")) {
- malloc_debug_flags |= MALLOC_DONT_PROTECT_POSTLUDE;
- malloc_report(ASL_LEVEL_INFO, "... but not protecting postlude guard page\n");
- }
- }
- }
-
+ if (getenv("MallocGuardEdges")) {
+ malloc_debug_flags |= MALLOC_ADD_GUARD_PAGES;
+ malloc_report(ASL_LEVEL_INFO, "protecting edges\n");
+ if (getenv("MallocDoNotProtectPrelude")) {
+ malloc_debug_flags |= MALLOC_DONT_PROTECT_PRELUDE;
+ malloc_report(ASL_LEVEL_INFO, "... but not protecting prelude guard page\n");
+ }
+ if (getenv("MallocDoNotProtectPostlude")) {
+ malloc_debug_flags |= MALLOC_DONT_PROTECT_POSTLUDE;
+ malloc_report(ASL_LEVEL_INFO, "... but not protecting postlude guard page\n");
+ }
+ }
+
if (getenv("MallocScribble")) {
malloc_debug_flags |= MALLOC_DO_SCRIBBLE;
malloc_report(ASL_LEVEL_INFO, "enabling scribbling to detect mods to free blocks\n");
@@ -1269,40 +1149,6 @@
}
}
- flag = getenv("MallocLargeDisableASLR");
- if (flag) {
- uint64_t value = (uint64_t)strtoull(flag, NULL, 0);
- if (value == 0) {
- malloc_report(ASL_LEVEL_INFO, "Enabling ASLR slide on large allocations\n");
- malloc_debug_flags &= ~DISABLE_LARGE_ASLR;
- } else if (value != 0) {
- malloc_report(ASL_LEVEL_INFO, "Disabling ASLR slide on large allocations\n");
- malloc_debug_flags |= DISABLE_LARGE_ASLR;
- }
- }
-
-#if CONFIG_AGGRESSIVE_MADVISE || CONFIG_LARGE_CACHE
- // convenience flag to configure policies usually associated with memory-constrained platforms (iOS)
- // that trade some amount of time efficiency for space efficiency
- flag = getenv("MallocSpaceEfficient");
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
-#if CONFIG_AGGRESSIVE_MADVISE
- aggressive_madvise_enabled = (value == 1);
-#endif // CONFIG_AGGRESSIVE_MADVISE
-#if CONFIG_LARGE_CACHE
- large_cache_enabled = (value == 0);
-#endif // CONFIG_LARGE_CACHE
- malloc_space_efficient_enabled = (value == 1);
- // consider disabling medium magazine if aggressive madvise is not sufficient
- } else {
- malloc_report(ASL_LEVEL_ERR, "MallocSpaceEfficient must be 0 or 1.\n");
- }
- }
-#endif // CONFIG_AGGRESSIVE_MADVISE || CONFIG_LARGE_CACHE
-
#if CONFIG_MEDIUM_ALLOCATOR
flag = getenv("MallocMediumZone");
if (flag) {
@@ -1325,23 +1171,6 @@
magazine_medium_active_threshold = value;
malloc_report(ASL_LEVEL_INFO, "Medium activation threshold set to %lly\n", magazine_medium_active_threshold);
}
- }
-
- flag = getenv("MallocMediumSpaceEfficient");
- if (flag) {
- uint64_t value = (uint64_t)strtoull(flag, NULL, 0);
- if (value == 0) {
- malloc_medium_space_efficient_enabled = false;
- } else if (value == 1) {
- malloc_medium_space_efficient_enabled = true;
- }
- }
-
- if (malloc_medium_space_efficient_enabled && malloc_space_efficient_enabled) {
- // Bring down MallocMaxMediumMagazines to only a single magazine in
- // space-efficent processes but do this before the envvar so that it
- // can still be overridden at the command line.
- max_medium_magazines = 1;
}
flag = getenv("MallocMaxMediumMagazines");
@@ -1365,32 +1194,6 @@
}
}
#endif // CONFIG_MEDIUM_ALLOCATOR
-
-#if CONFIG_AGGRESSIVE_MADVISE
- flag = getenv("MallocAggressiveMadvise");
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
- aggressive_madvise_enabled = (value == 1);
- } else {
- malloc_report(ASL_LEVEL_ERR, "MallocAggressiveMadvise must be 0 or 1.\n");
- }
- }
-#endif // CONFIG_AGGRESSIVE_MADVISE
-
-#if CONFIG_LARGE_CACHE
- flag = getenv("MallocLargeCache");
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
- large_cache_enabled = (value == 1);
- } else {
- malloc_report(ASL_LEVEL_ERR, "MallocLargeCache must be 0 or 1.\n");
- }
- }
-#endif // CONFIG_LARGE_CACHE
#if CONFIG_RECIRC_DEPOT
flag = getenv("MallocRecircRetainedRegions");
@@ -1436,16 +1239,9 @@
if (start_size > MALLOC_ABSOLUTE_MAX_SIZE) {
return NULL;
}
-
+ _malloc_initialize_once();
zone = create_scalable_zone(start_size, flags | malloc_debug_flags);
malloc_zone_register(zone);
-
-#if CONFIG_PGM_WRAP_CUSTOM_ZONES
- if (enable_pgm()) {
- zone = pgm_create_zone(zone);
- malloc_zone_register(zone);
- }
-#endif
return zone;
}
@@ -1457,10 +1253,13 @@
malloc_create_legacy_default_zone(void)
{
malloc_zone_t *zone;
-
+ int i;
+
+ _malloc_initialize_once();
zone = create_legacy_scalable_zone(0, malloc_debug_flags);
MALLOC_LOCK();
+ malloc_zone_register_while_locked(zone);
//
// Establish the legacy scalable zone just created as the default zone.
@@ -1471,7 +1270,16 @@
}
malloc_set_zone_name(zone, DEFAULT_MALLOC_ZONE_STRING);
- malloc_zone_register_while_locked(zone, /*make_default=*/true);
+ unsigned protect_size = malloc_num_zones_allocated * sizeof(malloc_zone_t *);
+ mprotect(malloc_zones, protect_size, PROT_READ | PROT_WRITE);
+
+ // assert(zone == malloc_zones[malloc_num_zones - 1];
+ for (i = malloc_num_zones - 1; i > 0; --i) {
+ malloc_zones[i] = malloc_zones[i - 1];
+ }
+ malloc_zones[0] = zone;
+
+ mprotect(malloc_zones, protect_size, PROT_READ);
MALLOC_UNLOCK();
}
@@ -1556,13 +1364,9 @@
/********* Block creation and manipulation ************/
-__attribute__((cold, noinline))
static void
internal_check(void)
{
- if (malloc_check_counter++ < malloc_check_start) {
- return;
- }
if (malloc_zone_check(NULL)) {
if (!frames) {
vm_allocate(mach_task_self(), (void *)&frames, vm_page_size, 1);
@@ -1572,123 +1376,72 @@
malloc_check_start += malloc_check_each;
}
-__options_decl(malloc_zone_options_t, unsigned, {
- MZ_NONE = 0x0,
- MZ_POSIX = 0x1,
- MZ_C11 = 0x2,
-});
-
-static inline void
-malloc_set_errno_fast(malloc_zone_options_t mzo, int err)
-{
- if (mzo & MZ_POSIX) {
-#if TARGET_OS_SIMULATOR
- errno = err;
-#else
- (*_pthread_errno_address_direct()) = err;
-#endif
- }
-}
-
-MALLOC_NOINLINE
-static void *
-_malloc_zone_malloc(malloc_zone_t *zone, size_t size, malloc_zone_options_t mzo)
-{
- MALLOC_TRACE(TRACE_malloc | DBG_FUNC_START, (uintptr_t)zone, size, 0, 0);
-
- void *ptr = NULL;
-
- if (malloc_check_start) {
- internal_check();
- }
- if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
- goto out;
- }
-
- ptr = zone->malloc(zone, size); // if lite zone is passed in then we still call the lite methods
-
- if (os_unlikely(malloc_logger)) {
- malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)ptr, 0);
- }
-
- MALLOC_TRACE(TRACE_malloc | DBG_FUNC_END, (uintptr_t)zone, size, (uintptr_t)ptr, 0);
-out:
- if (os_unlikely(ptr == NULL)) {
- malloc_set_errno_fast(mzo, ENOMEM);
- }
- return ptr;
-}
-
void *
malloc_zone_malloc(malloc_zone_t *zone, size_t size)
{
- return _malloc_zone_malloc(zone, size, MZ_NONE);
-}
-
-MALLOC_NOINLINE
-static void *
-_malloc_zone_calloc(malloc_zone_t *zone, size_t num_items, size_t size,
- malloc_zone_options_t mzo)
+ MALLOC_TRACE(TRACE_malloc | DBG_FUNC_START, (uintptr_t)zone, size, 0, 0);
+
+ void *ptr;
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
+ internal_check();
+ }
+ if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
+ return NULL;
+ }
+
+ ptr = zone->malloc(zone, size); // if lite zone is passed in then we still call the lite methods
+
+
+ if (malloc_logger) {
+ malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)ptr, 0);
+ }
+
+ MALLOC_TRACE(TRACE_malloc | DBG_FUNC_END, (uintptr_t)zone, size, (uintptr_t)ptr, 0);
+ return ptr;
+}
+
+void *
+malloc_zone_calloc(malloc_zone_t *zone, size_t num_items, size_t size)
{
MALLOC_TRACE(TRACE_calloc | DBG_FUNC_START, (uintptr_t)zone, num_items, size, 0);
void *ptr;
- if (malloc_check_start) {
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
ptr = zone->calloc(zone, num_items, size);
-
- if (os_unlikely(malloc_logger)) {
+
+ if (malloc_logger) {
malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE | MALLOC_LOG_TYPE_CLEARED, (uintptr_t)zone,
(uintptr_t)(num_items * size), 0, (uintptr_t)ptr, 0);
}
MALLOC_TRACE(TRACE_calloc | DBG_FUNC_END, (uintptr_t)zone, num_items, size, (uintptr_t)ptr);
- if (os_unlikely(ptr == NULL)) {
- malloc_set_errno_fast(mzo, ENOMEM);
- }
- return ptr;
-}
-
-void *
-malloc_zone_calloc(malloc_zone_t *zone, size_t num_items, size_t size)
-{
- return _malloc_zone_calloc(zone, num_items, size, MZ_NONE);
-}
-
-MALLOC_NOINLINE
-static void *
-_malloc_zone_valloc(malloc_zone_t *zone, size_t size, malloc_zone_options_t mzo)
-{
- MALLOC_TRACE(TRACE_valloc | DBG_FUNC_START, (uintptr_t)zone, size, 0, 0);
-
- void *ptr = NULL;
- if (malloc_check_start) {
- internal_check();
- }
- if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
- goto out;
- }
-
- ptr = zone->valloc(zone, size);
-
- if (os_unlikely(malloc_logger)) {
- malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)ptr, 0);
- }
-
- MALLOC_TRACE(TRACE_valloc | DBG_FUNC_END, (uintptr_t)zone, size, (uintptr_t)ptr, 0);
-out:
- if (os_unlikely(ptr == NULL)) {
- malloc_set_errno_fast(mzo, ENOMEM);
- }
return ptr;
}
void *
malloc_zone_valloc(malloc_zone_t *zone, size_t size)
{
- return _malloc_zone_valloc(zone, size, MZ_NONE);
+ MALLOC_TRACE(TRACE_valloc | DBG_FUNC_START, (uintptr_t)zone, size, 0, 0);
+
+ void *ptr;
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
+ internal_check();
+ }
+ if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
+ return NULL;
+ }
+
+ ptr = zone->valloc(zone, size);
+
+ if (malloc_logger) {
+ malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)ptr, 0);
+ }
+
+ MALLOC_TRACE(TRACE_valloc | DBG_FUNC_END, (uintptr_t)zone, size, (uintptr_t)ptr, 0);
+ return ptr;
}
void *
@@ -1697,7 +1450,7 @@
MALLOC_TRACE(TRACE_realloc | DBG_FUNC_START, (uintptr_t)zone, (uintptr_t)ptr, size, 0);
void *new_ptr;
- if (malloc_check_start) {
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
@@ -1706,7 +1459,7 @@
new_ptr = zone->realloc(zone, ptr, size);
- if (os_unlikely(malloc_logger)) {
+ if (malloc_logger) {
malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone,
(uintptr_t)ptr, (uintptr_t)size, (uintptr_t)new_ptr, 0);
}
@@ -1719,10 +1472,10 @@
{
MALLOC_TRACE(TRACE_free, (uintptr_t)zone, (uintptr_t)ptr, (ptr) ? *(uintptr_t*)ptr : 0, 0);
- if (os_unlikely(malloc_logger)) {
+ if (malloc_logger) {
malloc_logger(MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)ptr, 0, 0, 0);
}
- if (malloc_check_start) {
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
@@ -1734,10 +1487,10 @@
{
MALLOC_TRACE(TRACE_free, (uintptr_t)zone, (uintptr_t)ptr, size, (ptr && size) ? *(uintptr_t*)ptr : 0);
- if (os_unlikely(malloc_logger)) {
+ if (malloc_logger) {
malloc_logger(MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)ptr, 0, 0, 0);
}
- if (malloc_check_start) {
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
@@ -1754,58 +1507,37 @@
}
}
-MALLOC_NOINLINE
-static void *
-_malloc_zone_memalign(malloc_zone_t *zone, size_t alignment, size_t size,
- malloc_zone_options_t mzo)
+void *
+malloc_zone_memalign(malloc_zone_t *zone, size_t alignment, size_t size)
{
MALLOC_TRACE(TRACE_memalign | DBG_FUNC_START, (uintptr_t)zone, alignment, size, 0);
- void *ptr = NULL;
- int err = ENOMEM;
+ void *ptr;
if (zone->version < 5) { // Version must be >= 5 to look at the new memalign field.
- goto out;
- }
- if (malloc_check_start) {
+ return NULL;
+ }
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
- goto out;
+ return NULL;
}
if (alignment < sizeof(void *) || // excludes 0 == alignment
0 != (alignment & (alignment - 1))) { // relies on sizeof(void *) being a power of two.
- err = EINVAL;
- goto out;
- }
- if ((mzo & MZ_C11) && (size & (alignment - 1)) != 0) { /* C11 requires size to be a multiple of alignment */
- err = EINVAL;
- goto out;
+ return NULL;
}
if (!(zone->memalign)) {
- goto out;
+ return NULL;
}
ptr = zone->memalign(zone, alignment, size);
- if (os_unlikely(malloc_logger)) {
+ if (malloc_logger) {
malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)ptr, 0);
}
MALLOC_TRACE(TRACE_memalign | DBG_FUNC_END, (uintptr_t)zone, alignment, size, (uintptr_t)ptr);
-
-out:
- if (os_unlikely(ptr == NULL)) {
- if (mzo & MZ_POSIX) {
- malloc_set_errno_fast(mzo, err);
- }
- }
return ptr;
-}
-
-void *
-malloc_zone_memalign(malloc_zone_t *zone, size_t alignment, size_t size)
-{
- return _malloc_zone_memalign(zone, alignment, size, MZ_NONE);
}
boolean_t
@@ -1816,7 +1548,7 @@
return false;
}
- if (malloc_check_start) {
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
@@ -1835,7 +1567,7 @@
malloc_zone_register(malloc_zone_t *zone)
{
MALLOC_LOCK();
- malloc_zone_register_while_locked(zone, false);
+ malloc_zone_register_while_locked(zone);
MALLOC_UNLOCK();
}
@@ -1866,10 +1598,6 @@
--malloc_num_zones;
mprotect(malloc_zones, protect_size, PROT_READ);
-
- // MAX(num_zones, 1) retains the fast path in find_registered_zone() for zone 0 even
- // if it is a custom zone, e.g., ASan and user zones.
- initial_num_zones = MAX(MIN(malloc_num_zones, initial_num_zones), 1);
// Exchange the roles of the FRZ counters. The counter that has captured the number of threads presently
// executing *inside* find_registered_zone is swapped with the counter drained to zero last time through.
@@ -1894,24 +1622,21 @@
void
malloc_set_zone_name(malloc_zone_t *z, const char *name)
{
+ char *newName;
+
mprotect(z, sizeof(malloc_zone_t), PROT_READ | PROT_WRITE);
if (z->zone_name) {
- malloc_zone_t *old_zone = find_registered_zone(z->zone_name, NULL);
- if (old_zone) {
- malloc_zone_free(old_zone, (char *)z->zone_name);
- }
+ free((char *)z->zone_name);
z->zone_name = NULL;
}
if (name) {
size_t buflen = strlen(name) + 1;
- if (_dyld_is_memory_immutable(name, buflen)) {
- z->zone_name = name;
+ newName = malloc_zone_malloc(z, buflen);
+ if (newName) {
+ strlcpy(newName, name, buflen);
+ z->zone_name = (const char *)newName;
} else {
- char *name_copy = _malloc_zone_malloc(z, buflen, MZ_NONE);
- if (name_copy) {
- strlcpy(name_copy, name, buflen);
- z->zone_name = name_copy;
- }
+ z->zone_name = NULL;
}
}
mprotect(z, sizeof(malloc_zone_t), PROT_READ);
@@ -1929,20 +1654,39 @@
void *
malloc(size_t size)
{
- return _malloc_zone_malloc(default_zone, size, MZ_POSIX);
+ void *retval;
+ retval = malloc_zone_malloc(default_zone, size);
+ if (retval == NULL) {
+ errno = ENOMEM;
+ }
+ return retval;
}
void *
aligned_alloc(size_t alignment, size_t size)
{
- return _malloc_zone_memalign(default_zone, alignment, size,
- MZ_POSIX | MZ_C11);
+ if (alignment < sizeof(void *) || !powerof2(alignment) || /* those are implementation requirements */
+ (size & (alignment - 1)) != 0) { /* C11 requires size to be a multiple of alignment */
+ errno = EINVAL;
+ return NULL;
+ }
+
+ void *retval = malloc_zone_memalign(default_zone, alignment, size);
+ if (retval == NULL) {
+ errno = ENOMEM;
+ }
+ return retval;
}
void *
calloc(size_t num_items, size_t size)
{
- return _malloc_zone_calloc(default_zone, num_items, size, MZ_POSIX);
+ void *retval;
+ retval = malloc_zone_calloc(default_zone, num_items, size);
+ if (retval == NULL) {
+ errno = ENOMEM;
+ }
+ return retval;
}
void
@@ -2001,7 +1745,7 @@
}
if (retval == NULL) {
- malloc_set_errno_fast(MZ_POSIX, ENOMEM);
+ errno = ENOMEM;
} else if (new_size == 0) {
free(in_ptr);
}
@@ -2011,7 +1755,13 @@
void *
valloc(size_t size)
{
- return _malloc_zone_valloc(default_zone, size, MZ_POSIX);
+ void *retval;
+ malloc_zone_t *zone = default_zone;
+ retval = malloc_zone_valloc(zone, size);
+ if (retval == NULL) {
+ errno = ENOMEM;
+ }
+ return retval;
}
extern void
@@ -2094,11 +1844,9 @@
return true;
}
- // Next, try the initial zones.
- for (uint32_t i = 0; i < initial_num_zones; i++) {
- if (malloc_zone_claimed_address(malloc_zones[i], ptr)) {
- return true;
- }
+ // Next, try the default zone, which is always present.
+ if (malloc_zone_claimed_address(malloc_zones[0], ptr)) {
+ return true;
}
// Try all the other zones. Increment the FRZ barrier so that we can
@@ -2108,9 +1856,10 @@
OSAtomicIncrement32Barrier(pFRZCounter);
int32_t limit = *(int32_t volatile *)&malloc_num_zones;
+ malloc_zone_t **zones = &malloc_zones[1];
boolean_t result = false;
- for (uint32_t i = initial_num_zones; i < limit; i++) {
- malloc_zone_t *zone = malloc_zones[i];
+ for (unsigned index = 1; index < limit; ++index, ++zones) {
+ malloc_zone_t *zone = *zones;
if (malloc_zone_claimed_address(zone, ptr)) {
result = true;
break;
@@ -2125,7 +1874,7 @@
reallocarray(void * in_ptr, size_t nmemb, size_t size){
size_t alloc_size;
if (os_mul_overflow(nmemb, size, &alloc_size)){
- malloc_set_errno_fast(MZ_POSIX, ENOMEM);
+ errno = ENOMEM;
return NULL;
}
return realloc(in_ptr, alloc_size);
@@ -2135,7 +1884,7 @@
reallocarrayf(void * in_ptr, size_t nmemb, size_t size){
size_t alloc_size;
if (os_mul_overflow(nmemb, size, &alloc_size)){
- malloc_set_errno_fast(MZ_POSIX, ENOMEM);
+ errno = ENOMEM;
return NULL;
}
return reallocf(in_ptr, alloc_size);
@@ -2220,15 +1969,11 @@
malloc_zone_pressure_relief(0, 0);
}
- if ((event & NOTE_MEMORYSTATUS_MSL_STATUS) != 0 && (event & ~NOTE_MEMORYSTATUS_MSL_STATUS) == 0) {
+ if ( ((event & NOTE_MEMORYSTATUS_MSL_STATUS) != 0 && (event & ~NOTE_MEMORYSTATUS_MSL_STATUS) == 0) ||
+ (event & (NOTE_MEMORYSTATUS_PROC_LIMIT_WARN | NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL | NOTE_MEMORYSTATUS_PRESSURE_CRITICAL)))
+ {
malloc_register_stack_logger();
}
-
-#if ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING
- if (event & (NOTE_MEMORYSTATUS_PROC_LIMIT_WARN | NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL | NOTE_MEMORYSTATUS_PRESSURE_CRITICAL)) {
- malloc_register_stack_logger();
- }
-#endif // ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING
if (msl.handle_memory_event) {
// Let MSL see the event.
@@ -2283,12 +2028,12 @@
if (!zone->batch_malloc) {
return 0;
}
- if (malloc_check_start) {
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
unsigned batched = zone->batch_malloc(zone, size, results, num_requested);
- if (os_unlikely(malloc_logger)) {
+ if (malloc_logger) {
unsigned index = 0;
while (index < batched) {
malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0,
@@ -2302,10 +2047,10 @@
void
malloc_zone_batch_free(malloc_zone_t *zone, void **to_be_freed, unsigned num)
{
- if (malloc_check_start) {
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
- if (os_unlikely(malloc_logger)) {
+ if (malloc_logger) {
unsigned index = 0;
while (index < num) {
malloc_logger(
@@ -2557,9 +2302,11 @@
_malloc_fork_child(void)
{
#if CONFIG_NANOZONE
- if (_malloc_entropy_initialized) {
+ if (_malloc_initialize_pred) {
if (_malloc_engaged_nano == NANO_V2) {
- nanov2_forked_zone((nanozonev2_t *)initial_nano_zone);
+ nanov2_forked_zone((nanozonev2_t *)inline_malloc_default_zone());
+ } else if (_malloc_engaged_nano == NANO_V1) {
+ nano_forked_zone((nanozone_t *)inline_malloc_default_zone());
}
}
#endif
@@ -2695,31 +2442,32 @@
#pragma mark -
#pragma mark Malloc Stack Logging
-static bool _malloc_register_stack_logger(bool at_startup);
/* this is called from libsystem during initialization. */
-static void
-stack_logging_early_finished(const struct _malloc_late_init *funcs)
+void
+__stack_logging_early_finished(const struct _malloc_functions *funcs)
{
#if !TARGET_OS_DRIVERKIT
_dlopen = funcs->dlopen;
_dlsym = funcs->dlsym;
#endif
- if (funcs->version >= 2 && funcs->msl) {
- msl = *funcs->msl;
- }
const char **env = (const char**) *_NSGetEnviron();
for (const char **e = env; *e; e++) {
if (0==strncmp(*e, "MallocStackLogging", 18)) {
- _malloc_register_stack_logger(true);
- if (msl.set_flags_from_environment) {
- msl.set_flags_from_environment(env);
+ malloc_register_stack_logger();
+ void (*msl_set_flags_from_environment) (const char **env);
+ msl_set_flags_from_environment = _dlsym(msl.dylib, "msl_set_flags_from_environment");
+ if (msl_set_flags_from_environment) {
+ msl_set_flags_from_environment(env);
}
break;
}
}
- if (msl.initialize) {
- msl.initialize();
+ if (msl.dylib) {
+ void (*initialize) () = _dlsym(msl.dylib, "msl_initialize");
+ if (initialize) {
+ initialize();
+ }
}
}
@@ -2729,70 +2477,45 @@
static void
register_msl_dylib(void *dylib)
{
-#if TARGET_OS_DRIVERKIT
- set_msl_lite_hooks(msl.copy_msl_lite_hooks);
-#else
if (!dylib) {
return;
}
- msld.dylib = dylib;
+ msl.dylib = dylib;
msl.handle_memory_event = _dlsym(dylib, "msl_handle_memory_event");
msl.stack_logging_locked = _dlsym(dylib, "msl_stack_logging_locked");
msl.fork_prepare = _dlsym(dylib, "msl_fork_prepare");
msl.fork_child = _dlsym(dylib, "msl_fork_child");
msl.fork_parent = _dlsym(dylib, "msl_fork_parent");
- msl.turn_on_stack_logging = _dlsym(dylib, "msl_turn_on_stack_logging");
- msl.turn_off_stack_logging = _dlsym(dylib, "msl_turn_off_stack_logging");
- msl.set_flags_from_environment = _dlsym(dylib, "msl_set_flags_from_environment");
- msl.initialize = _dlsym(dylib, "msl_initialize");
-
// TODO delete these ones
- msld.get_frames_for_address = _dlsym(dylib, "msl_get_frames_for_address");
- msld.stackid_for_vm_region = _dlsym(dylib, "msl_stackid_for_vm_region");
- msld.get_frames_for_stackid = _dlsym(dylib, "msl_get_frames_for_stackid");
- msld.uniquing_table_read_stack = _dlsym(dylib, "msl_uniquing_table_read_stack");
+ msl.get_frames_for_address = _dlsym(dylib, "msl_get_frames_for_address");
+ msl.stackid_for_vm_region = _dlsym(dylib, "msl_stackid_for_vm_region");
+ msl.get_frames_for_stackid = _dlsym(dylib, "msl_get_frames_for_stackid");
+ msl.uniquing_table_read_stack = _dlsym(dylib, "msl_uniquing_table_read_stack");
void (*msl_copy_msl_lite_hooks) (struct _malloc_msl_lite_hooks_s *hooksp, size_t size);
msl_copy_msl_lite_hooks = _dlsym(dylib, "msl_copy_msl_lite_hooks");
if (msl_copy_msl_lite_hooks) {
set_msl_lite_hooks(msl_copy_msl_lite_hooks);
}
-#endif
}
MALLOC_EXPORT
boolean_t
malloc_register_stack_logger(void)
{
- return _malloc_register_stack_logger(false);
-}
-
-static bool
-_malloc_register_stack_logger(bool at_startup)
-{
- void *dylib = NULL;
- if (malloc_quarantine_enabled && !at_startup) {
- return false;
- }
-#if !TARGET_OS_DRIVERKIT
- if (msl.handle_memory_event != NULL) {
+ if (msl.dylib != NULL) {
return true;
}
- if (_dlopen == NULL) {
- return false;
- }
- dylib = _dlopen("/System/Library/PrivateFrameworks/MallocStackLogging.framework/MallocStackLogging", RTLD_GLOBAL);
+ void *dylib = _dlopen("/System/Library/PrivateFrameworks/Alternate/MallocStackLogging.framework/MallocStackLogging", RTLD_GLOBAL);
if (dylib == NULL) {
- return false;
- }
-#endif
+ dylib = _dlopen("/System/Library/PrivateFrameworks/MallocStackLogging.framework/MallocStackLogging", RTLD_GLOBAL);
+ }
os_once(&_register_msl_dylib_pred, dylib, register_msl_dylib);
- if (!msl.handle_memory_event) {
+ if (!msl.dylib) {
malloc_report(ASL_LEVEL_WARNING, "failed to load MallocStackLogging.framework\n");
- return false;
- }
- return true;
+ }
+ return msl.dylib == dylib;
}
/* Symbolication.framework looks up this symbol by name inside libsystem_malloc.dylib. */
@@ -2814,48 +2537,55 @@
turn_on_stack_logging(stack_logging_mode_type mode)
{
malloc_register_stack_logger();
- if (!msl.turn_on_stack_logging) {
+ if (!msl.dylib) {
return false;
}
- return msl.turn_on_stack_logging(mode);
+ boolean_t (*msl_turn_on_stack_logging) (stack_logging_mode_type mode);
+ msl_turn_on_stack_logging = _dlsym(msl.dylib, "msl_turn_on_stack_logging");
+ if (!msl_turn_on_stack_logging) {
+ return false;
+ }
+ return msl_turn_on_stack_logging(mode);
}
MALLOC_EXPORT
void turn_off_stack_logging(void)
{
malloc_register_stack_logger();
- if (msl.turn_off_stack_logging) {
- msl.turn_off_stack_logging();
- }
-}
-
-//deprecated
+ if (!msl.dylib) {
+ return;
+ }
+ void (*msl_turn_off_stack_logging) ();
+ msl_turn_off_stack_logging = _dlsym(msl.dylib, "msl_turn_off_stack_logging");
+ if (msl_turn_off_stack_logging) {
+ msl_turn_off_stack_logging();
+ }
+}
+
kern_return_t
__mach_stack_logging_start_reading(task_t task, vm_address_t shared_memory_address, boolean_t *uses_lite_mode)
{
malloc_register_stack_logger();
- if (!msld.dylib) {
+ if (!msl.dylib) {
return KERN_FAILURE;
}
kern_return_t (*f) (task_t task, vm_address_t shared_memory_address, boolean_t *uses_lite_mode);
- f = _dlsym(msld.dylib, "msl_start_reading");
+ f = _dlsym(msl.dylib, "msl_start_reading");
if (!f) {
return KERN_FAILURE;
}
return f(task, shared_memory_address, uses_lite_mode);
}
-
-//deprecated
kern_return_t
__mach_stack_logging_stop_reading(task_t task)
{
malloc_register_stack_logger();
- if (!msld.dylib) {
+ if (!msl.dylib) {
return KERN_FAILURE;
}
kern_return_t (*f) (task_t task);
- f = _dlsym(msld.dylib, "msl_stop_reading");
+ f = _dlsym(msl.dylib, "msl_stop_reading");
if (!f) {
return KERN_FAILURE;
}
@@ -2870,23 +2600,23 @@
uint32_t *count)
{
malloc_register_stack_logger();
- if (!msld.get_frames_for_address) {
+ if (!msl.get_frames_for_address) {
return KERN_FAILURE;
}
- return msld.get_frames_for_address(task, address, stack_frames_buffer, max_stack_frames, count);
+ return msl.get_frames_for_address(task, address, stack_frames_buffer, max_stack_frames, count);
}
uint64_t
__mach_stack_logging_stackid_for_vm_region(task_t task, mach_vm_address_t address)
{
malloc_register_stack_logger();
- if (!msld.stackid_for_vm_region) {
+ if (!msl.stackid_for_vm_region) {
return -1ull;
}
- return msld.stackid_for_vm_region(task, address);
-}
-
-//deprecated
+ return msl.stackid_for_vm_region(task, address);
+}
+
+
kern_return_t
__mach_stack_logging_frames_for_uniqued_stack(task_t task,
uint64_t stack_identifier,
@@ -2895,13 +2625,12 @@
uint32_t *count)
{
malloc_register_stack_logger();
- if (!msld.get_frames_for_stackid) {
+ if (!msl.get_frames_for_stackid) {
return KERN_FAILURE;
}
- return msld.get_frames_for_stackid(task, stack_identifier, stack_frames_buffer, max_stack_frames, count, NULL);
-}
-
-//deprecated
+ return msl.get_frames_for_stackid(task, stack_identifier, stack_frames_buffer, max_stack_frames, count, NULL);
+}
+
kern_return_t
__mach_stack_logging_get_frames_for_stackid(task_t task,
uint64_t stack_identifier,
@@ -2911,13 +2640,12 @@
bool *last_frame_is_threadid)
{
malloc_register_stack_logger();
- if (!msld.get_frames_for_stackid) {
+ if (!msl.get_frames_for_stackid) {
return KERN_FAILURE;
}
- return msld.get_frames_for_stackid(task, stack_identifier, stack_frames_buffer, max_stack_frames, count, last_frame_is_threadid);
-}
-
-//deprecated
+ return msl.get_frames_for_stackid(task, stack_identifier, stack_frames_buffer, max_stack_frames, count, last_frame_is_threadid);
+}
+
kern_return_t
__mach_stack_logging_uniquing_table_read_stack(struct backtrace_uniquing_table *uniquing_table,
uint64_t stackid,
@@ -2926,13 +2654,12 @@
uint32_t max_frames)
{
malloc_register_stack_logger();
- if (!msld.uniquing_table_read_stack) {
+ if (!msl.uniquing_table_read_stack) {
return KERN_FAILURE;
}
- return msld.uniquing_table_read_stack(uniquing_table, stackid, out_frames_buffer, out_frames_count, max_frames);
-}
-
-//deprecated
+ return msl.uniquing_table_read_stack(uniquing_table, stackid, out_frames_buffer, out_frames_count, max_frames);
+}
+
kern_return_t
__mach_stack_logging_enumerate_records(task_t task,
mach_vm_address_t address,
@@ -2944,100 +2671,93 @@
mach_vm_address_t address,
void enumerator(mach_stack_logging_record_t, void *),
void *context);
- if (!msld.dylib) {
+ if (!msl.dylib) {
return KERN_FAILURE;
}
- f = _dlsym(msld.dylib, "msl_disk_stack_logs_enumerate_from_task");
+ f = _dlsym(msl.dylib, "msl_disk_stack_logs_enumerate_from_task");
if (!f) {
return KERN_FAILURE;
}
return f(task, address, enumerator, context);
}
-
-//deprecated
struct backtrace_uniquing_table *
__mach_stack_logging_copy_uniquing_table(task_t task)
{
malloc_register_stack_logger();
struct backtrace_uniquing_table * (*f) (task_t task);
- if (!msld.dylib) {
+ if (!msl.dylib) {
return NULL;
}
- f = _dlsym(msld.dylib, "msl_uniquing_table_copy_from_task");
+ f = _dlsym(msl.dylib, "msl_uniquing_table_copy_from_task");
if (!f) {
return NULL;
}
return f(task);
}
-//deprecated
struct backtrace_uniquing_table *
__mach_stack_logging_uniquing_table_copy_from_serialized(void *buffer, size_t size)
{
malloc_register_stack_logger();
struct backtrace_uniquing_table * (*f) (void *buffer, size_t size);
- if (!msld.dylib) {
+ if (!msl.dylib) {
return NULL;
}
- f = _dlsym(msld.dylib, "msl_uniquing_table_copy_from_serialized");
+ f = _dlsym(msl.dylib, "msl_uniquing_table_copy_from_serialized");
if (!f) {
return NULL;
}
return f(buffer, size);
}
-//deprecated
void
__mach_stack_logging_uniquing_table_release(struct backtrace_uniquing_table *table)
{
malloc_register_stack_logger();
- if (!msld.dylib) {
+ if (!msl.dylib) {
return;
}
void (*f) (struct backtrace_uniquing_table *table);
- f = _dlsym(msld.dylib, "msl_uniquing_table_release");
+ f = _dlsym(msl.dylib, "msl_uniquing_table_release");
if (f) {
f(table);
}
}
-//deprecated
void
__mach_stack_logging_uniquing_table_retain(struct backtrace_uniquing_table *table)
{
malloc_register_stack_logger();
- if (!msld.dylib) {
+ if (!msl.dylib) {
return;
}
void (*f) (struct backtrace_uniquing_table *table);
- f = _dlsym(msld.dylib, "msl_uniquing_table_retain");
+ f = _dlsym(msl.dylib, "msl_uniquing_table_retain");
if (f) {
f(table);
}
}
-//deprecated
extern
size_t
__mach_stack_logging_uniquing_table_sizeof(struct backtrace_uniquing_table *table)
{
malloc_register_stack_logger();
size_t (*f) (struct backtrace_uniquing_table *table);
- f = _dlsym(msld.dylib, "msl_uniquing_table_retain");
+ f = _dlsym(msl.dylib, "msl_uniquing_table_retain");
return f(table);
}
-//deprecated
void *
__mach_stack_logging_uniquing_table_serialize(struct backtrace_uniquing_table *table, mach_vm_size_t *size)
{
malloc_register_stack_logger();
- if (!msld.dylib) {
+ if (!msl.dylib) {
return NULL;
}
void * (*f) (struct backtrace_uniquing_table *table, mach_vm_size_t *size);
- f = _dlsym(msld.dylib, "msl_uniquing_table_serialize");
+ f = _dlsym(msl.dylib, "msl_uniquing_table_serialize");
if (!f) {
return NULL;
}