Loading...
--- libmalloc/libmalloc-166.251.2/src/malloc.c
+++ libmalloc/libmalloc-67/src/malloc.c
@@ -21,42 +21,78 @@
* @APPLE_LICENSE_HEADER_END@
*/
-#include "internal.h"
-
-#if TARGET_OS_IPHONE
-// malloc_report(ASL_LEVEL_INFO...) on iOS doesn't show up in the Xcode Console log of the device,
+#include "magmallocProvider.h"
+
+#include <_simple.h>
+#include <crt_externs.h>
+#include <dlfcn.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <libkern/OSAtomic.h>
+#include <mach/mach_vm.h>
+#include <mach/mach_init.h>
+#include <mach/thread_switch.h>
+#include <mach/vm_map.h>
+#include <mach-o/dyld.h>
+#include <os/tsd.h>
+#include <sys/mman.h>
+#include <xlocale.h>
+#include <TargetConditionals.h>
+
+#include "malloc.h"
+#include "malloc_printf.h"
+#include "scalable_malloc.h"
+#include "malloc_internal.h"
+#include "stack_logging.h"
+
+#if TARGET_OS_EMBEDDED || TARGET_IPHONE_SIMULATOR
+// _malloc_printf(ASL_LEVEL_INFO...) on iOS doesn't show up in the Xcode Console log of the device,
// but ASL_LEVEL_NOTICE does. So raising the log level is helpful.
#undef ASL_LEVEL_INFO
#define ASL_LEVEL_INFO ASL_LEVEL_NOTICE
-#endif // TARGET_OS_IPHONE
-
-#define USE_SLEEP_RATHER_THAN_ABORT 0
+#endif
+
+#include <CrashReporterClient.h>
+
+#ifdef __LP64__
+#define CONFIG_NANOZONE 1
+#else
+#define CONFIG_NANOZONE 0
+#endif
/*
- MAX_LITE_MALLOCS
-
- If msl lite is turned on due to a memory resource exception use this value as the maximum
- number of allocations allowed before msl lite is turned off. This prevents msl lite from being
- enabled indefinitely if the process never reaches 100% of its jetsam limit.
- See rdar://problem/25950426 for a discussion of how this number was determined.
+ * MALLOC_ABSOLUTE_MAX_SIZE - There are many instances of addition to a
+ * user-specified size_t, which can cause overflow (and subsequent crashes)
+ * for values near SIZE_T_MAX. Rather than add extra "if" checks everywhere
+ * this occurs, it is easier to just set an absolute maximum request size,
+ * and immediately return an error if the requested size exceeds this maximum.
+ * Of course, values less than this absolute max can fail later if the value
+ * is still too large for the available memory. The largest value added
+ * seems to be PAGE_SIZE (in the macro round_page()), so to be safe, we set
+ * the maximum to be 2 * PAGE_SIZE less than SIZE_T_MAX.
*/
-
-#define MAX_LITE_MALLOCS 100000000
-
-typedef void(malloc_logger_t)(uint32_t type,
- uintptr_t arg1,
- uintptr_t arg2,
- uintptr_t arg3,
- uintptr_t result,
- uint32_t num_hot_frames_to_skip);
-
-extern malloc_logger_t *__syscall_logger; // use this to set up syscall logging (e.g., vm_allocate, vm_deallocate, mmap, munmap)
+#define MALLOC_ABSOLUTE_MAX_SIZE (SIZE_T_MAX - (2 * PAGE_SIZE))
+
+#define USE_SLEEP_RATHER_THAN_ABORT 0
+
+typedef void (malloc_logger_t)(uint32_t type, uintptr_t arg1, uintptr_t arg2, uintptr_t arg3, uintptr_t result, uint32_t num_hot_frames_to_skip);
+
+extern malloc_logger_t *__syscall_logger; // use this to set up syscall logging (e.g., vm_allocate, vm_deallocate, mmap, munmap)
+
+extern void __prepare_to_log_stacks(void);
static _malloc_lock_s _malloc_lock = _MALLOC_LOCK_INIT;
-#define MALLOC_LOCK() _malloc_lock_lock(&_malloc_lock)
-#define MALLOC_TRY_LOCK() _malloc_lock_trylock(&_malloc_lock)
-#define MALLOC_UNLOCK() _malloc_lock_unlock(&_malloc_lock)
-#define MALLOC_REINIT_LOCK() _malloc_lock_init(&_malloc_lock)
+#define MALLOC_LOCK() _malloc_lock_lock(&_malloc_lock)
+#define MALLOC_UNLOCK() _malloc_lock_unlock(&_malloc_lock)
+
+static inline void yield(void) {
+ thread_switch(MACH_PORT_NULL, SWITCH_OPTION_DEPRESS, 1);
+}
/* The following variables are exported for the benefit of performance tools
*
@@ -69,66 +105,49 @@
int32_t malloc_num_zones_allocated = 0;
malloc_zone_t **malloc_zones = 0;
malloc_logger_t *malloc_logger = NULL;
-static malloc_zone_t *initial_default_zone = NULL;
unsigned malloc_debug_flags = 0;
-boolean_t malloc_tracing_enabled = false;
unsigned malloc_check_start = 0; // 0 means don't check
unsigned malloc_check_counter = 0;
unsigned malloc_check_each = 1000;
+/* global flag to suppress ASL logging e.g. for syslogd */
+int _malloc_no_asl_log = 0;
+
static int malloc_check_sleep = 100; // default 100 second sleep
-static int malloc_check_abort = 0; // default is to sleep, not abort
-
-static os_once_t _malloc_initialize_pred;
-
-// Used by memory resource exceptions and enabling/disabling malloc stack logging via malloc_memory_event_handler
-static boolean_t warn_mode_entered = false;
-static boolean_t warn_mode_disable_retries = false;
-static stack_logging_mode_type msl_type_enabled_at_runtime = stack_logging_mode_none;
+static int malloc_check_abort = 0; // default is to sleep, not abort
+
+static int malloc_debug_file = STDERR_FILENO;
+static boolean_t _malloc_is_initialized = FALSE;
+
+static const char Malloc_Facility[] = "com.apple.Libsystem.malloc";
/*
* Counters that coordinate zone destruction (in malloc_zone_unregister) with
* find_registered_zone (here abbreviated as FRZ).
*/
-static int32_t volatile counterAlice = 0, counterBob = 0;
-static int32_t volatile * volatile pFRZCounterLive = &counterAlice;
-static int32_t volatile * volatile pFRZCounterDrain = &counterBob;
-
-unsigned int _os_cpu_number_override = -1;
-
-static inline malloc_zone_t *inline_malloc_default_zone(void) __attribute__((always_inline));
-
-#define MALLOC_LOG_TYPE_ALLOCATE stack_logging_type_alloc
-#define MALLOC_LOG_TYPE_DEALLOCATE stack_logging_type_dealloc
-#define MALLOC_LOG_TYPE_HAS_ZONE stack_logging_flag_zone
-#define MALLOC_LOG_TYPE_CLEARED stack_logging_flag_cleared
+static int counterAlice = 0, counterBob = 0;
+static int *pFRZCounterLive= &counterAlice, *pFRZCounterDrain = &counterBob;
+
+#define MALLOC_LOG_TYPE_ALLOCATE stack_logging_type_alloc
+#define MALLOC_LOG_TYPE_DEALLOCATE stack_logging_type_dealloc
+#define MALLOC_LOG_TYPE_HAS_ZONE stack_logging_flag_zone
+#define MALLOC_LOG_TYPE_CLEARED stack_logging_flag_cleared
#define DEFAULT_MALLOC_ZONE_STRING "DefaultMallocZone"
#define DEFAULT_PUREGEABLE_ZONE_STRING "DefaultPurgeableMallocZone"
+
+boolean_t malloc_engaged_nano(void);
+#if CONFIG_NANOZONE
+extern boolean_t _malloc_engaged_nano;
+malloc_zone_t *create_nano_zone(size_t initial_size, malloc_zone_t *helper_zone, unsigned debug_flags);
+void nano_forked_zone(malloc_zone_t *zone);
#define MALLOC_HELPER_ZONE_STRING "MallocHelperZone"
-
-MALLOC_NOEXPORT
-unsigned int phys_ncpus;
-
-MALLOC_NOEXPORT
-unsigned int logical_ncpus;
-
-MALLOC_NOEXPORT
-unsigned int hyper_shift;
-
-// Boot argument for max magazine control
-static const char max_magazines_boot_arg[] = "malloc_max_magazines";
-
-#if CONFIG_MEDIUM_ALLOCATOR
-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";
-#endif // CONFIG_MEDIUM_ALLOCATOR
+#endif
/********* Utilities ************/
-static bool _malloc_entropy_initialized;
+__attribute__((visibility("hidden"))) uint64_t malloc_entropy[2] = {0, 0};
void __malloc_init(const char *apple[]);
@@ -141,434 +160,87 @@
/* Skip over key to the first value */
str = strchr(str, '=');
- if (str == NULL) {
+ if (str == NULL)
return 0;
- }
str++;
- while (str && idx < sizeof(malloc_entropy) / sizeof(malloc_entropy[0])) {
+ while (str && idx < sizeof(malloc_entropy)/sizeof(malloc_entropy[0])) {
strlcpy(tmp, str, 20);
p = strchr(tmp, ',');
- if (p) {
- *p = '\0';
- }
+ if (p) *p = '\0';
val = strtoull_l(tmp, NULL, 0, NULL);
malloc_entropy[idx] = (uint64_t)val;
idx++;
- if ((str = strchr(str, ',')) != NULL) {
+ if ((str = strchr(str, ',')) != NULL)
str++;
- }
}
return idx;
}
-static void
-__malloc_init_from_bootargs(const char *bootargs)
-{
- // The maximum number of magazines can be set either via a
- // boot argument or from the environment. Get the boot argument value
- // here and store it. We can't bounds check it until we have phys_ncpus,
- // which happens later in _malloc_initialize(), along with handling
- // of the environment value setting.
- char value_buf[256];
- const char *flag = malloc_common_value_for_key_copy(bootargs,
- max_magazines_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) {
- max_magazines = (unsigned int)value;
- } else {
- malloc_report(ASL_LEVEL_ERR,
- "malloc_max_magazines must be positive - ignored.\n");
- }
- }
-
-#if CONFIG_MEDIUM_ALLOCATOR
- flag = malloc_common_value_for_key_copy(bootargs, medium_enabled_boot_arg,
- value_buf, sizeof(value_buf));
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp) {
- magazine_medium_enabled = (value != 0);
- }
- }
-
- flag = malloc_common_value_for_key_copy(bootargs,
- medium_activation_threshold_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_active_threshold = (uint64_t)value;
- } else {
- malloc_report(ASL_LEVEL_ERR,
- "malloc_medium_activation_threshold must be positive - ignored.\n");
- }
- }
-
- flag = malloc_common_value_for_key_copy(bootargs,
- max_medium_magazines_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) {
- max_medium_magazines = (int)value;
- } else {
- malloc_report(ASL_LEVEL_ERR,
- "malloc_max_medium_magazines must be positive - ignored.\n");
- }
- }
-#endif // CONFIG_MEDIUM_ALLOCATOR
+/* TODO: Remove __malloc_entropy_setup, it was left to avoid rev-lock */
+void
+__malloc_entropy_setup(const char *apple[]) {
+ __malloc_init(apple);
}
/* TODO: Investigate adding _malloc_initialize() into this libSystem initializer */
void
__malloc_init(const char *apple[])
{
- // We could try to be clever and cater for arbitrary length bootarg
- // strings, but it's probably not worth it, especially as we would need
- // to temporarily allocate at least a page of memory to read the bootargs
- // into.
- char bootargs[1024] = { '\0' };
- size_t len = sizeof(bootargs) - 1;
- if (!sysctlbyname("kern.bootargs", bootargs, &len, NULL, 0) && len > 0) {
- bootargs[len + 1] = '\0';
- }
-
+ const char **p;
#if CONFIG_NANOZONE
- // TODO: envp should be passed down from Libsystem
- const char **envp = (const char **)*_NSGetEnviron();
- nano_common_init(envp, apple, bootargs);
+ _malloc_engaged_nano = 0;
+ for (p = apple; p && *p; p++) {
+ if (0 == strncmp(*p, "MallocNanoZone=1", strlen("MallocNanoZone=1"))) {
+ // _malloc_printf(ASL_LEVEL_INFO, "MallocNanoZone=1\n");
+ _malloc_engaged_nano = 1;
+ break;
+ }
+ }
#endif
- const char **p;
for (p = apple; p && *p; p++) {
if (strstr(*p, "malloc_entropy") == *p) {
int count = __entropy_from_kernel(*p);
- bzero((void *)*p, strlen(*p));
-
- if (sizeof(malloc_entropy) / sizeof(malloc_entropy[0]) == count) {
- _malloc_entropy_initialized = true;
+ bzero((void*)*p, strlen(*p));
+
+ if (sizeof(malloc_entropy)/sizeof(malloc_entropy[0]) == count) {
+ return;
}
break;
}
}
- if (!_malloc_entropy_initialized) {
- getentropy((void*)malloc_entropy, sizeof(malloc_entropy));
- _malloc_entropy_initialized = true;
- }
-
- __malloc_init_from_bootargs(bootargs);
- mvm_aslr_init();
-}
-
-static malloc_zone_t* lite_zone = NULL;
-
-MALLOC_ALWAYS_INLINE
+
+ malloc_entropy[0] = ((uint64_t)arc4random()) << 32 | ((uint64_t)arc4random());
+ malloc_entropy[1] = ((uint64_t)arc4random()) << 32 | ((uint64_t)arc4random());
+ return;
+}
+
+static inline malloc_zone_t * find_registered_zone(const void *, size_t *) __attribute__((always_inline));
static inline malloc_zone_t *
-runtime_default_zone() {
- return (lite_zone) ? lite_zone : inline_malloc_default_zone();
-}
-
-static size_t
-default_zone_size(malloc_zone_t *zone, const void *ptr)
-{
- zone = runtime_default_zone();
-
- return zone->size(zone, ptr);
-}
-
-static void *
-default_zone_malloc(malloc_zone_t *zone, size_t size)
-{
- zone = runtime_default_zone();
-
- return zone->malloc(zone, size);
-}
-
-static void *
-default_zone_calloc(malloc_zone_t *zone, size_t num_items, size_t size)
-{
- zone = runtime_default_zone();
-
- return zone->calloc(zone, num_items, size);
-}
-
-static void *
-default_zone_valloc(malloc_zone_t *zone, size_t size)
-{
- zone = runtime_default_zone();
-
- return zone->valloc(zone, size);
-}
-
-static void
-default_zone_free(malloc_zone_t *zone, void *ptr)
-{
- zone = runtime_default_zone();
-
- return zone->free(zone, ptr);
-}
-
-static void *
-default_zone_realloc(malloc_zone_t *zone, void *ptr, size_t new_size)
-{
- zone = runtime_default_zone();
-
- return zone->realloc(zone, ptr, new_size);
-}
-
-static void
-default_zone_destroy(malloc_zone_t *zone)
-{
- zone = runtime_default_zone();
-
- return zone->destroy(zone);
-}
-
-static unsigned
-default_zone_batch_malloc(malloc_zone_t *zone, size_t size, void **results, unsigned count)
-{
- zone = runtime_default_zone();
-
- return zone->batch_malloc(zone, size, results, count);
-}
-
-static void
-default_zone_batch_free(malloc_zone_t *zone, void **to_be_freed, unsigned count)
-{
- zone = runtime_default_zone();
-
- return zone->batch_free(zone, to_be_freed, count);
-}
-
-static void *
-default_zone_memalign(malloc_zone_t *zone, size_t alignment, size_t size)
-{
- zone = runtime_default_zone();
-
- return zone->memalign(zone, alignment, size);
-}
-
-static void
-default_zone_free_definite_size(malloc_zone_t *zone, void *ptr, size_t size)
-{
- zone = runtime_default_zone();
-
- return zone->free_definite_size(zone, ptr, size);
-}
-
-static size_t
-default_zone_pressure_relief(malloc_zone_t *zone, size_t goal)
-{
- zone = runtime_default_zone();
-
- return zone->pressure_relief(zone, goal);
-}
-
-static boolean_t
-default_zone_malloc_claimed_address(malloc_zone_t *zone, void *ptr)
-{
- zone = runtime_default_zone();
-
- return malloc_zone_claimed_address(zone, ptr);
-}
-
-static kern_return_t
-default_zone_ptr_in_use_enumerator(task_t task,
- void *context,
- unsigned type_mask,
- vm_address_t zone_address,
- memory_reader_t reader,
- vm_range_recorder_t recorder)
-{
- malloc_zone_t *zone = runtime_default_zone();
-
- return zone->introspect->enumerator(task, context, type_mask, (vm_address_t) zone, reader, recorder);
-}
-
-static size_t
-default_zone_good_size(malloc_zone_t *zone, size_t size)
-{
- zone = runtime_default_zone();
-
- return zone->introspect->good_size(zone, size);
-}
-
-static boolean_t
-default_zone_check(malloc_zone_t *zone)
-{
- zone = runtime_default_zone();
-
- return zone->introspect->check(zone);
-}
-
-static void
-default_zone_print(malloc_zone_t *zone, boolean_t verbose)
-{
- zone = runtime_default_zone();
-
- return (void)zone->introspect->print(zone, verbose);
-}
-
-static void
-default_zone_log(malloc_zone_t *zone, void *log_address)
-{
- zone = runtime_default_zone();
-
- return zone->introspect->log(zone, log_address);
-}
-
-static void
-default_zone_force_lock(malloc_zone_t *zone)
-{
- zone = runtime_default_zone();
-
- return zone->introspect->force_lock(zone);
-}
-
-static void
-default_zone_force_unlock(malloc_zone_t *zone)
-{
- zone = runtime_default_zone();
-
- return zone->introspect->force_unlock(zone);
-}
-
-static void
-default_zone_statistics(malloc_zone_t *zone, malloc_statistics_t *stats)
-{
- zone = runtime_default_zone();
-
- return zone->introspect->statistics(zone, stats);
-}
-
-static boolean_t
-default_zone_locked(malloc_zone_t *zone)
-{
- zone = runtime_default_zone();
-
- return zone->introspect->zone_locked(zone);
-}
-
-static void
-default_zone_reinit_lock(malloc_zone_t *zone)
-{
- zone = runtime_default_zone();
-
- return zone->introspect->reinit_lock(zone);
-}
-
-static struct malloc_introspection_t default_zone_introspect = {
- default_zone_ptr_in_use_enumerator,
- default_zone_good_size,
- default_zone_check,
- default_zone_print,
- default_zone_log,
- default_zone_force_lock,
- default_zone_force_unlock,
- default_zone_statistics,
- default_zone_locked,
- NULL,
- NULL,
- NULL,
- NULL,
- default_zone_reinit_lock
-};
-
-typedef struct {
- malloc_zone_t malloc_zone;
- uint8_t pad[PAGE_MAX_SIZE - sizeof(malloc_zone_t)];
-} virtual_default_zone_t;
-
-static virtual_default_zone_t virtual_default_zone
-__attribute__((section("__DATA,__v_zone")))
-__attribute__((aligned(PAGE_MAX_SIZE))) = {
- NULL,
- NULL,
- default_zone_size,
- default_zone_malloc,
- default_zone_calloc,
- default_zone_valloc,
- default_zone_free,
- default_zone_realloc,
- default_zone_destroy,
- DEFAULT_MALLOC_ZONE_STRING,
- default_zone_batch_malloc,
- default_zone_batch_free,
- &default_zone_introspect,
- 10,
- default_zone_memalign,
- default_zone_free_definite_size,
- default_zone_pressure_relief,
- default_zone_malloc_claimed_address,
-};
-
-static malloc_zone_t *default_zone = &virtual_default_zone.malloc_zone;
-
-static boolean_t
-has_default_zone0(void)
-{
- 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));
-static inline malloc_zone_t *
-find_registered_zone(const void *ptr, size_t *returned_size)
-{
+find_registered_zone(const void *ptr, size_t *returned_size) {
// Returns a zone which contains ptr, else NULL
if (0 == malloc_num_zones) {
- if (returned_size) {
- *returned_size = 0;
- }
+ if (returned_size) *returned_size = 0;
return NULL;
}
- // first look in the lite zone
- if (lite_zone) {
- malloc_zone_t *zone = lite_zone;
- size_t size = zone->size(zone, ptr);
- if (size) { // Claimed by this zone?
- if (returned_size) {
- *returned_size = size;
- }
- // Return the virtual default zone instead of the lite zone - see <rdar://problem/24994311>
- 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];
+ if (returned_size) *returned_size = size;
+ return zone;
+ }
+
+ int *pFRZCounter = pFRZCounterLive; // Capture pointer to the counter of the moment
+ __sync_fetch_and_add(pFRZCounter, 1); // Advance this counter -- our thread is in FRZ
+
+ unsigned index;
+ int32_t limit = *(volatile int32_t *)&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()).
@@ -589,23 +261,19 @@
zone = *zones;
size = zone->size(zone, ptr);
if (size) { // Claimed by this zone?
- goto out;
+ if (returned_size) *returned_size = size;
+ __sync_fetch_and_sub(pFRZCounter, 1); // our thread is leaving FRZ
+ return zone;
}
}
// Unclaimed by any zone.
- zone = NULL;
- size = 0;
-out:
- if (returned_size) {
- *returned_size = size;
- }
- OSAtomicDecrement32Barrier(pFRZCounter); // our thread is leaving FRZ
- return zone;
-}
-
-void
-malloc_error_break(void)
-{
+ if (returned_size) *returned_size = 0;
+ __sync_fetch_and_sub(pFRZCounter, 1); // our thread is leaving FRZ
+ return NULL;
+}
+
+__attribute__((visibility("hidden"))) __attribute__((noinline)) void
+malloc_error_break(void) {
// Provides a non-inlined place for various malloc error procedures to call
// that will be called after an error message appears. It does not make
// sense for developers to call this function, so it is marked
@@ -613,9 +281,10 @@
MAGMALLOC_MALLOCERRORBREAK(); // DTrace USDT probe
}
-int
-malloc_gdb_po_unsafe(void)
-{
+extern boolean_t __stack_logging_locked();
+
+__attribute__((visibility("hidden"))) __attribute__((noinline)) __attribute__((used)) int
+malloc_gdb_po_unsafe(void) {
// In order to implement "po" other data formatters in gdb, the debugger
// calls functions that call malloc. The debugger will only run one thread
// of the program in this case, so if another thread is holding a zone lock,
@@ -625,9 +294,8 @@
// lock. If trylock succeeds, unlock it, otherwise return "locked". Returns
// 0 == safe, 1 == locked/unsafe.
- if (__stack_logging_locked()) {
+ if (__stack_logging_locked())
return 1;
- }
malloc_zone_t **zones = malloc_zones;
unsigned i, e = malloc_num_zones;
@@ -636,13 +304,11 @@
malloc_zone_t *zone = zones[i];
// Version must be >= 5 to look at the new introspection field.
- if (zone->version < 5) {
+ if (zone->version < 5)
continue;
- }
-
- if (zone->introspect->zone_locked && zone->introspect->zone_locked(zone)) {
+
+ if (zone->introspect->zone_locked && zone->introspect->zone_locked(zone))
return 1;
- }
}
return 0;
}
@@ -652,19 +318,17 @@
static void set_flags_from_environment(void);
static void
-malloc_zone_register_while_locked(malloc_zone_t *zone)
-{
+malloc_zone_register_while_locked(malloc_zone_t *zone) {
size_t protect_size;
unsigned i;
/* scan the list of zones, to see if this zone is already registered. If
* so, print an error message and return. */
- for (i = 0; i != malloc_num_zones; ++i) {
+ for (i = 0; i != malloc_num_zones; ++i)
if (zone == malloc_zones[i]) {
- malloc_report(ASL_LEVEL_ERR, "Attempted to register zone more than once: %p\n", zone);
+ _malloc_printf(ASL_LEVEL_ERR, "Attempted to register zone more than once: %p\n", zone);
return;
}
- }
if (malloc_num_zones == malloc_num_zones_allocated) {
size_t malloc_zones_size = malloc_num_zones * sizeof(malloc_zone_t *);
@@ -675,25 +339,25 @@
vm_addr = vm_page_size;
kern_return_t kr = mach_vm_allocate(mach_task_self(), &vm_addr, alloc_size, alloc_flags);
if (kr) {
- malloc_report(ASL_LEVEL_ERR, "malloc_zone_register allocation failed: %d\n", kr);
+ _malloc_printf(ASL_LEVEL_ERR, "malloc_zone_register allocation failed: %d\n", kr);
return;
}
- malloc_zone_t **new_zones = (malloc_zone_t **)vm_addr;
+ malloc_zone_t **new_zones = (uintptr_t)vm_addr;
/* If there were previously allocated malloc zones, we need to copy them
* out of the previous array and into the new zones array */
if (malloc_zones) {
memcpy(new_zones, malloc_zones, malloc_zones_size);
- vm_addr = (mach_vm_address_t)malloc_zones;
+ vm_addr = malloc_zones;
mach_vm_size_t dealloc_size = round_page(malloc_zones_size);
mach_vm_deallocate(mach_task_self(), vm_addr, dealloc_size);
}
/* Update the malloc_zones pointer, which we leak if it was previously
* allocated, and the number of zones allocated */
- protect_size = (size_t)alloc_size;
+ protect_size = alloc_size;
malloc_zones = new_zones;
- malloc_num_zones_allocated = (int32_t)(alloc_size / sizeof(malloc_zone_t *));
+ malloc_num_zones_allocated = alloc_size / sizeof(malloc_zone_t *);
} else {
/* If we don't need to reallocate zones, we need to briefly change the
* page protection the malloc zones to allow writes */
@@ -706,340 +370,98 @@
* in malloc_num_zones is visible then the pointer write before it must also be visible.
*
* While we could be slightly more efficent here with atomic ops the cleanest way to
- * ensure the proper store-release operation is performed is to use OSAtomic*Barrier
- * to update malloc_num_zones.
+ * ensure the proper store-release operation is performed is to use __sync... to update
+ * malloc_num_zones.
*/
malloc_zones[malloc_num_zones] = zone;
- OSAtomicIncrement32Barrier(&malloc_num_zones);
+ __sync_fetch_and_add(&malloc_num_zones, 1);
/* Finally, now that the zone is registered, disallow write access to the
* malloc_zones array */
mprotect(malloc_zones, protect_size, PROT_READ);
- //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);
+ //_malloc_printf(ASL_LEVEL_INFO, "Registered malloc_zone %p in malloc_zones %p [%u zones, %u bytes]\n", zone, malloc_zones, malloc_num_zones, protect_size);
}
static void
-create_and_insert_lite_zone_while_locked()
-{
- malloc_zone_t *zone0 = malloc_zones[0];
-
- malloc_zone_t *stack_logging_lite_zone = create_stack_logging_lite_zone(0, zone0, malloc_debug_flags);
- malloc_zone_register_while_locked(stack_logging_lite_zone);
- malloc_set_zone_name(stack_logging_lite_zone, MALLOC_STOCK_LOGGING_LITE_ZONE_NAME);
- lite_zone = stack_logging_lite_zone;
-}
-
-boolean_t
-turn_on_stack_logging(stack_logging_mode_type mode)
-{
- boolean_t ret = false;
-
+_malloc_initialize(void) {
MALLOC_LOCK();
-
- if (!stack_logging_enable_logging) {
- if (__uniquing_table_memory_was_deleted()) {
- // It would great to be able re-enable even if the uniquing table has been deleted
- // <rdar://problem/25014005> malloc stack logging should be able to recreate the uniquing table if needed
+ if (!_malloc_is_initialized) {
+ unsigned n;
+ malloc_zone_t *zone;
+
+ _malloc_is_initialized = TRUE;
+
+ set_flags_from_environment(); // will only set flags up to two times
+ n = malloc_num_zones;
+
+#if CONFIG_NANOZONE
+ malloc_zone_t *helper_zone = create_scalable_zone(0, malloc_debug_flags);
+ zone = create_nano_zone(0, 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);
} else {
- switch (mode) {
- case stack_logging_mode_all:
- __prepare_to_log_stacks(false);
- malloc_logger = __disk_stack_logging_log_stack;
- __syscall_logger = __disk_stack_logging_log_stack;
- stack_logging_mode = mode;
- stack_logging_enable_logging = 1;
- ret = true;
-
- malloc_report(ASL_LEVEL_INFO, "recording malloc and VM allocation stacks to disk using standard recorder\n");
- break;
-
- case stack_logging_mode_malloc:
- __prepare_to_log_stacks(false);
- malloc_logger = __disk_stack_logging_log_stack;
- stack_logging_mode = mode;
- stack_logging_enable_logging = 1;
- ret = true;
-
- malloc_report(ASL_LEVEL_INFO, "recording malloc (but not VM allocation) stacks to disk using standard recorder\n");
- break;
-
- case stack_logging_mode_vm:
- __prepare_to_log_stacks(false);
- __syscall_logger = __disk_stack_logging_log_stack;
- stack_logging_mode = mode;
- stack_logging_enable_logging = 1;
- ret = true;
-
- malloc_report(ASL_LEVEL_INFO, "recording VM allocation (but not malloc) stacks to disk using standard recorder\n");
- break;
-
- case stack_logging_mode_lite:
- if (!has_default_zone0()) {
- malloc_report(ASL_LEVEL_ERR, "zone[0] is not the normal default zone so can't turn on lite mode.\n", mode);
- ret = false;
- } else {
- malloc_report(ASL_LEVEL_INFO, "recording malloc (and VM allocation) stacks using lite mode\n");
-
- if (lite_zone) {
- enable_stack_logging_lite();
- } else {
- if (__prepare_to_log_stacks(true)) {
- __syscall_logger = __disk_stack_logging_log_stack;
- stack_logging_mode = stack_logging_mode_lite;
- stack_logging_enable_logging = 1;
- __prepare_to_log_stacks_stage2();
- create_and_insert_lite_zone_while_locked();
- enable_stack_logging_lite();
- }
- }
- ret = true;
- }
- break;
-
- case stack_logging_mode_vmlite:
- if (__prepare_to_log_stacks(true)) {
- __syscall_logger = __disk_stack_logging_log_stack;
- stack_logging_mode = mode;
- stack_logging_enable_logging = 1;
- malloc_report(ASL_LEVEL_INFO, "recording VM allocation (but not malloc) stacks using lite mode\n");
- }
- break;
-
- default:
- malloc_report(ASL_LEVEL_ERR, "invalid mode %d passed to turn_on_stack_logging\n", mode);
- break;
- }
- }
- } else {
- malloc_report(ASL_LEVEL_ERR, "malloc stack logging already enabled.\n");
- }
-
- MALLOC_UNLOCK();
-
- return ret;
-}
-
-void
-turn_off_stack_logging()
-{
- MALLOC_LOCK();
-
- if (stack_logging_enable_logging) {
- switch (stack_logging_mode) {
- case stack_logging_mode_all:
- malloc_logger = NULL;
- __syscall_logger = NULL;
- stack_logging_enable_logging = 0;
- malloc_report(ASL_LEVEL_INFO, "turning off recording malloc and VM allocation stacks to disk using standard recorder\n");
- break;
-
- case stack_logging_mode_malloc:
- malloc_logger = NULL;
- stack_logging_enable_logging = 0;
- malloc_report(ASL_LEVEL_INFO, "turnning off recording malloc (but not VM allocation) stacks to disk using standard recorder\n");
- break;
-
- case stack_logging_mode_vm:
- __syscall_logger = NULL;
- stack_logging_enable_logging = 0;
- malloc_report(ASL_LEVEL_INFO, "turning off recording VM allocation (but not malloc) stacks to disk using standard recorder\n");
- break;
-
- case stack_logging_mode_lite:
- malloc_report(ASL_LEVEL_INFO, "turning off recording malloc (but not VM allocation) stacks using lite mode\n");
-
- disable_stack_logging_lite();
- stack_logging_enable_logging = 0;
- break;
-
- case stack_logging_mode_vmlite:
- __syscall_logger = NULL;
- stack_logging_enable_logging = 0;
- malloc_report(ASL_LEVEL_INFO, "turning off recording VM allocation stacks using lite mode\n");
- break;
-
- default:
- malloc_report(ASL_LEVEL_ERR, "invalid stack_logging_mode %d in turn_off_stack_logging\n", stack_logging_mode);
- break;
- }
- } else {
- malloc_report(ASL_LEVEL_ERR, "malloc stack logging not enabled.\n");
- }
-
- MALLOC_UNLOCK();
-}
-
-// To be used in _malloc_initialize_once() only, call that function instead.
-static void
-_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;
-
- if (0 != (logical_ncpus % phys_ncpus)) {
- MALLOC_REPORT_FATAL_ERROR(logical_ncpus % phys_ncpus,
- "logical_ncpus %% phys_ncpus != 0\n");
- }
-
- switch (logical_ncpus / phys_ncpus) {
- case 1:
- hyper_shift = 0;
- break;
- case 2:
- hyper_shift = 1;
- break;
- case 4:
- hyper_shift = 2;
- break;
- default:
- MALLOC_REPORT_FATAL_ERROR(logical_ncpus / phys_ncpus, "logical_ncpus / phys_ncpus not 1, 2, or 4");
- }
-
- // max_magazines may already be set from a boot argument. Make sure that it
- // is bounded by the number of CPUs.
- if (max_magazines) {
- max_magazines = MIN(max_magazines, logical_ncpus);
- } else {
- max_magazines = logical_ncpus;
- }
-
- // similiarly, cap medium magazines at logical_ncpus but don't cap it by
- // the max magazines if it has been set explicitly
- if (max_medium_magazines) {
- max_medium_magazines = MIN(max_medium_magazines, logical_ncpus);
- } else {
- max_medium_magazines = max_magazines;
- }
-
- set_flags_from_environment(); // will only set flags up to two times
- n = malloc_num_zones;
-
-#if CONFIG_NANOZONE
- nano_common_configure();
-
- malloc_zone_t *helper_zone = create_scalable_zone(0, malloc_debug_flags);
-
- if (_malloc_engaged_nano == NANO_V2) {
- 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);
- } else {
- zone = helper_zone;
+ 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);
- }
-#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
- 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);
- }
-
- // Only setup stack logging hooks once lazy initialization is complete, the
- // malloc_zone calls above would otherwise initialize malloc stack logging,
- // which calls into malloc re-entrantly from Libc upcalls and so deadlocks
- // in the lazy initialization os_once(). rdar://13046853
- if (stack_logging_enable_logging) {
- switch (stack_logging_mode) {
- case stack_logging_mode_malloc:
- malloc_logger = __disk_stack_logging_log_stack;
- break;
- case stack_logging_mode_vm:
- __syscall_logger = __disk_stack_logging_log_stack;
- break;
- case stack_logging_mode_all:
- malloc_logger = __disk_stack_logging_log_stack;
- __syscall_logger = __disk_stack_logging_log_stack;
- break;
- case stack_logging_mode_lite:
- __syscall_logger = __disk_stack_logging_log_stack;
- create_and_insert_lite_zone_while_locked();
- enable_stack_logging_lite();
- break;
- case stack_logging_mode_vmlite:
- __syscall_logger = __disk_stack_logging_log_stack;
- break;
- }
- }
-
- // 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);
+ 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_printf(ASL_LEVEL_INFO, "%d registered zones\n", malloc_num_zones);
+ // _malloc_printf(ASL_LEVEL_INFO, "malloc_zones is at %p; malloc_num_zones is at %p\n", (unsigned)&malloc_zones, (unsigned)&malloc_num_zones);
+ }
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) __attribute__((always_inline));
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);
+inline_malloc_default_zone(void) {
+ if (!_malloc_is_initialized) _malloc_initialize();
+ // _malloc_printf(ASL_LEVEL_INFO, "In inline_malloc_default_zone with %d %d\n", malloc_num_zones, malloc_has_debug_zone);
return malloc_zones[0];
}
malloc_zone_t *
-malloc_default_zone(void)
-{
- return default_zone;
+malloc_default_zone(void) {
+ return inline_malloc_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)
-{
+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);
+ if (!_malloc_is_initialized) _malloc_initialize();
+ // _malloc_printf(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) {
+ if(z->zone_name && strcmp(z->zone_name, MALLOC_HELPER_ZONE_STRING) == 0) {
MALLOC_UNLOCK();
return z;
}
@@ -1048,59 +470,21 @@
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) {
+ 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");
+ malloc_printf("*** malloc_default_scalable_zone() failed to find 'DefaultMallocZone'\n");
return NULL; // FIXME: abort() instead?
}
-static void *
-legacy_zeroing_large_malloc(malloc_zone_t *zone, size_t size)
-{
- if (size > LEGACY_ZEROING_THRESHOLD) {
- // Leopard and earlier returned a ZFOD range, so clear to zero always,
- // ham-handedly touching in each page
- return default_zone_calloc(zone, 1, size);
- } else {
- return default_zone_malloc(zone, size);
- }
-}
-
-static void *
-legacy_zeroing_large_valloc(malloc_zone_t *zone, size_t size)
-{
- void *p = default_zone_valloc(zone, size);
-
- // Leopard and earlier returned a ZFOD range, so ...
- memset(p, 0, size); // Clear to zero always, ham-handedly touching in each page
- return p;
-}
-
-void
-zeroify_scalable_zone(malloc_zone_t *zone)
-{
- // <rdar://problem/27190324> this checkfix should replace the default zone's
- // allocation routines with the zeroing versions. Instead of getting in hot
- // water with the wrong zone, ensure that we're mutating the zone we expect.
- //
- // Additionally, the default_zone is no longer PROT_READ, so the two mprotect
- // calls that were here are no longer needed.
- if (zone == default_zone) {
- zone->malloc = (void *)legacy_zeroing_large_malloc;
- zone->valloc = (void *)legacy_zeroing_large_valloc;
- }
-}
-
/*
- * Returns the version of the Nano allocator that's in use, or 0 if not.
+ * malloc_engaged_nano() is for the benefit of libdispatch, which calls here just once.
*/
-int
-malloc_engaged_nano(void)
+boolean_t malloc_engaged_nano(void)
{
#if CONFIG_NANOZONE
return _malloc_engaged_nano;
@@ -1110,8 +494,7 @@
}
malloc_zone_t *
-malloc_default_purgeable_zone(void)
-{
+malloc_default_purgeable_zone(void) {
static malloc_zone_t *dpz;
if (!dpz) {
@@ -1122,30 +505,32 @@
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)) {
+ if (!__sync_bool_compare_and_swap(&dpz, NULL, tmp))
malloc_destroy_zone(tmp);
- }
}
return dpz;
}
static void
-set_flags_from_environment(void)
-{
- const char *flag;
- char **env = *_NSGetEnviron();
- char **p;
- char *c;
-
+set_flags_from_environment(void) {
+ const char *flag;
+ int fd;
+ char **env = * _NSGetEnviron();
+ char **p;
+ char *c;
+
+ if (malloc_debug_file != STDERR_FILENO) {
+ close(malloc_debug_file);
+ malloc_debug_file = STDERR_FILENO;
+ }
#if __LP64__
- malloc_debug_flags = MALLOC_ABORT_ON_CORRUPTION; // Set always on 64-bit processes
+ malloc_debug_flags = SCALABLE_MALLOC_ABORT_ON_CORRUPTION; // Set always on 64-bit processes
#else
- int libSystemVersion = NSVersionOfLinkTimeLibrary("System");
- if ((-1 != libSystemVersion) && ((libSystemVersion >> 16) < 126) /* Lion or greater */) {
+ int libSystemVersion = NSVersionOfLinkTimeLibrary("System");
+ if ((-1 != libSystemVersion) && ((libSystemVersion >> 16) < 126) /* Lion or greater */)
malloc_debug_flags = 0;
- } else {
- malloc_debug_flags = MALLOC_ABORT_ON_CORRUPTION;
- }
+ else
+ malloc_debug_flags = SCALABLE_MALLOC_ABORT_ON_CORRUPTION;
#endif
stack_logging_enable_logging = 0;
stack_logging_dontcompact = 0;
@@ -1162,35 +547,33 @@
*/
for (p = env; (c = *p) != NULL; ++p) {
if (!strncmp(c, "Malloc", 6)) {
- if (issetugid()) {
+ if (issetugid())
return;
- }
break;
}
}
-
- /*
- * Deny certain flags for entitled processes rdar://problem/13521742
- * MallocLogFile & MallocCorruptionAbort
- * as these provide the ability to turn *off* aborting in error cases.
- */
- bool restricted = dyld_process_is_restricted();
- malloc_print_configure(restricted);
-
- if (c == NULL) {
+ if (c == NULL)
return;
- }
-
+ flag = getenv("MallocLogFile");
+ if (flag) {
+ fd = open(flag, O_WRONLY|O_APPEND|O_CREAT, 0644);
+ if (fd >= 0) {
+ malloc_debug_file = fd;
+ fcntl(fd, F_SETFD, 0); // clear close-on-exec flag XXX why?
+ } else {
+ malloc_printf("Could not open %s, using stderr\n", flag);
+ }
+ }
if (getenv("MallocGuardEdges")) {
- malloc_debug_flags |= MALLOC_ADD_GUARD_PAGES;
- malloc_report(ASL_LEVEL_INFO, "protecting edges\n");
+ malloc_debug_flags |= SCALABLE_MALLOC_ADD_GUARD_PAGES;
+ _malloc_printf(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");
+ malloc_debug_flags |= SCALABLE_MALLOC_DONT_PROTECT_PRELUDE;
+ _malloc_printf(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");
+ malloc_debug_flags |= SCALABLE_MALLOC_DONT_PROTECT_POSTLUDE;
+ _malloc_printf(ASL_LEVEL_INFO, "... but not protecting postlude guard page\n");
}
}
flag = getenv("MallocStackLogging");
@@ -1200,204 +583,121 @@
}
if (flag) {
// Set up stack logging as early as possible to catch all ensuing VM allocations,
- // including those from malloc_report and malloc zone setup. Make sure to set
+ // including those from _malloc_printf and malloc zone setup. Make sure to set
// __syscall_logger after this, because prepare_to_log_stacks() itself makes VM
// allocations that we aren't prepared to log yet.
- boolean_t lite_or_vmlite_mode = strcmp(flag, "lite") == 0 || strcmp(flag, "vmlite") == 0;
-
- __prepare_to_log_stacks(lite_or_vmlite_mode);
-
- if (strcmp(flag, "lite") == 0) {
- stack_logging_mode = stack_logging_mode_lite;
- malloc_report(ASL_LEVEL_INFO, "recording malloc and VM allocation stacks using lite mode\n");
- } else if (strcmp(flag,"malloc") == 0) {
- stack_logging_mode = stack_logging_mode_malloc;
- malloc_report(ASL_LEVEL_INFO, "recording malloc (but not VM allocation) stacks to disk using standard recorder\n");
- } else if (strcmp(flag, "vm") == 0) {
- stack_logging_mode = stack_logging_mode_vm;
- malloc_report(ASL_LEVEL_INFO, "recording VM allocation (but not malloc) stacks to disk using standard recorder\n");
- } else if (strcmp(flag, "vmlite") == 0) {
- stack_logging_mode = stack_logging_mode_vmlite;
- malloc_report(ASL_LEVEL_NOTICE, "recording VM allocation (but not malloc) stacks using lite mode\n");
+ __prepare_to_log_stacks();
+ if (strcmp(flag,"malloc") == 0) {
+ malloc_logger = __disk_stack_logging_log_stack;
+ _malloc_printf(ASL_LEVEL_INFO, "recording malloc (but not VM allocation) stacks to disk using standard recorder\n");
+ } else if (strcmp(flag,"vm") == 0) {
+ __syscall_logger = __disk_stack_logging_log_stack;
+ _malloc_printf(ASL_LEVEL_INFO, "recording VM allocation (but not malloc) stacks to disk using standard recorder\n");
} else {
- stack_logging_mode = stack_logging_mode_all;
- malloc_report(ASL_LEVEL_INFO, "recording malloc and VM allocation stacks to disk using standard recorder\n");
+ malloc_logger = __disk_stack_logging_log_stack;
+ __syscall_logger = __disk_stack_logging_log_stack;
+ _malloc_printf(ASL_LEVEL_INFO, "recording malloc and VM allocation stacks to disk using standard recorder\n");
}
stack_logging_enable_logging = 1;
if (stack_logging_dontcompact) {
- if (stack_logging_mode == stack_logging_mode_all || stack_logging_mode == stack_logging_mode_malloc) {
- malloc_report(
- ASL_LEVEL_INFO, "stack logging compaction turned off; size of log files on disk can increase rapidly\n");
+ if (malloc_logger == __disk_stack_logging_log_stack) {
+ _malloc_printf(ASL_LEVEL_INFO, "stack logging compaction turned off; size of log files on disk can increase rapidly\n");
} else {
- malloc_report(ASL_LEVEL_INFO, "stack logging compaction turned off; VM can increase rapidly\n");
+ _malloc_printf(ASL_LEVEL_INFO, "stack logging compaction turned off; VM can increase rapidly\n");
}
}
}
if (getenv("MallocScribble")) {
- malloc_debug_flags |= MALLOC_DO_SCRIBBLE;
- malloc_report(ASL_LEVEL_INFO, "enabling scribbling to detect mods to free blocks\n");
+ malloc_debug_flags |= SCALABLE_MALLOC_DO_SCRIBBLE;
+ _malloc_printf(ASL_LEVEL_INFO, "enabling scribbling to detect mods to free blocks\n");
}
if (getenv("MallocErrorAbort")) {
- malloc_debug_flags |= MALLOC_ABORT_ON_ERROR;
- malloc_report(ASL_LEVEL_INFO, "enabling abort() on bad malloc or free\n");
- }
- if (getenv("MallocTracing")) {
- malloc_tracing_enabled = true;
- }
+ malloc_debug_flags |= SCALABLE_MALLOC_ABORT_ON_ERROR;
+ _malloc_printf(ASL_LEVEL_INFO, "enabling abort() on bad malloc or free\n");
+ }
+#if CONFIG_NANOZONE
+ /* Explicit overrides from the environment */
+ if ((flag = getenv("MallocNanoZone"))) {
+ if (flag[0] == '1') {
+ _malloc_engaged_nano = 1;
+ } else if (flag[0] == '0') {
+ _malloc_engaged_nano = 0;
+ }
+ }
+#endif /* CONFIG_NANOZONE */
#if __LP64__
-/* initialization above forces MALLOC_ABORT_ON_CORRUPTION of 64-bit processes */
+ /* initialization above forces SCALABLE_MALLOC_ABORT_ON_CORRUPTION of 64-bit processes */
#else
flag = getenv("MallocCorruptionAbort");
- if (!restricted && flag && (flag[0] == '0')) { // Set from an environment variable in 32-bit processes
- malloc_debug_flags &= ~MALLOC_ABORT_ON_CORRUPTION;
+ if (flag && (flag[0] == '0')) { // Set from an environment variable in 32-bit processes
+ malloc_debug_flags &= ~SCALABLE_MALLOC_ABORT_ON_CORRUPTION;
} else if (flag) {
- malloc_debug_flags |= MALLOC_ABORT_ON_CORRUPTION;
+ malloc_debug_flags |= SCALABLE_MALLOC_ABORT_ON_CORRUPTION;
}
#endif
flag = getenv("MallocCheckHeapStart");
if (flag) {
- malloc_check_start = (unsigned)strtoul(flag, NULL, 0);
- if (malloc_check_start == 0) {
- malloc_check_start = 1;
- }
- if (malloc_check_start == -1) {
- malloc_check_start = 1;
- }
+ malloc_check_start = strtoul(flag, NULL, 0);
+ if (malloc_check_start == 0) malloc_check_start = 1;
+ if (malloc_check_start == -1) malloc_check_start = 1;
flag = getenv("MallocCheckHeapEach");
if (flag) {
- malloc_check_each = (unsigned)strtoul(flag, NULL, 0);
- if (malloc_check_each == 0) {
- malloc_check_each = 1;
- }
- if (malloc_check_each == -1) {
- malloc_check_each = 1;
- }
- }
- malloc_report(ASL_LEVEL_INFO, "checks heap after operation #%d and each %d operations\n", malloc_check_start, malloc_check_each);
+ malloc_check_each = strtoul(flag, NULL, 0);
+ if (malloc_check_each == 0) malloc_check_each = 1;
+ if (malloc_check_each == -1) malloc_check_each = 1;
+ }
+ _malloc_printf(ASL_LEVEL_INFO, "checks heap after %dth operation and each %d operations\n", malloc_check_start, malloc_check_each);
flag = getenv("MallocCheckHeapAbort");
- if (flag) {
- malloc_check_abort = (unsigned)strtol(flag, NULL, 0);
- }
- if (malloc_check_abort) {
- malloc_report(ASL_LEVEL_INFO, "will abort on heap corruption\n");
- } else {
+ if (flag)
+ malloc_check_abort = strtol(flag, NULL, 0);
+ if (malloc_check_abort)
+ _malloc_printf(ASL_LEVEL_INFO, "will abort on heap corruption\n");
+ else {
flag = getenv("MallocCheckHeapSleep");
- if (flag) {
- malloc_check_sleep = (unsigned)strtol(flag, NULL, 0);
- }
- if (malloc_check_sleep > 0) {
- malloc_report(ASL_LEVEL_INFO, "will sleep for %d seconds on heap corruption\n", malloc_check_sleep);
- } else if (malloc_check_sleep < 0) {
- malloc_report(ASL_LEVEL_INFO, "will sleep once for %d seconds on heap corruption\n", -malloc_check_sleep);
- } else {
- malloc_report(ASL_LEVEL_INFO, "no sleep on heap corruption\n");
- }
- }
- }
-
- flag = getenv("MallocMaxMagazines");
- if (flag) {
- int value = (unsigned)strtol(flag, NULL, 0);
- if (value == 0) {
- malloc_report(ASL_LEVEL_INFO, "Maximum magazines defaulted to %d\n", max_magazines);
- } else if (value < 0) {
- malloc_report(ASL_LEVEL_ERR, "MallocMaxMagazines must be positive - ignored.\n");
- } else if (value > logical_ncpus) {
- max_magazines = logical_ncpus;
- malloc_report(ASL_LEVEL_INFO, "Maximum magazines limited to number of logical CPUs (%d)\n", max_magazines);
- } else {
- max_magazines = value;
- malloc_report(ASL_LEVEL_INFO, "Maximum magazines set to %d\n", max_magazines);
- }
- }
-
-#if CONFIG_MEDIUM_ALLOCATOR
- flag = getenv("MallocMediumZone");
- if (flag) {
- int value = (unsigned)strtol(flag, NULL, 0);
- if (value == 0) {
- magazine_medium_enabled = false;
- } else if (value == 1) {
- magazine_medium_enabled = true;
- }
- }
-
- flag = getenv("MallocMediumActivationThreshold");
- if (flag) {
- uint64_t value = (uint64_t)strtoull(flag, NULL, 0);
- if (value == 0) {
- malloc_report(ASL_LEVEL_INFO, "Medium activation threshold defaulted to %lly\n", magazine_medium_active_threshold);
- } else if (value < 0) {
- malloc_report(ASL_LEVEL_ERR, "MallocMediumActivationThreshold must be positive - ignored.\n");
- } else {
- magazine_medium_active_threshold = value;
- malloc_report(ASL_LEVEL_INFO, "Medium activation threshold set to %lly\n", magazine_medium_active_threshold);
- }
- }
-
- flag = getenv("MallocMaxMediumMagazines");
- if (flag) {
- int value = (unsigned)strtol(flag, NULL, 0);
- if (value == 0) {
- malloc_report(ASL_LEVEL_INFO, "Maximum medium magazines defaulted to %d\n", max_magazines);
- } else if (value < 0) {
- malloc_report(ASL_LEVEL_ERR, "MallocMaxMediumMagazines must be positive - ignored.\n");
- } else if (value > logical_ncpus) {
- max_medium_magazines = logical_ncpus;
- malloc_report(ASL_LEVEL_INFO, "Maximum medium magazines limited to number of logical CPUs (%d)\n", max_medium_magazines);
- } else {
- max_medium_magazines = value;
- malloc_report(ASL_LEVEL_INFO, "Maximum medium magazines set to %d\n", max_medium_magazines);
- }
- }
-#endif // CONFIG_MEDIUM_ALLOCATOR
-
-#if CONFIG_RECIRC_DEPOT
- flag = getenv("MallocRecircRetainedRegions");
- if (flag) {
- int value = (int)strtol(flag, NULL, 0);
- if (value > 0) {
- recirc_retained_regions = value;
- } else {
- malloc_report(ASL_LEVEL_ERR, "MallocRecircRetainedRegions must be positive - ignored.\n");
- }
- }
-#endif // CONFIG_RECIRC_DEPOT
+ if (flag)
+ malloc_check_sleep = strtol(flag, NULL, 0);
+ if (malloc_check_sleep > 0)
+ _malloc_printf(ASL_LEVEL_INFO, "will sleep for %d seconds on heap corruption\n", malloc_check_sleep);
+ else if (malloc_check_sleep < 0)
+ _malloc_printf(ASL_LEVEL_INFO, "will sleep once for %d seconds on heap corruption\n", -malloc_check_sleep);
+ else
+ _malloc_printf(ASL_LEVEL_INFO, "no sleep on heap corruption\n");
+ }
+ }
if (getenv("MallocHelp")) {
- malloc_report(ASL_LEVEL_INFO,
- "environment variables that can be set for debug:\n"
- "- MallocLogFile <f> to create/append messages to file <f> instead of stderr\n"
- "- MallocGuardEdges to add 2 guard pages for each large block\n"
- "- MallocDoNotProtectPrelude to disable protection (when previous flag set)\n"
- "- MallocDoNotProtectPostlude to disable protection (when previous flag set)\n"
- "- MallocStackLogging to record all stacks. Tools like leaks can then be applied\n"
- "- MallocStackLoggingNoCompact to record all stacks. Needed for malloc_history\n"
- "- MallocStackLoggingDirectory to set location of stack logs, which can grow large; default is /tmp\n"
- "- MallocScribble to detect writing on free blocks and missing initializers:\n"
- " 0x55 is written upon free and 0xaa is written on allocation\n"
- "- MallocCheckHeapStart <n> to start checking the heap after <n> operations\n"
- "- MallocCheckHeapEach <s> to repeat the checking of the heap after <s> operations\n"
- "- MallocCheckHeapSleep <t> to sleep <t> seconds on heap corruption\n"
- "- MallocCheckHeapAbort <b> to abort on heap corruption if <b> is non-zero\n"
- "- MallocCorruptionAbort to abort on malloc errors, but not on out of memory for 32-bit processes\n"
- " MallocCorruptionAbort is always set on 64-bit processes\n"
- "- MallocErrorAbort to abort on any malloc error, including out of memory\n"\
- "- MallocTracing to emit kdebug trace points on malloc entry points\n"\
- "- MallocHelp - this help!\n");
+ _malloc_printf(ASL_LEVEL_INFO,
+ "environment variables that can be set for debug:\n"
+ "- MallocLogFile <f> to create/append messages to file <f> instead of stderr\n"
+ "- MallocGuardEdges to add 2 guard pages for each large block\n"
+ "- MallocDoNotProtectPrelude to disable protection (when previous flag set)\n"
+ "- MallocDoNotProtectPostlude to disable protection (when previous flag set)\n"
+ "- MallocStackLogging to record all stacks. Tools like leaks can then be applied\n"
+ "- MallocStackLoggingNoCompact to record all stacks. Needed for malloc_history\n"
+ "- MallocStackLoggingDirectory to set location of stack logs, which can grow large; default is /tmp\n"
+ "- MallocScribble to detect writing on free blocks and missing initializers:\n"
+ " 0x55 is written upon free and 0xaa is written on allocation\n"
+ "- MallocCheckHeapStart <n> to start checking the heap after <n> operations\n"
+ "- MallocCheckHeapEach <s> to repeat the checking of the heap after <s> operations\n"
+ "- MallocCheckHeapSleep <t> to sleep <t> seconds on heap corruption\n"
+ "- MallocCheckHeapAbort <b> to abort on heap corruption if <b> is non-zero\n"
+ "- MallocCorruptionAbort to abort on malloc errors, but not on out of memory for 32-bit processes\n"
+ " MallocCorruptionAbort is always set on 64-bit processes\n"
+ "- MallocErrorAbort to abort on any malloc error, including out of memory\n"
+ "- MallocHelp - this help!\n");
}
}
malloc_zone_t *
malloc_create_zone(vm_size_t start_size, unsigned flags)
{
- malloc_zone_t *zone;
+ malloc_zone_t *zone;
/* start_size doesn't actually appear to be used, but we test anyway. */
if (start_size > MALLOC_ABSOLUTE_MAX_SIZE) {
return NULL;
}
- _malloc_initialize_once();
+ if (!_malloc_is_initialized) _malloc_initialize();
zone = create_scalable_zone(start_size, flags | malloc_debug_flags);
malloc_zone_register(zone);
return zone;
@@ -1410,10 +710,10 @@
void
malloc_create_legacy_default_zone(void)
{
- malloc_zone_t *zone;
+ malloc_zone_t *zone;
int i;
- _malloc_initialize_once();
+ if (!_malloc_is_initialized) _malloc_initialize();
zone = create_legacy_scalable_zone(0, malloc_debug_flags);
MALLOC_LOCK();
@@ -1423,7 +723,7 @@
// Establish the legacy scalable zone just created as the default zone.
//
malloc_zone_t *hold = malloc_zones[0];
- if (hold->zone_name && strcmp(hold->zone_name, DEFAULT_MALLOC_ZONE_STRING) == 0) {
+ if(hold->zone_name && strcmp(hold->zone_name, DEFAULT_MALLOC_ZONE_STRING) == 0) {
malloc_set_zone_name(hold, NULL);
}
malloc_set_zone_name(zone, DEFAULT_MALLOC_ZONE_STRING);
@@ -1442,307 +742,202 @@
}
void
-malloc_destroy_zone(malloc_zone_t *zone)
-{
+malloc_destroy_zone(malloc_zone_t *zone) {
malloc_set_zone_name(zone, NULL); // Deallocate zone name wherever it may reside PR_7701095
malloc_zone_unregister(zone);
zone->destroy(zone);
}
-static vm_address_t *frames = NULL;
-static unsigned num_frames;
-
-MALLOC_NOINLINE
-void
-malloc_zone_check_fail(const char *msg, const char *fmt, ...)
-{
- _SIMPLE_STRING b = _simple_salloc();
- if (b) {
- _simple_sprintf(b, "*** MallocCheckHeap: FAILED check at operation #%d\n", malloc_check_counter - 1);
+/********* Block creation and manipulation ************/
+
+static void
+internal_check(void) {
+ static vm_address_t *frames = NULL;
+ static unsigned num_frames;
+ if (malloc_zone_check(NULL)) {
+ if (!frames) vm_allocate(mach_task_self(), (void *)&frames, vm_page_size, 1);
+ thread_stack_pcs(frames, vm_page_size/sizeof(vm_address_t) - 1, &num_frames);
} else {
- malloc_report(MALLOC_REPORT_NOLOG, "*** MallocCheckHeap: FAILED check at operation #%d\n", malloc_check_counter - 1);
- }
- if (frames) {
- unsigned index = 1;
- if (b) {
- _simple_sappend(b, "Stack for last operation where the malloc check succeeded: ");
- while (index < num_frames)
- _simple_sprintf(b, "%p ", (void*)frames[index++]);
- malloc_report(MALLOC_REPORT_NOLOG, "%s\n(Use 'atos' for a symbolic stack)\n", _simple_string(b));
- } else {
- /*
- * Should only get here if vm_allocate() can't get a single page of
- * memory, implying _simple_asl_log() would also fail. So we just
- * print to the file descriptor.
- */
- malloc_report(MALLOC_REPORT_NOLOG, "Stack for last operation where the malloc check succeeded: ");
- while (index < num_frames) {
- malloc_report(MALLOC_REPORT_NOLOG, "%p ", (void *)frames[index++]);
+ _SIMPLE_STRING b = _simple_salloc();
+ if (b)
+ _simple_sprintf(b, "*** MallocCheckHeap: FAILED check at %dth operation\n", malloc_check_counter-1);
+ else
+ _malloc_printf(MALLOC_PRINTF_NOLOG, "*** MallocCheckHeap: FAILED check at %dth operation\n", malloc_check_counter-1);
+ malloc_printf("*** MallocCheckHeap: FAILED check at %dth operation\n", malloc_check_counter-1);
+ if (frames) {
+ unsigned index = 1;
+ if (b) {
+ _simple_sappend(b, "Stack for last operation where the malloc check succeeded: ");
+ while (index < num_frames) _simple_sprintf(b, "%p ", frames[index++]);
+ malloc_printf("%s\n(Use 'atos' for a symbolic stack)\n", _simple_string(b));
+ } else {
+ /*
+ * Should only get here if vm_allocate() can't get a single page of
+ * memory, implying _simple_asl_log() would also fail. So we just
+ * print to the file descriptor.
+ */
+ _malloc_printf(MALLOC_PRINTF_NOLOG, "Stack for last operation where the malloc check succeeded: ");
+ while (index < num_frames) _malloc_printf(MALLOC_PRINTF_NOLOG, "%p ", frames[index++]);
+ _malloc_printf(MALLOC_PRINTF_NOLOG, "\n(Use 'atos' for a symbolic stack)\n");
}
- malloc_report(MALLOC_REPORT_NOLOG, "\n(Use 'atos' for a symbolic stack)\n");
- }
- }
- if (malloc_check_each > 1) {
- unsigned recomm_each = (malloc_check_each > 10) ? malloc_check_each / 10 : 1;
- unsigned recomm_start =
- (malloc_check_counter > malloc_check_each + 1) ? malloc_check_counter - 1 - malloc_check_each : 1;
- malloc_report(MALLOC_REPORT_NOLOG,
- "*** Recommend using 'setenv MallocCheckHeapStart %d; setenv MallocCheckHeapEach %d' to narrow down failure\n",
- recomm_start, recomm_each);
- }
-
- if (b) {
- _simple_sfree(b);
- }
-
- // Use malloc_vreport() to:
- // * report the error
- // * call malloc_error_break() for a breakpoint
- // * sleep or stop for debug
- // * set the crash message and crash if malloc_check_abort is set.
- unsigned sleep_time = 0;
- uint32_t report_flags = ASL_LEVEL_ERR | MALLOC_REPORT_DEBUG | MALLOC_REPORT_NOLOG;
- if (malloc_check_abort) {
- report_flags |= MALLOC_REPORT_CRASH;
- } else {
+ }
+ if (malloc_check_each > 1) {
+ unsigned recomm_each = (malloc_check_each > 10) ? malloc_check_each/10 : 1;
+ unsigned recomm_start = (malloc_check_counter > malloc_check_each+1) ? malloc_check_counter-1-malloc_check_each : 1;
+ malloc_printf("*** Recommend using 'setenv MallocCheckHeapStart %d; setenv MallocCheckHeapEach %d' to narrow down failure\n", recomm_start, recomm_each);
+ }
+ if (malloc_check_abort) {
+ CRSetCrashLogMessage(b ? _simple_string(b) : "*** MallocCheckHeap: FAILED check");
+ abort();
+ } else if (b)
+ _simple_sfree(b);
if (malloc_check_sleep > 0) {
- malloc_report(ASL_LEVEL_NOTICE, "*** Will sleep for %d seconds to leave time to attach\n", malloc_check_sleep);
- sleep_time = malloc_check_sleep;
+ _malloc_printf(ASL_LEVEL_NOTICE, "*** Sleeping for %d seconds to leave time to attach\n",
+ malloc_check_sleep);
+ sleep(malloc_check_sleep);
} else if (malloc_check_sleep < 0) {
- malloc_report(ASL_LEVEL_NOTICE, "*** Will sleep once for %d seconds to leave time to attach\n", -malloc_check_sleep);
- sleep_time = -malloc_check_sleep;
+ _malloc_printf(ASL_LEVEL_NOTICE, "*** Sleeping once for %d seconds to leave time to attach\n",
+ -malloc_check_sleep);
+ sleep(-malloc_check_sleep);
malloc_check_sleep = 0;
}
}
- va_list ap;
- va_start(ap, fmt);
- malloc_vreport(report_flags, sleep_time, msg, NULL, fmt, ap);
- va_end(ap);
-}
-
-/********* Block creation and manipulation ************/
-
-static void
-internal_check(void)
-{
- if (malloc_zone_check(NULL)) {
- if (!frames) {
- vm_allocate(mach_task_self(), (void *)&frames, vm_page_size, 1);
- }
- thread_stack_pcs(frames, (unsigned)(vm_page_size / sizeof(vm_address_t) - 1), &num_frames);
- }
malloc_check_start += malloc_check_each;
}
void *
-malloc_zone_malloc(malloc_zone_t *zone, size_t size)
-{
- MALLOC_TRACE(TRACE_malloc | DBG_FUNC_START, (uintptr_t)zone, size, 0, 0);
-
- void *ptr;
+malloc_zone_malloc(malloc_zone_t *zone, size_t size) {
+ 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) {
+ ptr = zone->malloc(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_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;
+malloc_zone_calloc(malloc_zone_t *zone, size_t num_items, size_t size) {
+ void *ptr;
if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
-
+ if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
+ return NULL;
+ }
ptr = zone->calloc(zone, num_items, size);
-
- 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 (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);
return ptr;
}
void *
-malloc_zone_valloc(malloc_zone_t *zone, size_t size)
-{
- MALLOC_TRACE(TRACE_valloc | DBG_FUNC_START, (uintptr_t)zone, size, 0, 0);
-
- void *ptr;
+malloc_zone_valloc(malloc_zone_t *zone, size_t size) {
+ 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) {
+ 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 *
-malloc_zone_realloc(malloc_zone_t *zone, void *ptr, size_t size)
-{
- MALLOC_TRACE(TRACE_realloc | DBG_FUNC_START, (uintptr_t)zone, (uintptr_t)ptr, size, 0);
-
- void *new_ptr;
+malloc_zone_realloc(malloc_zone_t *zone, void *ptr, size_t size) {
+ void *new_ptr;
if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
return NULL;
}
-
new_ptr = zone->realloc(zone, ptr, size);
-
- 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);
- }
- MALLOC_TRACE(TRACE_realloc | DBG_FUNC_END, (uintptr_t)zone, (uintptr_t)ptr, size, (uintptr_t)new_ptr);
+ 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);
return new_ptr;
}
void
-malloc_zone_free(malloc_zone_t *zone, void *ptr)
-{
- MALLOC_TRACE(TRACE_free, (uintptr_t)zone, (uintptr_t)ptr, (ptr) ? *(uintptr_t*)ptr : 0, 0);
-
- if (malloc_logger) {
+malloc_zone_free(malloc_zone_t *zone, void *ptr) {
+ 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 && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
-
zone->free(zone, ptr);
}
static void
-malloc_zone_free_definite_size(malloc_zone_t *zone, void *ptr, size_t size)
-{
- MALLOC_TRACE(TRACE_free, (uintptr_t)zone, (uintptr_t)ptr, size, (ptr && size) ? *(uintptr_t*)ptr : 0);
-
- if (malloc_logger) {
+malloc_zone_free_definite_size(malloc_zone_t *zone, void *ptr, size_t size) {
+ 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 && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
-
zone->free_definite_size(zone, ptr, size);
}
malloc_zone_t *
-malloc_zone_from_ptr(const void *ptr)
-{
- if (!ptr) {
+malloc_zone_from_ptr(const void *ptr) {
+ if (!ptr)
return NULL;
- } else {
+ else
return find_registered_zone(ptr, NULL);
- }
}
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;
- if (zone->version < 5) { // Version must be >= 5 to look at the new memalign field.
+malloc_zone_memalign(malloc_zone_t *zone, size_t alignment, size_t size) {
+ void *ptr;
+ if (zone->version < 5) // Version must be >= 5 to look at the new memalign field.
return NULL;
- }
+ if (!(zone->memalign))
+ return NULL;
if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
return NULL;
}
- if (alignment < sizeof(void *) || // excludes 0 == alignment
- 0 != (alignment & (alignment - 1))) { // relies on sizeof(void *) being a power of two.
+ if (alignment < sizeof( void *) || // excludes 0 == alignment
+ 0 != (alignment & (alignment - 1))) { // relies on sizeof(void *) being a power of two.
return NULL;
}
-
- if (!(zone->memalign)) {
- return NULL;
- }
ptr = zone->memalign(zone, alignment, size);
-
- if (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);
return ptr;
}
-boolean_t
-malloc_zone_claimed_address(malloc_zone_t *zone, void *ptr)
-{
- if (!ptr) {
- // NULL is not a member of any zone.
- return false;
- }
-
- if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
- internal_check();
- }
-
- if (zone->version < 10 || !zone->claimed_address) {
- // For zones that have not implemented claimed_address, we always have
- // to return true to avoid a false negative.
- return true;
- }
-
- return zone->claimed_address(zone, ptr);
-}
-
/********* Functions for zone implementors ************/
void
-malloc_zone_register(malloc_zone_t *zone)
-{
+malloc_zone_register(malloc_zone_t *zone) {
MALLOC_LOCK();
malloc_zone_register_while_locked(zone);
MALLOC_UNLOCK();
}
void
-malloc_zone_unregister(malloc_zone_t *z)
-{
- unsigned index;
-
- if (malloc_num_zones == 0) {
+malloc_zone_unregister(malloc_zone_t *z) {
+ unsigned index;
+
+ if (malloc_num_zones == 0)
return;
- }
MALLOC_LOCK();
for (index = 0; index < malloc_num_zones; ++index) {
- if (z != malloc_zones[index]) {
+ if (z != malloc_zones[index])
continue;
- }
// Modify the page to be allow write access, so that we can update the
// malloc_zones array.
@@ -1760,27 +955,24 @@
// Exchange the roles of the FRZ counters. The counter that has captured the number of threads presently
// executing *inside* find_regiatered_zone is swapped with the counter drained to zero last time through.
// The former is then allowed to drain to zero while this thread yields.
- int32_t volatile *p = pFRZCounterLive;
+ int *p = pFRZCounterLive;
pFRZCounterLive = pFRZCounterDrain;
pFRZCounterDrain = p;
- OSMemoryBarrier(); // Full memory barrier
-
- while (0 != *pFRZCounterDrain) {
- yield();
- }
+ __sync_synchronize(); // Full memory barrier
+
+ while (0 != *pFRZCounterDrain) { yield(); }
MALLOC_UNLOCK();
return;
}
MALLOC_UNLOCK();
- malloc_report(ASL_LEVEL_ERR, "*** malloc_zone_unregister() failed for %p\n", z);
-}
-
-void
-malloc_set_zone_name(malloc_zone_t *z, const char *name)
-{
- char *newName;
+ malloc_printf("*** malloc_zone_unregister() failed for %p\n", z);
+}
+
+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) {
@@ -1801,19 +993,66 @@
}
const char *
-malloc_get_zone_name(malloc_zone_t *zone)
+malloc_get_zone_name(malloc_zone_t *zone) {
+ return zone->zone_name;
+}
+
+/*
+ * XXX malloc_printf now uses _simple_*printf. It only deals with a
+ * subset of printf format specifiers, but it doesn't call malloc.
+ */
+
+__attribute__((visibility("hidden")))
+void
+_malloc_vprintf(int flags, const char *format, va_list ap)
{
- return zone->zone_name;
-}
-
+ _SIMPLE_STRING b;
+
+ if (_malloc_no_asl_log || (flags & MALLOC_PRINTF_NOLOG) || (b = _simple_salloc()) == NULL) {
+ if (!(flags & MALLOC_PRINTF_NOPREFIX)) {
+ void *self = _os_tsd_get_direct(__TSD_THREAD_SELF);
+ _simple_dprintf(malloc_debug_file, "%s(%d,%p) malloc: ", getprogname(), getpid(), self);
+ }
+ _simple_vdprintf(malloc_debug_file, format, ap);
+ return;
+ }
+ if (!(flags & MALLOC_PRINTF_NOPREFIX)) {
+ void *self = _os_tsd_get_direct(__TSD_THREAD_SELF);
+ _simple_sprintf(b, "%s(%d,%p) malloc: ", getprogname(), getpid(), self);
+ }
+ _simple_vsprintf(b, format, ap);
+ _simple_put(b, malloc_debug_file);
+ _simple_asl_log(flags & MALLOC_PRINTF_LEVEL_MASK, Malloc_Facility, _simple_string(b));
+ _simple_sfree(b);
+}
+
+__attribute__((visibility("hidden")))
+void
+_malloc_printf(int flags, const char *format, ...)
+{
+ va_list ap;
+
+ va_start(ap, format);
+ _malloc_vprintf(flags, format, ap);
+ va_end(ap);
+}
+
+void
+malloc_printf(const char *format, ...)
+{
+ va_list ap;
+
+ va_start(ap, format);
+ _malloc_vprintf(ASL_LEVEL_ERR, format, ap);
+ va_end(ap);
+}
/********* Generic ANSI callouts ************/
void *
-malloc(size_t size)
-{
- void *retval;
- retval = malloc_zone_malloc(default_zone, size);
+malloc(size_t size) {
+ void *retval;
+ retval = malloc_zone_malloc(inline_malloc_default_zone(), size);
if (retval == NULL) {
errno = ENOMEM;
}
@@ -1821,10 +1060,9 @@
}
void *
-calloc(size_t num_items, size_t size)
-{
- void *retval;
- retval = malloc_zone_calloc(default_zone, num_items, size);
+calloc(size_t num_items, size_t size) {
+ void *retval;
+ retval = malloc_zone_calloc(inline_malloc_default_zone(), num_items, size);
if (retval == NULL) {
errno = ENOMEM;
}
@@ -1832,35 +1070,37 @@
}
void
-free(void *ptr)
-{
- malloc_zone_t *zone;
- size_t size;
- if (!ptr) {
+free(void *ptr) {
+ malloc_zone_t *zone;
+ size_t size;
+ if (!ptr)
return;
- }
-
zone = find_registered_zone(ptr, &size);
if (!zone) {
- int flags = MALLOC_REPORT_DEBUG | MALLOC_REPORT_NOLOG;
- if ((malloc_debug_flags & (MALLOC_ABORT_ON_CORRUPTION | MALLOC_ABORT_ON_ERROR))) {
- flags = MALLOC_REPORT_CRASH | MALLOC_REPORT_NOLOG;
- }
- malloc_report(flags,
- "*** error for object %p: pointer being freed was not allocated\n", ptr);
- } else if (zone->version >= 6 && zone->free_definite_size) {
+ malloc_printf("*** error for object %p: pointer being freed was not allocated\n"
+ "*** set a breakpoint in malloc_error_break to debug\n", ptr);
+ malloc_error_break();
+ if ((malloc_debug_flags & (SCALABLE_MALLOC_ABORT_ON_CORRUPTION|SCALABLE_MALLOC_ABORT_ON_ERROR))) {
+ _SIMPLE_STRING b = _simple_salloc();
+ if (b) {
+ _simple_sprintf(b, "*** error for object %p: pointer being freed was not allocated\n", ptr);
+ CRSetCrashLogMessage(_simple_string(b));
+ } else {
+ CRSetCrashLogMessage("*** error: pointer being freed was not allocated\n");
+ }
+ abort();
+ }
+ } else if (zone->version >= 6 && zone->free_definite_size)
malloc_zone_free_definite_size(zone, ptr, size);
- } else {
+ else
malloc_zone_free(zone, ptr);
- }
}
void *
-realloc(void *in_ptr, size_t new_size)
-{
- void *retval = NULL;
- void *old_ptr;
- malloc_zone_t *zone;
+realloc(void *in_ptr, size_t new_size) {
+ void *retval = NULL;
+ void *old_ptr;
+ malloc_zone_t *zone;
// SUSv3: "If size is 0 and ptr is not a null pointer, the object
// pointed to is freed. If the space cannot be allocated, the object
@@ -1872,20 +1112,27 @@
// size." So we only free the original memory if the allocation succeeds.
old_ptr = (new_size == 0) ? NULL : in_ptr;
if (!old_ptr) {
- retval = malloc_zone_malloc(default_zone, new_size);
+ retval = malloc_zone_malloc(inline_malloc_default_zone(), new_size);
} else {
zone = find_registered_zone(old_ptr, NULL);
if (!zone) {
- int flags = MALLOC_REPORT_DEBUG | MALLOC_REPORT_NOLOG;
- if (malloc_debug_flags & (MALLOC_ABORT_ON_CORRUPTION | MALLOC_ABORT_ON_ERROR)) {
- flags = MALLOC_REPORT_CRASH | MALLOC_REPORT_NOLOG;
+ malloc_printf("*** error for object %p: pointer being realloc'd was not allocated\n"
+ "*** set a breakpoint in malloc_error_break to debug\n", old_ptr);
+ malloc_error_break();
+ if ((malloc_debug_flags & (SCALABLE_MALLOC_ABORT_ON_CORRUPTION|SCALABLE_MALLOC_ABORT_ON_ERROR))) {
+ _SIMPLE_STRING b = _simple_salloc();
+ if (b) {
+ _simple_sprintf(b, "*** error for object %p: pointer being realloc'd was not allocated\n", old_ptr);
+ CRSetCrashLogMessage(_simple_string(b));
+ } else {
+ CRSetCrashLogMessage("*** error: pointer being realloc'd was not allocated\n");
+ }
+ abort();
}
- malloc_report(flags, "*** error for object %p: pointer being realloc'd was not allocated\n", in_ptr);
} else {
retval = malloc_zone_realloc(zone, old_ptr, new_size);
}
}
-
if (retval == NULL) {
errno = ENOMEM;
} else if (new_size == 0) {
@@ -1895,10 +1142,9 @@
}
void *
-valloc(size_t size)
-{
- void *retval;
- malloc_zone_t *zone = default_zone;
+valloc(size_t size) {
+ void *retval;
+ malloc_zone_t *zone = inline_malloc_default_zone();
retval = malloc_zone_valloc(zone, size);
if (retval == NULL) {
errno = ENOMEM;
@@ -1907,28 +1153,24 @@
}
extern void
-vfree(void *ptr)
-{
+vfree(void *ptr) {
free(ptr);
}
size_t
-malloc_size(const void *ptr)
-{
- size_t size = 0;
-
- if (!ptr) {
+malloc_size(const void *ptr) {
+ size_t size = 0;
+
+ if (!ptr)
return size;
- }
(void)find_registered_zone(ptr, &size);
return size;
}
size_t
-malloc_good_size(size_t size)
-{
- malloc_zone_t *zone = default_zone;
+malloc_good_size (size_t size) {
+ malloc_zone_t *zone = inline_malloc_default_zone();
return zone->introspect->good_size(zone, size);
}
@@ -1951,18 +1193,18 @@
int
posix_memalign(void **memptr, size_t alignment, size_t size)
{
- void *retval;
+ void *retval;
/* POSIX is silent on NULL == memptr !?! */
- retval = malloc_zone_memalign(default_zone, alignment, size);
+ retval = malloc_zone_memalign(inline_malloc_default_zone(), alignment, size);
if (retval == NULL) {
// To avoid testing the alignment constraints redundantly, we'll rely on the
// test made in malloc_zone_memalign to vet each request. Only if that test fails
// and returns NULL, do we arrive here to detect the bogus alignment and give the
// required EINVAL return.
- if (alignment < sizeof(void *) || // excludes 0 == alignment
- 0 != (alignment & (alignment - 1))) { // relies on sizeof(void *) being a power of two.
+ if (alignment < sizeof( void *) || // excludes 0 == alignment
+ 0 != (alignment & (alignment - 1))) { // relies on sizeof(void *) being a power of two.
return EINVAL;
}
return ENOMEM;
@@ -1972,72 +1214,10 @@
}
}
-boolean_t
-malloc_claimed_address(void *ptr)
-{
- // We need to check with each registered zone whether it claims "ptr".
- // Use logic similar to that in find_registered_zone().
- if (malloc_num_zones == 0) {
- return false;
- }
-
- // Start with the lite zone, if it's in use.
- if (lite_zone && malloc_zone_claimed_address(lite_zone, 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
- // walk the zones array without a lock (see find_registered_zone() for
- // the details).
- int32_t volatile *pFRZCounter = pFRZCounterLive;
- OSAtomicIncrement32Barrier(pFRZCounter);
-
- int32_t limit = *(int32_t volatile *)&malloc_num_zones;
- malloc_zone_t **zones = &malloc_zones[1];
- boolean_t result = false;
- for (unsigned index = 1; index < limit; ++index, ++zones) {
- malloc_zone_t *zone = *zones;
- if (malloc_zone_claimed_address(zone, ptr)) {
- result = true;
- break;
- }
- }
-
- OSAtomicDecrement32Barrier(pFRZCounter);
- return result;
-}
-
-void *
-reallocarray(void * in_ptr, size_t nmemb, size_t size){
- size_t alloc_size;
- if (os_mul_overflow(nmemb, size, &alloc_size)){
- errno = ENOMEM;
+static malloc_zone_t *
+find_registered_purgeable_zone(void *ptr) {
+ if (!ptr)
return NULL;
- }
- return realloc(in_ptr, alloc_size);
-}
-
-void *
-reallocarrayf(void * in_ptr, size_t nmemb, size_t size){
- size_t alloc_size;
- if (os_mul_overflow(nmemb, size, &alloc_size)){
- errno = ENOMEM;
- return NULL;
- }
- return reallocf(in_ptr, alloc_size);
-}
-
-static malloc_zone_t *
-find_registered_purgeable_zone(void *ptr)
-{
- if (!ptr) {
- return NULL;
- }
/*
* Look for a zone which contains ptr. If that zone does not have the purgeable malloc flag
@@ -2050,25 +1230,21 @@
/* FIXME: would really like a zone->introspect->flags->purgeable check, but haven't determined
* binary compatibility impact of changing the introspect struct yet. */
- if (!zone) {
+ if (!zone)
return NULL;
- }
/* Check to make sure pointer is page aligned and size is multiple of page size */
- if ((size < vm_page_size) || ((size % vm_page_size) != 0)) {
+ if ((size < vm_page_size) || ((size % vm_page_size) != 0))
return NULL;
- }
return zone;
}
void
-malloc_make_purgeable(void *ptr)
-{
+malloc_make_purgeable(void *ptr) {
malloc_zone_t *zone = find_registered_purgeable_zone(ptr);
- if (!zone) {
+ if (!zone)
return;
- }
int state = VM_PURGABLE_VOLATILE;
vm_purgable_control(mach_task_self(), (vm_address_t)ptr, VM_PURGABLE_SET_STATE, &state);
@@ -2078,198 +1254,21 @@
/* Returns true if ptr is valid. Ignore the return value from vm_purgeable_control and only report
* state. */
int
-malloc_make_nonpurgeable(void *ptr)
-{
+malloc_make_nonpurgeable(void *ptr) {
malloc_zone_t *zone = find_registered_purgeable_zone(ptr);
- if (!zone) {
+ if (!zone)
return 0;
- }
int state = VM_PURGABLE_NONVOLATILE;
vm_purgable_control(mach_task_self(), (vm_address_t)ptr, VM_PURGABLE_SET_STATE, &state);
- if (state == VM_PURGABLE_EMPTY) {
+ if (state == VM_PURGABLE_EMPTY)
return EFAULT;
- }
return 0;
}
-void
-malloc_enter_process_memory_limit_warn_mode(void)
-{
- // <rdar://problem/25063714>
-}
-
-#if ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING
-
-// Is the system elible to turn on/off MSL lite in response to memory resource exceptions
-//
-// Return true if
-// - The user has not explicitly opted out
-// and
-// - Either the user has explicitly opted in or this is an Apple Internal enabled build
-
-static boolean_t
-check_is_eligible_for_lite_mode_mre_handling(void)
-{
- struct stat stat_buf;
-
- // User opted out
- if (stat("/var/db/disableLiteModeMemoryResourceExceptionHandling", &stat_buf) == 0) {
- return false;
- }
-
- // User opted in
- if (stat("/var/db/enableLiteModeMemoryResourceExceptionHandling", &stat_buf) == 0) {
- return true;
- }
-
-
- // Not enabled for everything else
- return false;
-}
-
-// Not thread-safe, but it's called from malloc_memory_event_handler which already assumes
-// single thread execution.
-static boolean_t
-is_eligible_for_lite_mode_mre_handling(void)
-{
- static boolean_t is_eligible = false;
- static boolean_t needs_check = true;
-
- if (needs_check) {
- is_eligible = check_is_eligible_for_lite_mode_mre_handling();
- needs_check = false;
- }
-
- return is_eligible;
-}
-
-#endif
-
-static void
-handle_msl_memory_event(unsigned long event)
-{
- // don't mix and match enabling mechanisms
- if (warn_mode_entered) {
- return;
- }
-
- event &= NOTE_MEMORYSTATUS_MSL_STATUS;
-
- // sanity check
- if (event == 0) {
- return;
- }
-
- // first check if the disable bit is set
- if (event & MEMORYSTATUS_DISABLE_MSL) {
- turn_off_stack_logging();
- return;
- }
-
- boolean_t msl_malloc = (event & MEMORYSTATUS_ENABLE_MSL_MALLOC);
- boolean_t msl_vm = (event & MEMORYSTATUS_ENABLE_MSL_VM);
- boolean_t msl_lite = (event & MEMORYSTATUS_ENABLE_MSL_LITE);
-
- // The following ensures it's not possible to enable two different modes
- // For instance this would not be allowed:
- // Enable lite
- // Disable
- // Enable full
-
- if (msl_lite) {
- if (msl_vm && msl_malloc) {
- if (msl_type_enabled_at_runtime == stack_logging_mode_none || msl_type_enabled_at_runtime == stack_logging_mode_lite) {
- msl_type_enabled_at_runtime = stack_logging_mode_lite;
- turn_on_stack_logging(stack_logging_mode_lite);
- }
- } else if (msl_vm) {
- if (msl_type_enabled_at_runtime == stack_logging_mode_none || msl_type_enabled_at_runtime == stack_logging_mode_vmlite) {
- msl_type_enabled_at_runtime = stack_logging_mode_vmlite;
- turn_on_stack_logging(stack_logging_mode_vmlite);
- }
- }
- return;
- } else if (msl_malloc && msl_vm) {
- if (msl_type_enabled_at_runtime == stack_logging_mode_none || msl_type_enabled_at_runtime == stack_logging_mode_all) {
- msl_type_enabled_at_runtime = stack_logging_mode_all;
- turn_on_stack_logging(stack_logging_mode_all);
- }
- return;
- } else if (msl_malloc) {
- if (msl_type_enabled_at_runtime == stack_logging_mode_none || msl_type_enabled_at_runtime == stack_logging_mode_malloc) {
- msl_type_enabled_at_runtime = stack_logging_mode_malloc;
- turn_on_stack_logging(stack_logging_mode_malloc);
- }
- return;
- } else if (msl_vm) {
- if (msl_type_enabled_at_runtime == stack_logging_mode_none || msl_type_enabled_at_runtime == stack_logging_mode_vm) {
- msl_type_enabled_at_runtime = stack_logging_mode_vm;
- turn_on_stack_logging(stack_logging_mode_vm);
- }
- return;
- }
-}
-
-// Note that malloc_memory_event_handler is not thread-safe, and we are relying on the callers of this for synchronization
-void
-malloc_memory_event_handler(unsigned long event)
-{
- if (event & NOTE_MEMORYSTATUS_PRESSURE_WARN) {
- malloc_zone_pressure_relief(0, 0);
- }
-
- // First check for enable/disable MSL - only recognize if all other bits are 0
- // Don't attempt this if we've either entered or exited MRE mode
- if ((event & NOTE_MEMORYSTATUS_MSL_STATUS) != 0 && (event & ~NOTE_MEMORYSTATUS_MSL_STATUS) == 0 && !warn_mode_entered && !warn_mode_disable_retries) {
- handle_msl_memory_event(event);
- return;
- }
-
-#if ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING
- // If we have reached EXC_RESOURCE, we no longer need stack log data.
- // If we are under system-wide memory pressure, we should jettison stack log data.
- if ((event & (NOTE_MEMORYSTATUS_PROC_LIMIT_CRITICAL | NOTE_MEMORYSTATUS_PRESSURE_CRITICAL)) &&
- !warn_mode_disable_retries) {
- // If we have crossed the EXC_RESOURCE limit once already, there is no point in
- // collecting stack logs in the future, even if we missed a previous chance to
- // collect data because nobody is going to ask us for it again.
- warn_mode_disable_retries = true;
-
- // Only try to clean up stack log data if it was enabled through a proc limit warning.
- // User initiated stack logging should proceed unimpeded.
- if (warn_mode_entered) {
- malloc_report(ASL_LEVEL_INFO, "malloc_memory_event_handler: stopping stack-logging\n");
- turn_off_stack_logging();
- __malloc_lock_stack_logging();
- __delete_uniquing_table_memory_while_locked();
- __malloc_unlock_stack_logging();
-
- warn_mode_entered = false;
- }
- }
-
- // Enable stack logging if we are approaching the process limit, provided
- // we aren't under system wide memory pressure and we're allowed to try again.
- if ((event & NOTE_MEMORYSTATUS_PROC_LIMIT_WARN) &&
- !(event & NOTE_MEMORYSTATUS_PRESSURE_CRITICAL) &&
- !warn_mode_entered && !warn_mode_disable_retries &&
- is_eligible_for_lite_mode_mre_handling()) {
- malloc_report(ASL_LEVEL_INFO, "malloc_memory_event_handler: approaching memory limit. Starting stack-logging.\n");
- if (turn_on_stack_logging(stack_logging_mode_lite)) {
- warn_mode_entered = true;
-
- // set the maximum allocation threshold
- max_lite_mallocs = MAX_LITE_MALLOCS;
- }
- }
-#endif
-}
-
-size_t
-malloc_zone_pressure_relief(malloc_zone_t *zone, size_t goal)
+size_t malloc_zone_pressure_relief(malloc_zone_t *zone, size_t goal)
{
if (!zone) {
unsigned index = 0;
@@ -2279,30 +1278,25 @@
MALLOC_LOCK();
while (index < malloc_num_zones) {
zone = malloc_zones[index++];
- if (zone->version < 8) {
+ if (zone->version < 8)
continue;
- }
- if (NULL == zone->pressure_relief) {
+ if (NULL == zone->pressure_relief)
continue;
- }
- if (0 == goal) { /* Greedy */
+ if (0 == goal) /* Greedy */
total += zone->pressure_relief(zone, 0);
- } else if (goal > total) {
+ else if (goal > total)
total += zone->pressure_relief(zone, goal - total);
- } else { /* total >= goal */
+ else /* total >= goal */
break;
- }
}
MALLOC_UNLOCK();
return total;
} else {
// Assumes zone is not destroyed for the duration of this call
- if (zone->version < 8) {
+ if (zone->version < 8)
return 0;
- }
- if (NULL == zone->pressure_relief) {
+ if (NULL == zone->pressure_relief)
return 0;
- }
return zone->pressure_relief(zone, goal);
}
}
@@ -2310,21 +1304,18 @@
/********* Batch methods ************/
unsigned
-malloc_zone_batch_malloc(malloc_zone_t *zone, size_t size, void **results, unsigned num_requested)
-{
- if (!zone->batch_malloc) {
+malloc_zone_batch_malloc(malloc_zone_t *zone, size_t size, void **results, unsigned num_requested) {
+ unsigned (*batch_malloc)(malloc_zone_t *, size_t, void **, unsigned) = zone-> batch_malloc;
+ if (! batch_malloc)
return 0;
- }
if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
- unsigned batched = zone->batch_malloc(zone, size, results, num_requested);
-
+ unsigned batched = batch_malloc(zone, size, results, num_requested);
if (malloc_logger) {
- unsigned index = 0;
+ unsigned index = 0;
while (index < batched) {
- malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0,
- (uintptr_t)results[index], 0);
+ malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)results[index], 0);
index++;
}
}
@@ -2332,27 +1323,24 @@
}
void
-malloc_zone_batch_free(malloc_zone_t *zone, void **to_be_freed, unsigned num)
-{
+malloc_zone_batch_free(malloc_zone_t *zone, void **to_be_freed, unsigned num) {
if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
if (malloc_logger) {
- unsigned index = 0;
+ unsigned index = 0;
while (index < num) {
- malloc_logger(
- MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)to_be_freed[index], 0, 0, 0);
+ malloc_logger(MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)to_be_freed[index], 0, 0, 0);
index++;
}
}
-
- if (zone->batch_free) {
- zone->batch_free(zone, to_be_freed, num);
+ void (*batch_free)(malloc_zone_t *, void **, unsigned) = zone-> batch_free;
+ if (batch_free) {
+ batch_free(zone, to_be_freed, num);
} else {
- void (*free_fun)(malloc_zone_t *, void *) = zone->free;
-
+ void (*free_fun)(malloc_zone_t *, void *) = zone->free;
while (num--) {
- void *ptr = *to_be_freed++;
+ void *ptr = *to_be_freed++;
free_fun(zone, ptr);
}
}
@@ -2361,39 +1349,34 @@
/********* Functions for performance tools ************/
static kern_return_t
-_malloc_default_reader(task_t task, vm_address_t address, vm_size_t size, void **ptr)
-{
+_malloc_default_reader(task_t task, vm_address_t address, vm_size_t size, void **ptr) {
*ptr = (void *)address;
return 0;
}
kern_return_t
-malloc_get_all_zones(task_t task, memory_reader_t reader, vm_address_t **addresses, unsigned *count)
-{
- // Note that the 2 following addresses are not correct if the address of the target is different from your own. This notably
- // occurs if the address of System.framework is slid (e.g. different than at B & I )
- vm_address_t remote_malloc_zones = (vm_address_t)&malloc_zones;
- vm_address_t remote_malloc_num_zones = (vm_address_t)&malloc_num_zones;
- kern_return_t err;
- vm_address_t zones_address;
- vm_address_t *zones_address_ref;
- unsigned num_zones;
- unsigned *num_zones_ref;
- if (!reader) {
- reader = _malloc_default_reader;
- }
+malloc_get_all_zones(task_t task, memory_reader_t reader, vm_address_t **addresses, unsigned *count) {
+ // Note that the 2 following addresses are not correct if the address of the target is different from your own. This notably occurs if the address of System.framework is slid (e.g. different than at B & I )
+ vm_address_t remote_malloc_zones = (vm_address_t)&malloc_zones;
+ vm_address_t remote_malloc_num_zones = (vm_address_t)&malloc_num_zones;
+ kern_return_t err;
+ vm_address_t zones_address;
+ vm_address_t *zones_address_ref;
+ unsigned num_zones;
+ unsigned *num_zones_ref;
+ if (!reader) reader = _malloc_default_reader;
// printf("Read malloc_zones at address %p should be %p\n", &malloc_zones, malloc_zones);
err = reader(task, remote_malloc_zones, sizeof(void *), (void **)&zones_address_ref);
// printf("Read malloc_zones[%p]=%p\n", remote_malloc_zones, *zones_address_ref);
if (err) {
- malloc_report(ASL_LEVEL_ERR, "*** malloc_get_all_zones: error reading zones_address at %p\n", (void *)remote_malloc_zones);
+ malloc_printf("*** malloc_get_all_zones: error reading zones_address at %p\n", (unsigned)remote_malloc_zones);
return err;
}
zones_address = *zones_address_ref;
// printf("Reading num_zones at address %p\n", remote_malloc_num_zones);
err = reader(task, remote_malloc_num_zones, sizeof(unsigned), (void **)&num_zones_ref);
if (err) {
- malloc_report(ASL_LEVEL_ERR, "*** malloc_get_all_zones: error reading num_zones at %p\n", (void *)remote_malloc_num_zones);
+ malloc_printf("*** malloc_get_all_zones: error reading num_zones at %p\n", (unsigned)remote_malloc_num_zones);
return err;
}
num_zones = *num_zones_ref;
@@ -2402,7 +1385,7 @@
// printf("malloc_get_all_zones succesfully found %d zones\n", num_zones);
err = reader(task, zones_address, sizeof(malloc_zone_t *) * num_zones, (void **)addresses);
if (err) {
- malloc_report(ASL_LEVEL_ERR, "*** malloc_get_all_zones: error reading zones at %p\n", &zones_address);
+ malloc_printf("*** malloc_get_all_zones: error reading zones at %p\n", &zones_address);
return err;
}
// printf("malloc_get_all_zones succesfully read %d zones\n", num_zones);
@@ -2412,12 +1395,9 @@
/********* Debug helpers ************/
void
-malloc_zone_print_ptr_info(void *ptr)
-{
- malloc_zone_t *zone;
- if (!ptr) {
- return;
- }
+malloc_zone_print_ptr_info(void *ptr) {
+ malloc_zone_t *zone;
+ if (!ptr) return;
zone = malloc_zone_from_ptr(ptr);
if (zone) {
printf("ptr %p in registered zone %p\n", ptr, zone);
@@ -2427,16 +1407,13 @@
}
boolean_t
-malloc_zone_check(malloc_zone_t *zone)
-{
- boolean_t ok = 1;
+malloc_zone_check(malloc_zone_t *zone) {
+ boolean_t ok = 1;
if (!zone) {
- unsigned index = 0;
+ unsigned index = 0;
while (index < malloc_num_zones) {
zone = malloc_zones[index++];
- if (!zone->introspect->check(zone)) {
- ok = 0;
- }
+ if (!zone->introspect->check(zone)) ok = 0;
}
} else {
ok = zone->introspect->check(zone);
@@ -2445,10 +1422,9 @@
}
void
-malloc_zone_print(malloc_zone_t *zone, boolean_t verbose)
-{
+malloc_zone_print(malloc_zone_t *zone, boolean_t verbose) {
if (!zone) {
- unsigned index = 0;
+ unsigned index = 0;
while (index < malloc_num_zones) {
zone = malloc_zones[index++];
zone->introspect->print(zone, verbose);
@@ -2459,14 +1435,13 @@
}
void
-malloc_zone_statistics(malloc_zone_t *zone, malloc_statistics_t *stats)
-{
+malloc_zone_statistics(malloc_zone_t *zone, malloc_statistics_t *stats) {
if (!zone) {
memset(stats, 0, sizeof(*stats));
- unsigned index = 0;
+ unsigned index = 0;
while (index < malloc_num_zones) {
zone = malloc_zones[index++];
- malloc_statistics_t this_stats;
+ malloc_statistics_t this_stats;
zone->introspect->statistics(zone, &this_stats);
stats->blocks_in_use += this_stats.blocks_in_use;
stats->size_in_use += this_stats.size_in_use;
@@ -2479,10 +1454,9 @@
}
void
-malloc_zone_log(malloc_zone_t *zone, void *address)
-{
+malloc_zone_log(malloc_zone_t *zone, void *address) {
if (!zone) {
- unsigned index = 0;
+ unsigned index = 0;
while (index < malloc_num_zones) {
zone = malloc_zones[index++];
zone->introspect->log(zone, address);
@@ -2494,43 +1468,38 @@
/********* Misc other entry points ************/
-void
-mag_set_thread_index(unsigned int index)
-{
- _os_cpu_number_override = index;
-#if CONFIG_NANOZONE
- nano_common_cpu_number_override_set();
-#endif // CONFIG_NANOZONE
-}
-
static void
-DefaultMallocError(int x)
-{
+DefaultMallocError(int x) {
#if USE_SLEEP_RATHER_THAN_ABORT
- malloc_report(ASL_LEVEL_ERR, "*** error %d\n", x);
+ malloc_printf("*** error %d\n", x);
sleep(3600);
#else
_SIMPLE_STRING b = _simple_salloc();
if (b) {
_simple_sprintf(b, "*** error %d", x);
- malloc_report(MALLOC_REPORT_NOLOG, "%s\n", _simple_string(b));
- _os_set_crash_log_message_dynamic(_simple_string(b));
+ malloc_printf("%s\n", _simple_string(b));
+ CRSetCrashLogMessage(_simple_string(b));
} else {
- malloc_report(MALLOC_REPORT_NOLOG, "*** error %d\n", x);
- _os_set_crash_log_message("*** DefaultMallocError called");
+ _malloc_printf(MALLOC_PRINTF_NOLOG, "*** error %d", x);
+ CRSetCrashLogMessage("*** DefaultMallocError called");
}
abort();
#endif
}
-void (*malloc_error(void (*func)(int)))(int)
-{
+void (*
+ malloc_error(void (*func)(int)))(int) {
return DefaultMallocError;
}
+/* Stack logging fork-handling prototypes */
+extern void __stack_logging_fork_prepare();
+extern void __stack_logging_fork_parent();
+extern void __stack_logging_fork_child();
+extern void __stack_logging_early_finished();
+
static void
-_malloc_lock_all(void (*callout)(void))
-{
+_malloc_lock_all(void (*callout)(void)) {
unsigned index = 0;
MALLOC_LOCK();
while (index < malloc_num_zones) {
@@ -2541,8 +1510,7 @@
}
static void
-_malloc_unlock_all(void (*callout)(void))
-{
+_malloc_unlock_all(void (*callout)(void)) {
unsigned index = 0;
callout();
while (index < malloc_num_zones) {
@@ -2552,53 +1520,28 @@
MALLOC_UNLOCK();
}
-static void
-_malloc_reinit_lock_all(void (*callout)(void))
-{
- unsigned index = 0;
- callout();
- while (index < malloc_num_zones) {
- malloc_zone_t *zone = malloc_zones[index++];
- if (zone->version < 9) { // Version must be >= 9 to look at reinit_lock
- zone->introspect->force_unlock(zone);
- } else {
- zone->introspect->reinit_lock(zone);
- }
- }
- MALLOC_REINIT_LOCK();
-}
-
-
// Called prior to fork() to guarantee that malloc is not in any critical
// sections during the fork(); prevent any locks from being held by non-
// surviving threads after the fork.
void
-_malloc_fork_prepare(void)
-{
+_malloc_fork_prepare(void) {
return _malloc_lock_all(&__stack_logging_fork_prepare);
}
// Called in the parent process after fork() to resume normal operation.
void
-_malloc_fork_parent(void)
-{
+_malloc_fork_parent(void) {
return _malloc_unlock_all(&__stack_logging_fork_parent);
}
// Called in the child process after fork() to resume normal operation.
void
-_malloc_fork_child(void)
-{
+_malloc_fork_child(void) {
#if CONFIG_NANOZONE
- if (_malloc_initialize_pred) {
- if (_malloc_engaged_nano == NANO_V2) {
- 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());
- }
- }
+ if (_malloc_is_initialized && _malloc_engaged_nano)
+ nano_forked_zone(inline_malloc_default_zone());
#endif
- return _malloc_reinit_lock_all(&__stack_logging_fork_child);
+ return _malloc_unlock_all(&__stack_logging_fork_child);
}
/*
@@ -2619,50 +1562,42 @@
m.chunks_used = s.blocks_in_use;
m.bytes_used = s.size_in_use;
m.chunks_free = 0;
- m.bytes_free = m.bytes_total - m.bytes_used; /* isn't this somewhat obvious? */
-
- return (m);
+ m.bytes_free = m.bytes_total - m.bytes_used; /* isn't this somewhat obvious? */
+
+ return(m);
}
boolean_t
malloc_zone_enable_discharge_checking(malloc_zone_t *zone)
{
- if (zone->version < 7) { // Version must be >= 7 to look at the new discharge checking fields.
+ if (zone->version < 7) // Version must be >= 7 to look at the new discharge checking fields.
return FALSE;
- }
- if (NULL == zone->introspect->enable_discharge_checking) {
+ if (NULL == zone->introspect->enable_discharge_checking)
return FALSE;
- }
return zone->introspect->enable_discharge_checking(zone);
}
void
malloc_zone_disable_discharge_checking(malloc_zone_t *zone)
{
- if (zone->version < 7) { // Version must be >= 7 to look at the new discharge checking fields.
+ if (zone->version < 7) // Version must be >= 7 to look at the new discharge checking fields.
return;
- }
- if (NULL == zone->introspect->disable_discharge_checking) {
+ if (NULL == zone->introspect->disable_discharge_checking)
return;
- }
zone->introspect->disable_discharge_checking(zone);
}
void
malloc_zone_discharge(malloc_zone_t *zone, void *memory)
{
- if (NULL == zone) {
+ if (NULL == zone)
zone = malloc_zone_from_ptr(memory);
- }
- if (NULL == zone) {
+ if (NULL == zone)
return;
- }
- if (zone->version < 7) { // Version must be >= 7 to look at the new discharge checking fields.
+ if (zone->version < 7) // Version must be >= 7 to look at the new discharge checking fields.
return;
- }
- if (NULL == zone->introspect->discharge) {
+ if (NULL == zone->introspect->discharge)
return;
- }
zone->introspect->discharge(zone, memory);
}
@@ -2670,24 +1605,20 @@
malloc_zone_enumerate_discharged_pointers(malloc_zone_t *zone, void (^report_discharged)(void *memory, void *info))
{
if (!zone) {
- unsigned index = 0;
+ unsigned index = 0;
while (index < malloc_num_zones) {
zone = malloc_zones[index++];
- if (zone->version < 7) {
+ if (zone->version < 7)
continue;
- }
- if (NULL == zone->introspect->enumerate_discharged_pointers) {
+ if (NULL == zone->introspect->enumerate_discharged_pointers)
continue;
- }
zone->introspect->enumerate_discharged_pointers(zone, report_discharged);
}
} else {
- if (zone->version < 7) {
+ if (zone->version < 7)
return;
- }
- if (NULL == zone->introspect->enumerate_discharged_pointers) {
+ if (NULL == zone->introspect->enumerate_discharged_pointers)
return;
- }
zone->introspect->enumerate_discharged_pointers(zone, report_discharged);
}
}
@@ -2699,31 +1630,28 @@
#endif
void
-set_malloc_singlethreaded(boolean_t single)
-{
+set_malloc_singlethreaded(boolean_t single) {
static boolean_t warned = 0;
if (!warned) {
#if PHASE_OUT_OLD_MALLOC
- malloc_report(ASL_LEVEL_ERR, "*** OBSOLETE: set_malloc_singlethreaded(%d)\n", single);
+ malloc_printf("*** OBSOLETE: set_malloc_singlethreaded(%d)\n", single);
#endif
warned = 1;
}
}
void
-malloc_singlethreaded(void)
-{
+malloc_singlethreaded(void) {
static boolean_t warned = 0;
if (!warned) {
- malloc_report(ASL_LEVEL_ERR, "*** OBSOLETE: malloc_singlethreaded()\n");
+ malloc_printf("*** OBSOLETE: malloc_singlethreaded()\n");
warned = 1;
}
}
int
-malloc_debug(int level)
-{
- malloc_report(ASL_LEVEL_ERR, "*** OBSOLETE: malloc_debug()\n");
+malloc_debug(int level) {
+ malloc_printf("*** OBSOLETE: malloc_debug()\n");
return 0;
}