Loading...
--- libmalloc/libmalloc-521.100.59/src/malloc.c
+++ libmalloc/libmalloc-166.200.60/src/malloc.c
@@ -23,14 +23,34 @@
#include "internal.h"
-#if MALLOC_TARGET_IOS
+#if TARGET_OS_IPHONE
// malloc_report(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 // MALLOC_TARGET_IOS
+#endif // TARGET_OS_IPHONE
#define USE_SLEEP_RATHER_THAN_ABORT 0
+
+/*
+ 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.
+ */
+
+#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)
static _malloc_lock_s _malloc_lock = _MALLOC_LOCK_INIT;
#define MALLOC_LOCK() _malloc_lock_lock(&_malloc_lock)
@@ -47,40 +67,12 @@
*/
int32_t malloc_num_zones = 0;
int32_t malloc_num_zones_allocated = 0;
-malloc_zone_t **malloc_zones = (malloc_zone_t **)0xdeaddeaddeaddead;
-
-// TODO: getter and setter rather than direct export so that this can be baked
-// into the cached fastpath checks
+malloc_zone_t **malloc_zones = 0;
malloc_logger_t *malloc_logger = NULL;
-
-static uint32_t initial_num_zones;
-static malloc_zone_t *initial_scalable_zone;
-#if CONFIG_NANOZONE
-static malloc_zone_t *initial_nano_zone;
-#endif // CONFIG_NANOZONE
-malloc_zone_t *initial_xzone_zone;
-static malloc_zone_t *default_purgeable_zone;
-static bool has_injected_zone0;
-static bool malloc_xzone_enabled = MALLOC_XZONE_ENABLED_DEFAULT;
-static enum {
- MALLOC_XZONE_NANO_DEFAULT,
- MALLOC_XZONE_NANO_DISABLED,
- MALLOC_XZONE_NANO_ENABLED,
-} malloc_xzone_nano_override;
+static malloc_zone_t *initial_default_zone = NULL;
unsigned malloc_debug_flags = 0;
-bool malloc_tracing_enabled = false;
-bool malloc_space_efficient_enabled = false;
-bool malloc_medium_space_efficient_enabled = true;
-
-bool malloc_sanitizer_enabled = false;
-
-bool malloc_interposition_compat = false;
-
-
-#if CONFIG_MALLOC_PROCESS_IDENTITY
-malloc_process_identity_t malloc_process_identity = MALLOC_PROCESS_NONE;
-#endif // CONFIG_MALLOC_PROCESS_IDENTITY
+boolean_t malloc_tracing_enabled = false;
unsigned malloc_check_start = 0; // 0 means don't check
unsigned malloc_check_counter = 0;
@@ -88,64 +80,13 @@
static int malloc_check_sleep = 100; // default 100 second sleep
static int malloc_check_abort = 0; // default is to sleep, not abort
-static bool malloc_simple_stack_logging = false;
-#define MALLOC_SIMPLE_STACK_LOGGING_FLAGS \
- (ASL_LEVEL_NOTICE | MALLOC_REPORT_NOPREFIX | MALLOC_REPORT_BACKTRACE | MALLOC_REPORT_NOWRITE)
-
-bool malloc_slowpath = false;
-
-static struct _malloc_msl_symbols msl = {};
-
-static struct malloc_sanitizer_poison *sanitizer = NULL;
-
-#if CONFIG_SANITIZER && TARGET_OS_OSX
-// Fallback pointers for memory poisoning functions from upstream ASan runtime
-static struct {
- void (*memory_poison)(uintptr_t ptr, size_t sz);
- void (*memory_unpoison)(uintptr_t ptr, size_t sz);
-} sanitizer_fallback_ptrs;
-
-// Fallback structure for heap allocation functions from our ASan runtime
-static struct malloc_sanitizer_poison sanitizer_fallback = {0};
-
-static void malloc_sanitizer_fallback_allocate_poison(uintptr_t ptr, size_t leftrz_sz, size_t alloc_sz, size_t rightrz_sz);
-static void malloc_sanitizer_fallback_deallocate_poison(uintptr_t ptr, size_t sz);
-#endif
-/* These masks are exported for libdispatch to register with (see "internal.h") */
-const unsigned long malloc_memorypressure_mask_default_4libdispatch = MALLOC_MEMORYPRESSURE_MASK_DEFAULT;
-const unsigned long malloc_memorypressure_mask_msl_4libdispatch = MALLOC_MEMORYPRESSURE_MASK_MSL;
-
-// TODO delete this, its only used some deprecated functions like turn_on_stack_logging,
-// which have been replaced by functions in MallocStackLogging.framework
-// (like msl_turn_on_stack_logging)
-static struct msl_dylib {
-
- void *dylib;
-
- kern_return_t (*get_frames_for_address)(task_t task,
- mach_vm_address_t address,
- mach_vm_address_t *stack_frames_buffer,
- uint32_t max_stack_frames,
- uint32_t *count);
-
- uint64_t (*stackid_for_vm_region) (task_t task, mach_vm_address_t address);
-
- kern_return_t (*get_frames_for_stackid) (task_t task,
- uint64_t stack_identifier,
- mach_vm_address_t *stack_frames_buffer,
- uint32_t max_stack_frames,
- uint32_t *count,
- bool *last_frame_is_threadid);
-
-
- kern_return_t (*uniquing_table_read_stack) (struct backtrace_uniquing_table *uniquing_table,
- uint64_t stackid,
- mach_vm_address_t *out_frames_buffer,
- uint32_t *out_frames_count,
- uint32_t max_frames);
-} msld = {};
-
-MALLOC_NOEXPORT malloc_zone_t* lite_zone = NULL;
+
+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;
/*
* Counters that coordinate zone destruction (in malloc_zone_unregister) with
@@ -165,7 +106,6 @@
#define MALLOC_LOG_TYPE_CLEARED stack_logging_flag_cleared
#define DEFAULT_MALLOC_ZONE_STRING "DefaultMallocZone"
-#define DEFAULT_SCALABLE_ZONE_STRING "DefaultScalableMallocZone"
#define DEFAULT_PUREGEABLE_ZONE_STRING "DefaultPurgeableMallocZone"
#define MALLOC_HELPER_ZONE_STRING "MallocHelperZone"
@@ -175,76 +115,16 @@
MALLOC_NOEXPORT
unsigned int logical_ncpus;
-#if CONFIG_MAGAZINE_PER_CLUSTER
-MALLOC_NOEXPORT
-unsigned int ncpuclusters;
-#endif // CONFIG_MAGAZINE_PER_CLUSTER
-
MALLOC_NOEXPORT
unsigned int hyper_shift;
-MALLOC_NOEXPORT
-size_t malloc_absolute_max_size;
-
// Boot argument for max magazine control
static const char max_magazines_boot_arg[] = "malloc_max_magazines";
-static const char large_expanded_cache_threshold_boot_arg[] = "malloc_large_expanded_cache_threshold";
-
-
-MALLOC_NOEXPORT
-unsigned malloc_zero_on_free_sample_period = 0; // 0 means don't sample
-
-static const char zero_on_free_sample_period_boot_arg[] = "malloc_zero_on_free_sample_period";
-
-MALLOC_NOEXPORT
-malloc_zero_policy_t malloc_zero_policy = MALLOC_ZERO_POLICY_DEFAULT;
-
-static const char zero_on_free_enabled_boot_arg[] = "malloc_zero_on_free_enabled";
-
-
-#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";
-static const char medium_space_efficient_boot_arg[] = "malloc_medium_space_efficient";
-static const char medium_madvise_dram_scale_divisor_boot_arg[] = "malloc_medium_madvise_dram_scale_divisor";
-#endif // CONFIG_MEDIUM_ALLOCATOR
-
/********* Utilities ************/
static bool _malloc_entropy_initialized;
-#if !TARGET_OS_DRIVERKIT
-#include <dlfcn.h>
-
-typedef void * (*dlopen_t) (const char * __path, int __mode);
-typedef void * (*dlsym_t) (void * __handle, const char * __symbol);
-
-static dlopen_t LIBMALLOC_FUNCTION_PTRAUTH(_dlopen) = NULL;
-static dlsym_t LIBMALLOC_FUNCTION_PTRAUTH(_dlsym) = NULL;
-#else
-#define _dlopen(...) NULL
-#define _dlsym(...) NULL
-#endif // TARGET_OS_DRIVERKIT
-
-void
-malloc_slowpath_update(void)
-{
- bool slowpath = has_injected_zone0 ||
- malloc_num_zones == 0 ||
- malloc_check_start ||
- lite_zone ||
- malloc_tracing_enabled ||
- malloc_simple_stack_logging ||
- malloc_interposition_compat;
-
- if (malloc_slowpath != slowpath) {
- malloc_slowpath = slowpath;
- }
-}
-
void __malloc_init(const char *apple[]);
-static void _malloc_initialize(const char *apple[], const char *bootargs);
static int
__entropy_from_kernel(const char *str)
@@ -274,32 +154,6 @@
}
}
return idx;
-}
-
-#if TARGET_OS_OSX && defined(__x86_64__)
-static uint64_t
-__is_translated(void)
-{
- return (*(uint64_t*)_COMM_PAGE_CPU_CAPABILITIES64) & kIsTranslated;
-}
-#endif /* TARGET_OS_OSX */
-
-#define LIBMALLOC_EXPERIMENT_FACTORS_KEY "MallocExperiment="
-#define LIBMALLOC_EXPERIMENT_DISABLE_MEDIUM (1ULL)
-#define LIBMALLOC_DEFERRED_RECLAIM_ENABLE "MallocDeferredReclaim=1"
-static void
-__malloc_init_experiments(const char *str)
-{
- uint64_t experiment_factors = 0;
- str = strchr(str, '=');
- if (str) {
- experiment_factors = strtoull_l(str + 1, NULL, 16, NULL);
- }
- switch (experiment_factors) {
- case LIBMALLOC_EXPERIMENT_DISABLE_MEDIUM:
- magazine_medium_enabled = false;
- break;
- }
}
static void
@@ -323,357 +177,9 @@
"malloc_max_magazines must be positive - ignored.\n");
}
}
-
- flag = malloc_common_value_for_key_copy(bootargs,
- large_expanded_cache_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_large_expanded_cache_threshold = (unsigned int)value;
- } else {
- malloc_report(ASL_LEVEL_ERR,
- "malloc_large_expanded_cache_threshold must be positive - ignored.\n");
- }
- }
-
- flag = malloc_common_value_for_key_copy(bootargs,
- zero_on_free_enabled_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 || value == 1)) {
- malloc_zero_policy = value ? MALLOC_ZERO_ON_FREE : MALLOC_ZERO_NONE;
- } else {
- malloc_report(ASL_LEVEL_ERR,
- "malloc_zero_on_free_enabled must be 0 or 1 - ignored.\n");
- }
- }
-
- flag = malloc_common_value_for_key_copy(bootargs,
- zero_on_free_sample_period_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) {
- malloc_zero_on_free_sample_period = (unsigned int)value;
- } else {
- malloc_report(ASL_LEVEL_ERR,
- "malloc_zero_on_free_sample_period must be positive - ignored.\n");
- }
- }
-
-
-#if CONFIG_MEDIUM_ALLOCATOR
-#if TARGET_OS_OSX
-#if defined(__x86_64__)
- if (__is_translated()) {
- magazine_medium_active_threshold = 0;
- }
-#elif defined(__arm64__)
- magazine_medium_active_threshold = 0;
-#endif
-#endif /* TARGET_OS_OSX */
-
- flag = malloc_common_value_for_key_copy(bootargs, medium_enabled_boot_arg,
- value_buf, sizeof(value_buf));
- if (flag) {
- 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");
- }
- }
-
- flag = malloc_common_value_for_key_copy(bootargs,
- medium_space_efficient_boot_arg, value_buf, sizeof(value_buf));
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp) {
- malloc_medium_space_efficient_enabled = (value != 0);
- }
- }
-
- flag = malloc_common_value_for_key_copy(bootargs, medium_madvise_dram_scale_divisor_boot_arg, value_buf, sizeof(value_buf));
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && value >= 0) {
- magazine_medium_madvise_dram_scale_divisor = (uint64_t)value;
- } else {
- malloc_report(ASL_LEVEL_ERR,
- "malloc_medium_madvise_dram_scale_divisor must be positive - ignored.\n");
- }
- }
-#endif // CONFIG_MEDIUM_ALLOCATOR
-}
-
-#if CONFIG_MALLOC_PROCESS_IDENTITY
-
-static void
-_malloc_check_process_identity(const char *apple[])
-{
- static const struct {
- const char *name;
- malloc_process_identity_t identity;
- } name_identity_mapping[] = {
-#if TARGET_OS_SIMULATOR
- { "launchd_sim", MALLOC_PROCESS_LAUNCHD, },
- { "launchd_sim.development", MALLOC_PROCESS_LAUNCHD, },
- { "launchd_sim.debug", MALLOC_PROCESS_LAUNCHD, },
-#else // TARGET_OS_SIMULATOR
- { "launchd", MALLOC_PROCESS_LAUNCHD, },
- { "launchd.development", MALLOC_PROCESS_LAUNCHD, },
- { "launchd.debug", MALLOC_PROCESS_LAUNCHD, },
- { "launchd.testing", MALLOC_PROCESS_LAUNCHD, },
-#endif // TARGET_OS_SIMULATOR
- { "logd", MALLOC_PROCESS_LOGD, },
- { "notifyd", MALLOC_PROCESS_NOTIFYD, },
-
- { "mediaparserd", MALLOC_PROCESS_MEDIAPARSERD, },
- { "videocodecd", MALLOC_PROCESS_VIDEOCODECD, },
- { "mediaplaybackd", MALLOC_PROCESS_MEDIAPLAYBACKD },
- { "audiomxd", MALLOC_PROCESS_AUDIOMXD, },
- { "avconferenced", MALLOC_PROCESS_AVCONFERENCED, },
- { "mediaserverd", MALLOC_PROCESS_MEDIASERVERD, },
- { "cameracaptured", MALLOC_PROCESS_CAMERACAPTURED, },
-
- { "MessagesBlastDoorService", MALLOC_PROCESS_BLASTDOOR_MESSAGES, },
- { "MessagesAirlockService", MALLOC_PROCESS_BLASTDOOR_MESSAGES, },
- { "IDSBlastDoorService", MALLOC_PROCESS_BLASTDOOR_IDS, },
- { "IMDPersistenceAgent", MALLOC_PROCESS_IMDPERSISTENCEAGENT },
- { "imagent", MALLOC_PROCESS_IMAGENT, },
-
- { "ThumbnailExtensionSecure", MALLOC_PROCESS_QUICKLOOK_THUMBNAIL_SECURE, },
- { "com.apple.quicklook.extension.previewUI", MALLOC_PROCESS_QUICKLOOK_PREVIEW, },
- { "QuickLookUIExtension", MALLOC_PROCESS_QUICKLOOK_PREVIEW, },
- { "ThumbnailExtension", MALLOC_PROCESS_QUICKLOOK_THUMBNAIL },
-
- { "MobileSafari", MALLOC_PROCESS_BROWSER, },
- { "com.apple.WebKit.Networking", MALLOC_PROCESS_BROWSER, },
- { "com.apple.WebKit.GPU", MALLOC_PROCESS_BROWSER, },
- { "com.apple.WebKit.WebContent", MALLOC_PROCESS_BROWSER, },
- { "com.apple.WebKit.WebContent.CaptivePortal", MALLOC_PROCESS_BROWSER, },
- { "MTLCompilerService", MALLOC_PROCESS_MTLCOMPILERSERVICE },
-
- { "telnetd", MALLOC_PROCESS_TELNETD, },
- { "sshd", MALLOC_PROCESS_SSHD, },
- { "sshd-keygen-wrapper", MALLOC_PROCESS_SSHD_KEYGEN_WRAPPER, },
- { "bash", MALLOC_PROCESS_BASH, },
- { "dash", MALLOC_PROCESS_DASH, },
- { "sh", MALLOC_PROCESS_SH, },
- { "zsh", MALLOC_PROCESS_ZSH, },
- { "python3", MALLOC_PROCESS_PYTHON3, },
- { "perl", MALLOC_PROCESS_PERL, },
- { "su", MALLOC_PROCESS_SU, },
- { "time", MALLOC_PROCESS_TIME, },
- { "find", MALLOC_PROCESS_FIND, },
- { "xargs", MALLOC_PROCESS_XARGS, },
-
- { "callservicesd", MALLOC_PROCESS_CALLSERVICESD, },
- { "maild", MALLOC_PROCESS_MAILD, },
- { "mDNSResponder", MALLOC_PROCESS_MDNSRESPONDER, },
- { "ASVAssetViewer", MALLOC_PROCESS_ASVASSETVIEWER },
- { "identityservicesd", MALLOC_PROCESS_IDENTITYSERVICESD, },
- { "wifid", MALLOC_PROCESS_WIFID, },
- { "fmfd", MALLOC_PROCESS_FMFD, },
- { "searchpartyd", MALLOC_PROCESS_SEARCHPARTYD, },
- { "vmd", MALLOC_PROCESS_VMD, },
- { "CommCenter", MALLOC_PROCESS_COMMCENTER, },
- { "wifip2pd", MALLOC_PROCESS_WIFIP2PD, },
- { "wifianalyticsd", MALLOC_PROCESS_WIFIANALYTICSD, },
-
- { "AegirPoster", MALLOC_PROCESS_AEGIRPOSTER, },
- { "CollectionsPoster", MALLOC_PROCESS_COLLECTIONSPOSTER, },
- };
-
- if (getpid() == 1) {
- malloc_process_identity = MALLOC_PROCESS_LAUNCHD;
- return;
- }
-
- const char *flag = _simple_getenv(apple, "HardenedRuntime");
- if (flag) {
- unsigned long long value = strtoull(flag, NULL, 0);
- if (value) {
- // reproduced from xnu
- enum {
- MallocBrowserHostEntitlementMask = 0x01,
- MallocBrowserGPUEntitlementMask = 0x02,
- MallocBrowserNetworkEntitlementMask = 0x04,
- MallocBrowserWebContentEntitlementMask = 0x08,
- };
-
- long enablement_mask = MallocBrowserHostEntitlementMask |
- MallocBrowserGPUEntitlementMask |
- MallocBrowserNetworkEntitlementMask |
- MallocBrowserWebContentEntitlementMask;
- if (value & enablement_mask) {
- malloc_process_identity = MALLOC_PROCESS_BROWSER;
- return;
- }
- }
- }
-
- const char *name = getprogname();
- for (size_t i = 0; i < countof(name_identity_mapping); i++) {
- if (!strcmp(name, name_identity_mapping[i].name)) {
- malloc_process_identity = name_identity_mapping[i].identity;
- break;
- }
- }
-}
-
-#if !CONFIG_FEATUREFLAGS_SIMPLE
-#error "must have feature flags"
-#endif
-
-static bool
-_malloc_check_secure_allocator_process_enablement(void)
-{
- // launchd is special because the feature flag check can't work for it
- if (malloc_process_identity == MALLOC_PROCESS_LAUNCHD) {
- return MALLOC_SECURE_ALLOCATOR_LAUNCHD_ENABLED_DEFAULT;
- }
-
- if (os_feature_enabled_simple(libmalloc,
- SecureAllocator_AllInitialProcesses, false)) {
- switch (malloc_process_identity) {
- case MALLOC_PROCESS_COMMCENTER:
- // Enabled by explicit feature flag only
- break;
- default:
- return true;
- }
- }
-
-#define ENABLEMENT_CASE(id, name, simulator_default) \
- case MALLOC_PROCESS_##id: \
- return os_feature_enabled_simple(libmalloc, \
- SecureAllocator_process_##name, (simulator_default))
-
- switch (malloc_process_identity) {
- ENABLEMENT_CASE(LOGD, logd, true);
- ENABLEMENT_CASE(NOTIFYD, notifyd, true);
-
- ENABLEMENT_CASE(MEDIAPARSERD, mediaparserd, true);
- ENABLEMENT_CASE(VIDEOCODECD, videocodecd, true);
- ENABLEMENT_CASE(MEDIAPLAYBACKD, mediaplaybackd, true);
- ENABLEMENT_CASE(AVCONFERENCED, avconferenced, true);
- ENABLEMENT_CASE(MEDIASERVERD, mediaserverd, true);
- ENABLEMENT_CASE(AUDIOMXD, audiomxd, true);
- ENABLEMENT_CASE(CAMERACAPTURED, cameracaptured, true);
-
- ENABLEMENT_CASE(BLASTDOOR_MESSAGES, blastdoor_messages, true);
- ENABLEMENT_CASE(BLASTDOOR_IDS, blastdoor_ids, true);
- ENABLEMENT_CASE(IMDPERSISTENCEAGENT, IMDPersistenceAgent, true);
- ENABLEMENT_CASE(IMAGENT, imagent, true);
-
- ENABLEMENT_CASE(QUICKLOOK_THUMBNAIL_SECURE, ThumbnailExtensionSecure, true);
- ENABLEMENT_CASE(QUICKLOOK_PREVIEW, quicklook_preview, true);
- ENABLEMENT_CASE(QUICKLOOK_THUMBNAIL, ThumbnailExtension, true);
-
- ENABLEMENT_CASE(MTLCOMPILERSERVICE, MTLCompilerService, true);
-
- ENABLEMENT_CASE(TELNETD, telnetd, false);
- ENABLEMENT_CASE(SSHD, sshd, false);
- ENABLEMENT_CASE(SSHD_KEYGEN_WRAPPER, sshd_keygen_wrapper, false);
- ENABLEMENT_CASE(BASH, bash, false);
- ENABLEMENT_CASE(DASH, dash, false);
- ENABLEMENT_CASE(SH, sh, false);
- ENABLEMENT_CASE(ZSH, zsh, false);
- ENABLEMENT_CASE(PYTHON3, python3, false);
- ENABLEMENT_CASE(PERL, perl, false);
- ENABLEMENT_CASE(SU, su, false);
- ENABLEMENT_CASE(TIME, time, false);
- ENABLEMENT_CASE(FIND, find, false);
- ENABLEMENT_CASE(XARGS, xargs, false);
-
- ENABLEMENT_CASE(CALLSERVICESD, callservicesd, true);
- ENABLEMENT_CASE(MAILD, maild, true);
- ENABLEMENT_CASE(MDNSRESPONDER, mDNSResponder, true);
- ENABLEMENT_CASE(ASVASSETVIEWER, ASVAssetViewer, true);
- ENABLEMENT_CASE(IDENTITYSERVICESD, identityservicesd, true);
- ENABLEMENT_CASE(WIFID, wifid, true);
- ENABLEMENT_CASE(FMFD, fmfd, true);
- ENABLEMENT_CASE(SEARCHPARTYD, searchpartyd, true);
- ENABLEMENT_CASE(VMD, vmd, true);
- ENABLEMENT_CASE(WIFIP2PD, wifip2pd, true);
- ENABLEMENT_CASE(WIFIANALYTICSD, wifianalyticsd, true);
-
- ENABLEMENT_CASE(COMMCENTER, CommCenter, true);
-
- ENABLEMENT_CASE(BROWSER, Browser, false);
-
- ENABLEMENT_CASE(AEGIRPOSTER, aegirposter, false);
- ENABLEMENT_CASE(COLLECTIONSPOSTER, CollectionsPoster, false);
-
- default:
- return false;
- }
-}
-
-#endif // CONFIG_MALLOC_PROCESS_IDENTITY
-
-static void
-_malloc_init_featureflags(void)
-{
-#if CONFIG_FEATUREFLAGS_SIMPLE
- bool zero_on_free_feature_enabled = os_feature_enabled_simple(libmalloc,
- ZeroOnFree, MALLOC_ZERO_POLICY_DEFAULT == MALLOC_ZERO_ON_FREE);
- bool policy_is_zero_on_free = (malloc_zero_policy == MALLOC_ZERO_ON_FREE);
- if (zero_on_free_feature_enabled != policy_is_zero_on_free) {
- malloc_zero_policy = zero_on_free_feature_enabled ?
- MALLOC_ZERO_ON_FREE : MALLOC_ZERO_NONE;
- }
-
- bool secure_allocator = false;
-#if CONFIG_MALLOC_PROCESS_IDENTITY
- if (malloc_process_identity != MALLOC_PROCESS_NONE) {
- secure_allocator = _malloc_check_secure_allocator_process_enablement();
- } else
-#endif // CONFIG_MALLOC_PROCESS_IDENTITY
- {
- secure_allocator = os_feature_enabled_simple(libmalloc,
- SecureAllocator_SystemWide, false);
- }
-
- if (secure_allocator != malloc_xzone_enabled) {
- malloc_xzone_enabled = secure_allocator;
- }
-#endif
-}
-
-extern malloc_zone_t *force_asan_init_if_present(void)
- asm("_malloc_default_zone");
-
+}
+
+/* TODO: Investigate adding _malloc_initialize() into this libSystem initializer */
void
__malloc_init(const char *apple[])
{
@@ -682,37 +188,18 @@
// to temporarily allocate at least a page of memory to read the bootargs
// into.
char bootargs[1024] = { '\0' };
- bool allow_bootargs = true;
-#if CONFIG_FEATUREFLAGS_SIMPLE
- // os_feature_enabled_simple() doesn't work in launchd, but launchd should
- // be able to read boot-args
- if (getpid() != 1) {
- allow_bootargs &= os_feature_enabled_simple(libmalloc, EnableBootArgs, false);
- }
+ size_t len = sizeof(bootargs) - 1;
+ if (!sysctlbyname("kern.bootargs", bootargs, &len, NULL, 0) && len > 0) {
+ bootargs[len + 1] = '\0';
+ }
+
+#if CONFIG_NANOZONE
+ // TODO: envp should be passed down from Libsystem
+ const char **envp = (const char **)*_NSGetEnviron();
+ nano_common_init(envp, apple, bootargs);
#endif
-#if defined(_COMM_PAGE_DEV_FIRM)
- allow_bootargs &= !!*((uint32_t *)_COMM_PAGE_DEV_FIRM);
-#endif // _COMM_PAGE_DEV_FIRM
-
- size_t len = sizeof(bootargs) - 1;
- if (allow_bootargs &&
- !sysctlbyname("kern.bootargs", bootargs, &len, NULL, 0) &&
- len > 0) {
- bootargs[len + 1] = '\0';
- }
-
- // Cache the calculation of this "constant", which unfortunately depends on
- // runtime values of vm_kernel_page_size and vm_page_size
- malloc_absolute_max_size = _MALLOC_ABSOLUTE_MAX_SIZE;
-
-#if CONFIG_MALLOC_PROCESS_IDENTITY
- _malloc_check_process_identity(apple);
-#endif
-
- _malloc_init_featureflags();
const char **p;
- const char *malloc_experiments = NULL;
for (p = apple; p && *p; p++) {
if (strstr(*p, "malloc_entropy") == *p) {
int count = __entropy_from_kernel(*p);
@@ -721,87 +208,23 @@
if (sizeof(malloc_entropy) / sizeof(malloc_entropy[0]) == count) {
_malloc_entropy_initialized = true;
}
- }
- if (strstr(*p, LIBMALLOC_EXPERIMENT_FACTORS_KEY) == *p) {
- malloc_experiments = *p;
- }
-#if CONFIG_DEFERRED_RECLAIM
- if (strstr(*p, LIBMALLOC_DEFERRED_RECLAIM_ENABLE) == *p) {
- // Turn on the large cache which will place
- // its free entries in the deferred reclaim buffer
- large_cache_enabled = 1;
- }
-#endif /* CONFIG_DEFERRED_RECLAIM */
+ break;
+ }
}
if (!_malloc_entropy_initialized) {
getentropy((void*)malloc_entropy, sizeof(malloc_entropy));
_malloc_entropy_initialized = true;
}
- if (malloc_experiments) {
- __malloc_init_experiments(malloc_experiments);
- }
__malloc_init_from_bootargs(bootargs);
mvm_aslr_init();
-
- /*
- * This really is a renamed call to malloc_default_zone() which is
- * interposable and interposed by asan, so that we trigger the lazy
- * initialization of asan _BEFORE_ _malloc_initialize().
- *
- * If we do it after, then _malloc_initialize() then ASAN will replace
- * the system allocator too late and bad things happen.
- */
- force_asan_init_if_present();
-
- _malloc_initialize(apple, bootargs);
-}
-
-static void register_pgm_zone(bool internal_diagnostics);
-static void stack_logging_early_finished(const struct _malloc_late_init *funcs);
-
-// WARNING: The passed _malloc_late_init is a stack variable in
-// libSystem_initializer(). We must not hold on to it.
-//
-// WARNING 2: By the time this is called, malloc() is already used
-// a bunch of times (from libobjc, libxpc, ...).
-void
-__malloc_late_init(const struct _malloc_late_init *mli)
-{
- register_pgm_zone(mli->internal_diagnostics);
- stack_logging_early_finished(mli);
- initial_num_zones = malloc_num_zones;
-
-#if CONFIG_SANITIZER
- if (malloc_sanitizer_enabled) {
- sanitizer_reset_environment();
-
-#if TARGET_OS_OSX
- // Fetch the memory poisoning functions from the upstream ASan runtime
- sanitizer_fallback_ptrs.memory_poison = _dlsym(RTLD_MAIN_ONLY, "__asan_poison_memory_region");
- sanitizer_fallback_ptrs.memory_unpoison = _dlsym(RTLD_MAIN_ONLY, "__asan_unpoison_memory_region");
-
- // Prefer the heap allocation functions from our ASan runtime, if available
- void *heap_alloc = _dlsym(RTLD_MAIN_ONLY, "__asan_poison_heap_memory_alloc"),
- *heap_dealloc = _dlsym(RTLD_MAIN_ONLY, "__asan_poison_heap_memory_free"),
- *heap_internal_poison = _dlsym(RTLD_MAIN_ONLY, "__asan_poison_heap_memory_internal");
- if (heap_alloc && heap_dealloc && heap_internal_poison) {
- sanitizer_fallback.heap_allocate_poison = heap_alloc;
- sanitizer_fallback.heap_deallocate_poison = heap_dealloc;
- sanitizer_fallback.heap_internal_poison = heap_internal_poison;
- } else {
- sanitizer_fallback.heap_allocate_poison = &malloc_sanitizer_fallback_allocate_poison;
- sanitizer_fallback.heap_deallocate_poison = &malloc_sanitizer_fallback_deallocate_poison;
- sanitizer_fallback.heap_internal_poison = &malloc_sanitizer_fallback_deallocate_poison;
- }
-#endif
- }
-#endif
-}
+}
+
+static malloc_zone_t* lite_zone = NULL;
MALLOC_ALWAYS_INLINE
static inline malloc_zone_t *
-runtime_default_zone(void) {
+runtime_default_zone() {
return (lite_zone) ? lite_zone : inline_malloc_default_zone();
}
@@ -1039,18 +462,21 @@
default_zone_malloc_claimed_address,
};
-MALLOC_NOEXPORT malloc_zone_t *default_zone = &virtual_default_zone.malloc_zone;
-
-MALLOC_NOEXPORT
-/*static*/ boolean_t
+static malloc_zone_t *default_zone = &virtual_default_zone.malloc_zone;
+
+static boolean_t
has_default_zone0(void)
{
- return !has_injected_zone0;
-}
-
-static inline malloc_zone_t *find_registered_zone(const void *, size_t *, bool) __attribute__((always_inline));
+ 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, bool known_non_default)
+find_registered_zone(const void *ptr, size_t *returned_size)
{
// Returns a zone which contains ptr, else NULL
@@ -1073,37 +499,32 @@
return default_zone;
}
}
-
- malloc_zone_t *zone;
- size_t size;
-
- // We assume that the initial zones will never be unregistered concurrently while this code is running so we can have
- // a fast path without synchronization. Callers who really do unregister these (to install their own default zone) need
- // to ensure they establish their zone setup during initialization and before entering a multi-threaded environment.
- for (uint32_t i = known_non_default ? 1 : 0; i < initial_num_zones; i++) {
- zone = malloc_zones[i];
- size = zone->size(zone, ptr);
-
- if (size) { // Claimed by this zone?
- if (returned_size) {
- *returned_size = size;
- }
-
- // Asan and others replace the zone at position 0 with their own zone.
- // In that case just return that zone as they need this information.
- // Otherwise return the virtual default zone, not the actual zone in position 0.
- if (i == 0 && has_default_zone0()) {
- return default_zone;
- }
-
+
+ // The default zone is registered in malloc_zones[0]. There's no danger that it will ever be unregistered.
+ // So don't advance the FRZ counter yet.
+ malloc_zone_t *zone = malloc_zones[0];
+ size_t size = zone->size(zone, ptr);
+ if (size) { // Claimed by this zone?
+ if (returned_size) {
+ *returned_size = size;
+ }
+
+ // Asan and others replace the zone at position 0 with their own zone.
+ // In that case just return that zone as they need this information.
+ // Otherwise return the virtual default zone, not the actual zone in position 0.
+ if (!has_default_zone0()) {
return zone;
+ } else {
+ return default_zone;
}
}
int32_t volatile *pFRZCounter = pFRZCounterLive; // Capture pointer to the counter of the moment
OSAtomicIncrement32Barrier(pFRZCounter); // Advance this counter -- our thread is in FRZ
+ unsigned index;
int32_t limit = *(int32_t volatile *)&malloc_num_zones;
+ malloc_zone_t **zones = &malloc_zones[1];
// From this point on, FRZ is accessing the malloc_zones[] array without locking
// in order to avoid contention on common operations (such as non-default-zone free()).
@@ -1120,8 +541,8 @@
// are still valid). It also ensures that all the pointers in the zones array are
// valid until it returns, so that a stale value in limit is not dangerous.
- for (uint32_t i = initial_num_zones; i < limit; i++) {
- zone = malloc_zones[i];
+ for (index = 1; index < limit; ++index, ++zones) {
+ zone = *zones;
size = zone->size(zone, ptr);
if (size) { // Claimed by this zone?
goto out;
@@ -1160,7 +581,7 @@
// lock. If trylock succeeds, unlock it, otherwise return "locked". Returns
// 0 == safe, 1 == locked/unsafe.
- if (msl.stack_logging_locked && msl.stack_logging_locked()) {
+ if (__stack_logging_locked()) {
return 1;
}
@@ -1186,8 +607,8 @@
static void set_flags_from_environment(void);
-MALLOC_NOEXPORT void
-malloc_zone_register_while_locked(malloc_zone_t *zone, bool make_default)
+static void
+malloc_zone_register_while_locked(malloc_zone_t *zone)
{
size_t protect_size;
unsigned i;
@@ -1236,13 +657,6 @@
mprotect(malloc_zones, protect_size, PROT_READ | PROT_WRITE);
}
- if (make_default) {
- memmove(&malloc_zones[1], &malloc_zones[0], malloc_num_zones * sizeof(malloc_zone_t *));
- malloc_zones[0] = zone;
- } else {
- malloc_zones[malloc_num_zones] = zone;
- }
-
/* <rdar://problem/12871662> This store-increment needs to be visible in the correct
* order to any threads in find_registered_zone, such that if the incremented value
* in malloc_num_zones is visible then the pointer write before it must also be visible.
@@ -1251,35 +665,183 @@
* ensure the proper store-release operation is performed is to use OSAtomic*Barrier
* to update malloc_num_zones.
*/
+ malloc_zones[malloc_num_zones] = zone;
OSAtomicIncrement32Barrier(&malloc_num_zones);
/* Finally, now that the zone is registered, disallow write access to the
* malloc_zones array */
mprotect(malloc_zones, protect_size, PROT_READ);
-
- // ASan and others interpose on mprotect() to ensure their zone is always at position 0.
- if (make_default && malloc_zones[0] != zone) {
- has_injected_zone0 = true;
- malloc_slowpath_update();
- }
-
//malloc_report(ASL_LEVEL_INFO, "Registered malloc_zone %p in malloc_zones %p [%u zones, %u bytes]\n", zone, malloc_zones,
// malloc_num_zones, protect_size);
}
-// This used to be called lazyily because it is using
-// dyld_process_is_restricted() before dyld_init() has run.
-//
-// However this function is safe to use, we keep this function separate
-// if we ever need to have a 2-stage init in the future.
static void
-_malloc_initialize(const char *apple[], const char *bootargs)
-{
+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_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
+ } 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 CONFIG_MAGAZINE_PER_CLUSTER
- ncpuclusters = *(uint8_t *)(uintptr_t)_COMM_PAGE_CPU_CLUSTERS;
-#endif // CONFIG_MAGAZINE_PER_CLUSTER
if (0 != (logical_ncpus % phys_ncpus)) {
MALLOC_REPORT_FATAL_ERROR(logical_ncpus % phys_ncpus,
@@ -1308,148 +870,98 @@
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);
+ 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 {
- max_medium_magazines = max_magazines;
- }
-
-#if CONFIG_MAGAZINE_PER_CLUSTER
- if (ncpuclusters == 1) {
-#if CONFIG_FEATUREFLAGS_SIMPLE
- // Not with the other feature flag checks because ncpuclusters needs to
- // be initialized first
- bool secure_allocator_single_cluster = os_feature_enabled_simple(
- libmalloc, SecureAllocator_SingleCluster, false);
-#else // CONFIG_FEATUREFLAGS_SIMPLE
- bool secure_allocator_single_cluster = false;
-#endif // CONFIG_FEATUREFLAGS_SIMPLE
- if (malloc_xzone_enabled && !secure_allocator_single_cluster) {
- malloc_xzone_enabled = false;
- }
- }
-#endif // CONFIG_MAGAZINE_PER_CLUSTER
-
- _malloc_detect_interposition();
-
-
- set_flags_from_environment(); // will only set flags up to two times
-
-
-#if CONFIG_SANITIZER
- malloc_sanitizer_enabled = sanitizer_should_enable();
+ zone = helper_zone;
+ malloc_zone_register_while_locked(zone);
+ malloc_set_zone_name(zone, DEFAULT_MALLOC_ZONE_STRING);
+ }
+#else
+ zone = create_scalable_zone(0, malloc_debug_flags);
+ malloc_zone_register_while_locked(zone);
+ malloc_set_zone_name(zone, DEFAULT_MALLOC_ZONE_STRING);
#endif
-
-#if CONFIG_NANOZONE
- // TODO: envp should be passed down from Libsystem
- const char **envp = (const char **)*_NSGetEnviron();
-
- // Disable nano when:
- // - sanitizer is enabled, to avoid speculative out-of-bounds
- // use-after-free reads that nano/nanov2 performs, OR
- // - MallocScribble is enabled, which nanov2 does not implement
- // - MallocCheckZeroOnFreeCorruption sampling is enabled, which nanov2 does
- // not implement
- if (!malloc_sanitizer_enabled &&
- !(malloc_debug_flags & MALLOC_DO_SCRIBBLE) &&
- !malloc_zero_on_free_sample_period) {
- nano_common_init(envp, apple, bootargs);
- }
-#endif // CONFIG_NANOZONE
-
-
- if (!initial_xzone_zone) {
- initial_scalable_zone = create_scalable_zone(0, malloc_debug_flags);
- malloc_set_zone_name(initial_scalable_zone, DEFAULT_MALLOC_ZONE_STRING);
- malloc_zone_register_while_locked(initial_scalable_zone, /*make_default=*/true);
-
-#if CONFIG_NANOZONE
- nano_common_configure();
-
- malloc_zone_t *helper_zone = initial_scalable_zone;
-
- if (_malloc_engaged_nano == NANO_V2) {
- initial_nano_zone = nanov2_create_zone(helper_zone, malloc_debug_flags);
- }
-
- if (initial_nano_zone) {
- malloc_set_zone_name(initial_nano_zone, DEFAULT_MALLOC_ZONE_STRING);
- malloc_set_zone_name(helper_zone, MALLOC_HELPER_ZONE_STRING);
- malloc_zone_register_while_locked(initial_nano_zone, /*make_default=*/true);
- }
-#endif
- }
-
-#if CONFIG_SANITIZER
- if (malloc_sanitizer_enabled) {
- malloc_zone_t *wrapped_zone = malloc_zones[0];
- malloc_zone_t *sanitizer_zone = sanitizer_create_zone(wrapped_zone);
- malloc_zone_register_while_locked(sanitizer_zone, /*make_default=*/true);
- }
-#endif
-
- // Initialize slowpath check after we've registered zones so that
- // malloc_num_zones check is meaningful
- malloc_slowpath_update();
-
- initial_num_zones = malloc_num_zones;
-
-#if CONFIG_DEFERRED_RECLAIM
- if (large_cache_enabled) {
- if (initial_xzone_zone) {
- // xzone_malloc will own the deferred_reclaim buffer
- large_cache_enabled = false;
- } else {
- kern_return_t kr = mvm_deferred_reclaim_init();
- if (kr != KERN_SUCCESS) {
- large_cache_enabled = false;
- malloc_report(ASL_LEVEL_ERR, "Unable to set up reclaim buffer (%d) - disabling large cache\n", kr);
- }
- }
- }
-#endif /* CONFIG_DEFERRED_RECLAIM */
-
-#if CONFIG_MEDIUM_ALLOCATOR
- uint64_t memsize = platform_hw_memsize();
- if (memsize >= 8 * magazine_medium_madvise_dram_scale_divisor) {
- magazine_medium_madvise_window_scale_factor = 8;
- } else if (memsize >= 4 * magazine_medium_madvise_dram_scale_divisor) {
- magazine_medium_madvise_window_scale_factor = 4;
- } else if (memsize >= 2 * magazine_medium_madvise_dram_scale_divisor) {
- magazine_medium_madvise_window_scale_factor = 2;
- } else {
- magazine_medium_madvise_window_scale_factor = 1;
- }
-#endif /* CONFIG_MEDIUM_ALLOCATOR */
+
+ initial_default_zone = zone;
+
+ if (n != 0) { // make the default first, for efficiency
+ unsigned protect_size = malloc_num_zones_allocated * sizeof(malloc_zone_t *);
+ malloc_zone_t *hold = malloc_zones[0];
+
+ if (hold->zone_name && strcmp(hold->zone_name, DEFAULT_MALLOC_ZONE_STRING) == 0) {
+ malloc_set_zone_name(hold, NULL);
+ }
+
+ mprotect(malloc_zones, protect_size, PROT_READ | PROT_WRITE);
+ malloc_zones[0] = malloc_zones[n];
+ malloc_zones[n] = hold;
+ mprotect(malloc_zones, protect_size, PROT_READ);
+ }
+
+ // 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);
-}
-
-static bool
-enable_pgm(void)
-{
- bool other_debug_tool = has_injected_zone0 || malloc_sanitizer_enabled;
- return !other_debug_tool && pgm_should_enable();
-}
-
-static void
-register_pgm_zone(bool internal_diagnostics)
-{
- pgm_init_config(internal_diagnostics);
- if (enable_pgm()) {
- malloc_zone_t *wrapped_zone = malloc_zones[0];
- malloc_zone_t *pgm_zone = pgm_create_zone(wrapped_zone);
- malloc_zone_register_while_locked(pgm_zone, /*make_default=*/true);
- }
+ MALLOC_UNLOCK();
+}
+
+MALLOC_ALWAYS_INLINE
+static inline void
+_malloc_initialize_once(void)
+{
+ os_once(&_malloc_initialize_pred, NULL, _malloc_initialize);
}
static inline malloc_zone_t *
inline_malloc_default_zone(void)
{
+ _malloc_initialize_once();
// malloc_report(ASL_LEVEL_INFO, "In inline_malloc_default_zone with %d %d\n", malloc_num_zones, malloc_has_debug_zone);
return malloc_zones[0];
}
@@ -1460,13 +972,46 @@
return default_zone;
}
+static inline malloc_zone_t *inline_malloc_default_scalable_zone(void) __attribute__((always_inline));
+static inline malloc_zone_t *
+inline_malloc_default_scalable_zone(void)
+{
+ unsigned index;
+
+ _malloc_initialize_once();
+ // malloc_report(ASL_LEVEL_INFO, "In inline_malloc_default_scalable_zone with %d %d\n", malloc_num_zones,
+ // malloc_has_debug_zone);
+
+ MALLOC_LOCK();
+#if CONFIG_NANOZONE
+ for (index = 0; index < malloc_num_zones; ++index) {
+ malloc_zone_t *z = malloc_zones[index];
+
+ if (z->zone_name && strcmp(z->zone_name, MALLOC_HELPER_ZONE_STRING) == 0) {
+ MALLOC_UNLOCK();
+ return z;
+ }
+ }
+#endif
+ for (index = 0; index < malloc_num_zones; ++index) {
+ malloc_zone_t *z = malloc_zones[index];
+
+ if (z->zone_name && strcmp(z->zone_name, DEFAULT_MALLOC_ZONE_STRING) == 0) {
+ MALLOC_UNLOCK();
+ return z;
+ }
+ }
+ MALLOC_UNLOCK();
+
+ malloc_report(ASL_LEVEL_ERR, "*** malloc_default_scalable_zone() failed to find 'DefaultMallocZone'\n");
+ return NULL; // FIXME: abort() instead?
+}
+
static void *
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);
+ if (size > LARGE_THRESHOLD) { // Leopard and earlier returned a ZFOD range, so ...
+ return default_zone_calloc(zone, 1, size); // Clear to zero always, ham-handedly touching in each page
} else {
return default_zone_malloc(zone, size);
}
@@ -1504,27 +1049,41 @@
malloc_engaged_nano(void)
{
#if CONFIG_NANOZONE
- return (initial_nano_zone || initial_xzone_zone) ? _malloc_engaged_nano : 0;
+ return _malloc_engaged_nano;
#else
return 0;
#endif
}
-int
-malloc_engaged_secure_allocator(void)
-{
- return !!initial_xzone_zone;
+malloc_zone_t *
+malloc_default_purgeable_zone(void)
+{
+ static malloc_zone_t *dpz;
+
+ if (!dpz) {
+ //
+ // PR_7288598: Must pass a *scalable* zone (szone) as the helper for create_purgeable_zone().
+ // Take care that the zone so obtained is not subject to interposing.
+ //
+ malloc_zone_t *tmp = create_purgeable_zone(0, 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)) {
+ malloc_destroy_zone(tmp);
+ }
+ }
+ return dpz;
}
static void
set_flags_from_environment(void)
{
const char *flag;
- const char **env = (const char **)*_NSGetEnviron();
- const char **p;
- const char *c;
-
-#if defined(__LP64__)
+ char **env = *_NSGetEnviron();
+ char **p;
+ char *c;
+
+#if __LP64__
malloc_debug_flags = MALLOC_ABORT_ON_CORRUPTION; // Set always on 64-bit processes
#else
int libSystemVersion = NSVersionOfLinkTimeLibrary("System");
@@ -1534,17 +1093,13 @@
malloc_debug_flags = MALLOC_ABORT_ON_CORRUPTION;
}
#endif
-
-#if TARGET_OS_OSX
- // rdar://99288027
- if (!dyld_program_sdk_at_least(dyld_platform_version_macOS_13_0)) {
- if (malloc_zero_policy == MALLOC_ZERO_ON_FREE) {
- malloc_zero_policy = MALLOC_ZERO_ON_ALLOC;
- }
- }
-#else // TARGET_OS_OSX
-#endif // TARGET_OS_OSX
-
+ stack_logging_enable_logging = 0;
+ stack_logging_dontcompact = 0;
+ malloc_logger = NULL;
+ malloc_check_start = 0;
+ malloc_check_each = 1000;
+ malloc_check_abort = 0;
+ malloc_check_sleep = 100;
/*
* Given that all environment variables start with "Malloc" we optimize by scanning quickly
* first the environment, therefore avoiding repeated calls to getenv().
@@ -1552,11 +1107,7 @@
* our behaviour.
*/
for (p = env; (c = *p) != NULL; ++p) {
-#if RDAR_48993662
- if (!strncmp(c, "Malloc", 6) || !strncmp(c, "_Malloc", 6)) {
-#else // RDAR_48993662
if (!strncmp(c, "Malloc", 6)) {
-#endif // RDAR_48993662
if (issetugid()) {
return;
}
@@ -1576,32 +1127,58 @@
return;
}
- flag = getenv("MallocGuardEdges");
+ if (getenv("MallocGuardEdges")) {
+ malloc_debug_flags |= MALLOC_ADD_GUARD_PAGES;
+ malloc_report(ASL_LEVEL_INFO, "protecting edges\n");
+ if (getenv("MallocDoNotProtectPrelude")) {
+ malloc_debug_flags |= MALLOC_DONT_PROTECT_PRELUDE;
+ malloc_report(ASL_LEVEL_INFO, "... but not protecting prelude guard page\n");
+ }
+ if (getenv("MallocDoNotProtectPostlude")) {
+ malloc_debug_flags |= MALLOC_DONT_PROTECT_POSTLUDE;
+ malloc_report(ASL_LEVEL_INFO, "... but not protecting postlude guard page\n");
+ }
+ }
+ flag = getenv("MallocStackLogging");
+ if (!flag) {
+ flag = getenv("MallocStackLoggingNoCompact");
+ stack_logging_dontcompact = 1;
+ }
if (flag) {
- if (!strcmp(flag, "all")) {
- // "MallocGuardEdges=all" adds guard page(s) for every region.
- // Do not do this on 32-bit platforms because there is insufficient
- // address space. These pages are always protected.
-#if MALLOC_TARGET_64BIT
- malloc_debug_flags |= MALLOC_GUARD_ALL | MALLOC_ADD_GUARD_PAGE_FLAGS;
- malloc_debug_flags &= ~(MALLOC_DONT_PROTECT_PRELUDE|MALLOC_DONT_PROTECT_POSTLUDE);
- malloc_report(ASL_LEVEL_INFO, "adding guard pages to all regions\n");
-#endif // MALLOC_TARGET_64BIT
+ // 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
+ // __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");
} else {
- malloc_debug_flags |= MALLOC_ADD_GUARD_PAGE_FLAGS;
- malloc_debug_flags &= ~MALLOC_GUARD_ALL;
- malloc_report(ASL_LEVEL_INFO, "adding guard pages for large allocator blocks\n");
- if (getenv("MallocDoNotProtectPrelude")) {
- malloc_debug_flags |= MALLOC_DONT_PROTECT_PRELUDE;
- malloc_report(ASL_LEVEL_INFO, "... but not protecting prelude guard page\n");
+ stack_logging_mode = stack_logging_mode_all;
+ malloc_report(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");
+ } else {
+ malloc_report(ASL_LEVEL_INFO, "stack logging compaction turned off; VM can increase rapidly\n");
}
- if (getenv("MallocDoNotProtectPostlude")) {
- malloc_debug_flags |= MALLOC_DONT_PROTECT_POSTLUDE;
- malloc_report(ASL_LEVEL_INFO, "... but not protecting postlude guard page\n");
- }
- }
- }
-
+ }
+ }
if (getenv("MallocScribble")) {
malloc_debug_flags |= MALLOC_DO_SCRIBBLE;
malloc_report(ASL_LEVEL_INFO, "enabling scribbling to detect mods to free blocks\n");
@@ -1613,11 +1190,8 @@
if (getenv("MallocTracing")) {
malloc_tracing_enabled = true;
}
- if (getenv("MallocSimpleStackLogging")) {
- malloc_simple_stack_logging = true;
- }
-
-#if defined(__LP64__)
+
+#if __LP64__
/* initialization above forces MALLOC_ABORT_ON_CORRUPTION of 64-bit processes */
#else
flag = getenv("MallocCorruptionAbort");
@@ -1669,23 +1243,12 @@
}
flag = getenv("MallocMaxMagazines");
-#if RDAR_48993662
- if (!flag) {
- flag = getenv("_MallocMaxMagazines");
- }
-#endif // RDAR_48993662
if (flag) {
-
- int value = (int)strtol(flag, NULL, 0);
+ int value = (unsigned)strtol(flag, NULL, 0);
if (value == 0) {
malloc_report(ASL_LEVEL_INFO, "Maximum magazines defaulted to %d\n", max_magazines);
-#if CONFIG_MAGAZINE_PER_CLUSTER
- } else if (value == UINT16_MAX) {
- max_magazines = ncpuclusters;
- malloc_report(ASL_LEVEL_INFO, "Maximum magazines limited to number of logical CPU clusters (%d)\n", max_magazines);
-#endif // CONFIG_MAGAZINE_PER_CLUSTER
} else if (value < 0) {
- malloc_report(ASL_LEVEL_ERR, "Maximum magazines must be positive - ignored.\n");
+ 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);
@@ -1694,146 +1257,6 @@
malloc_report(ASL_LEVEL_INFO, "Maximum magazines set to %d\n", max_magazines);
}
}
-
- flag = getenv("MallocLargeExpandedCacheThreshold");
- if (flag) {
- uint64_t value = (uint64_t)strtoull(flag, NULL, 0);
- if (value == 0) {
- malloc_report(ASL_LEVEL_INFO, "Large expanded cache threshold defaulted to %lly\n", magazine_large_expanded_cache_threshold);
- } else if (value < 0) {
- malloc_report(ASL_LEVEL_ERR, "MallocLargeExpandedCacheThreshold must be positive - ignored.\n");
- } else {
- magazine_large_expanded_cache_threshold = value;
- malloc_report(ASL_LEVEL_INFO, "Large expanded cache threshold set to %lly\n", magazine_large_expanded_cache_threshold);
- }
- }
-
- flag = getenv("MallocLargeDisableASLR");
- if (flag) {
- uint64_t value = (uint64_t)strtoull(flag, NULL, 0);
- if (value == 0) {
- malloc_report(ASL_LEVEL_INFO, "Enabling ASLR slide on large allocations\n");
- malloc_debug_flags &= ~DISABLE_LARGE_ASLR;
- } else if (value != 0) {
- malloc_report(ASL_LEVEL_INFO, "Disabling ASLR slide on large allocations\n");
- malloc_debug_flags |= DISABLE_LARGE_ASLR;
- }
- }
-
-#if CONFIG_AGGRESSIVE_MADVISE || CONFIG_LARGE_CACHE
- // convenience flag to configure policies usually associated with memory-constrained platforms (iOS)
- // that trade some amount of time efficiency for space efficiency
- flag = getenv("MallocSpaceEfficient");
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
-#if CONFIG_AGGRESSIVE_MADVISE
- aggressive_madvise_enabled = (value == 1);
-#endif // CONFIG_AGGRESSIVE_MADVISE
-#if CONFIG_LARGE_CACHE
- // Disable the large cache in space efficient mode
- if (value != 0){
- large_cache_enabled = 0;
- }
-#endif // CONFIG_LARGE_CACHE
- malloc_space_efficient_enabled = (value == 1);
- // consider disabling medium magazine if aggressive madvise is not sufficient
- } else {
- malloc_report(ASL_LEVEL_ERR, "MallocSpaceEfficient must be 0 or 1.\n");
- }
- }
-#endif // CONFIG_AGGRESSIVE_MADVISE || CONFIG_LARGE_CACHE
-
-#if CONFIG_MEDIUM_ALLOCATOR
- flag = getenv("MallocMediumZone");
- if (flag) {
- 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("MallocMediumSpaceEfficient");
- if (flag) {
- uint64_t value = (uint64_t)strtoull(flag, NULL, 0);
- if (value == 0) {
- malloc_medium_space_efficient_enabled = false;
- } else if (value == 1) {
- malloc_medium_space_efficient_enabled = true;
- }
- }
-
- if (malloc_medium_space_efficient_enabled && malloc_space_efficient_enabled) {
- // Bring down MallocMaxMediumMagazines to only a single magazine in
- // space-efficent processes but do this before the envvar so that it
- // can still be overridden at the command line.
- max_medium_magazines = 1;
- }
-
- flag = getenv("MallocMaxMediumMagazines");
-#if RDAR_48993662
- if (!flag) {
- flag = getenv("_MallocMaxMediumMagazines");
- }
-#endif // RDAR_48993662
- 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, "Maximum medium magazines 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_AGGRESSIVE_MADVISE
- flag = getenv("MallocAggressiveMadvise");
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
- aggressive_madvise_enabled = (value == 1);
- } else {
- malloc_report(ASL_LEVEL_ERR, "MallocAggressiveMadvise must be 0 or 1.\n");
- }
- }
-#endif // CONFIG_AGGRESSIVE_MADVISE
-
-#if CONFIG_LARGE_CACHE
- flag = getenv("MallocLargeCache");
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
- large_cache_enabled = (value == 1);
- } else {
- malloc_report(ASL_LEVEL_ERR, "MallocLargeCache must be 0 or 1.\n");
- }
- }
-#endif // CONFIG_LARGE_CACHE
-
#if CONFIG_RECIRC_DEPOT
flag = getenv("MallocRecircRetainedRegions");
if (flag) {
@@ -1845,63 +1268,6 @@
}
}
#endif // CONFIG_RECIRC_DEPOT
-
- flag = getenv("MallocZeroOnFree");
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
- malloc_zero_policy = value ? MALLOC_ZERO_ON_FREE : MALLOC_ZERO_NONE;
- } else {
- malloc_report(ASL_LEVEL_ERR, "MallocZeroOnFree must be 0 or 1.\n");
- }
- }
-
- flag = getenv("MallocZeroOnAlloc");
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
- malloc_zero_policy = value ? MALLOC_ZERO_ON_ALLOC : MALLOC_ZERO_NONE;
- } else {
- malloc_report(ASL_LEVEL_ERR, "MallocZeroOnAlloc must be 0 or 1.\n");
- }
- }
-
- flag = getenv("MallocCheckZeroOnFreeCorruption");
- if (flag) {
- int value = (int)strtol(flag, NULL, 0);
- if (value > 0) {
- malloc_zero_on_free_sample_period = value;
- } else {
- malloc_report(ASL_LEVEL_ERR,
- "malloc_zero_on_free_sample_period must be positive - ignored.\n");
- }
- }
-
- flag = getenv("MallocSecureAllocator");
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
- malloc_xzone_enabled = value;
- } else {
- malloc_report(ASL_LEVEL_ERR, "MallocSecureAllocator must be 0 or 1.\n");
- }
- }
-
- flag = getenv("MallocSecureAllocatorNano");
- if (flag) {
- const char *endp;
- long value = malloc_common_convert_to_long(flag, &endp);
- if (!*endp && endp != flag && (value == 0 || value == 1)) {
- malloc_xzone_nano_override = value ? MALLOC_XZONE_NANO_ENABLED :
- MALLOC_XZONE_NANO_DISABLED;
- } else {
- malloc_report(ASL_LEVEL_ERR, "MallocSecureAllocatorNano must be 0 or 1.\n");
- }
- }
-
if (getenv("MallocHelp")) {
malloc_report(ASL_LEVEL_INFO,
"environment variables that can be set for debug:\n"
@@ -1922,12 +1288,9 @@
" 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"\
- "- MallocZeroOnFree to enable or disable zero-on-free behavior (for debugging only)\n"\
- "- MallocCheckZeroOnFreeCorruption to enable zero-on-free corruption detection\n"\
"- MallocHelp - this help!\n");
}
}
-
malloc_zone_t *
malloc_create_zone(vm_size_t start_size, unsigned flags)
@@ -1935,19 +1298,12 @@
malloc_zone_t *zone;
/* start_size doesn't actually appear to be used, but we test anyway. */
- if (start_size > malloc_absolute_max_size) {
+ if (start_size > MALLOC_ABSOLUTE_MAX_SIZE) {
return NULL;
}
-
+ _malloc_initialize_once();
zone = create_scalable_zone(start_size, flags | malloc_debug_flags);
malloc_zone_register(zone);
-
-#if CONFIG_PGM_WRAP_CUSTOM_ZONES
- if (enable_pgm()) {
- zone = pgm_create_zone(zone);
- malloc_zone_register(zone);
- }
-#endif
return zone;
}
@@ -1959,10 +1315,13 @@
malloc_create_legacy_default_zone(void)
{
malloc_zone_t *zone;
-
+ int i;
+
+ _malloc_initialize_once();
zone = create_legacy_scalable_zone(0, malloc_debug_flags);
MALLOC_LOCK();
+ malloc_zone_register_while_locked(zone);
//
// Establish the legacy scalable zone just created as the default zone.
@@ -1973,7 +1332,16 @@
}
malloc_set_zone_name(zone, DEFAULT_MALLOC_ZONE_STRING);
- malloc_zone_register_while_locked(zone, /*make_default=*/true);
+ unsigned protect_size = malloc_num_zones_allocated * sizeof(malloc_zone_t *);
+ mprotect(malloc_zones, protect_size, PROT_READ | PROT_WRITE);
+
+ // assert(zone == malloc_zones[malloc_num_zones - 1];
+ for (i = malloc_num_zones - 1; i > 0; --i) {
+ malloc_zones[i] = malloc_zones[i - 1];
+ }
+ malloc_zones[0] = zone;
+
+ mprotect(malloc_zones, protect_size, PROT_READ);
MALLOC_UNLOCK();
}
@@ -2058,13 +1426,9 @@
/********* Block creation and manipulation ************/
-__attribute__((cold, noinline))
static void
internal_check(void)
{
- if (malloc_check_counter++ < malloc_check_start) {
- return;
- }
if (malloc_zone_check(NULL)) {
if (!frames) {
vm_allocate(mach_task_self(), (void *)&frames, vm_page_size, 1);
@@ -2074,307 +1438,106 @@
malloc_check_start += malloc_check_each;
}
-MALLOC_NOINLINE
-static void *
-_malloc_zone_malloc_instrumented_or_legacy(malloc_zone_t *zone, size_t size,
- malloc_zone_options_t mzo)
-{
- uint64_t type_id = malloc_get_tsd_type_id();
-#if MALLOC_TARGET_64BIT
- bool clear_type = false;
- if (!type_id) {
- malloc_type_descriptor_t fallback =
- malloc_callsite_fallback_type_descriptor();
- malloc_set_tsd_type_descriptor(fallback);
- type_id = fallback.type_id;
- clear_type = true;
- }
-#endif // MALLOC_TARGET_64BIT
- MALLOC_TRACE(TRACE_malloc | DBG_FUNC_START, (uintptr_t)zone, size, type_id,
- 0);
-
- void *ptr = NULL;
-
- if (malloc_check_start) {
- internal_check();
- }
- if (size > malloc_absolute_max_size) {
- goto out;
- }
-
- ptr = zone->malloc(zone, size);
-
- if (os_unlikely(malloc_logger)) {
- malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE,
- (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)ptr, 0);
- }
-
- if (os_unlikely(malloc_simple_stack_logging)) {
- malloc_report(MALLOC_SIMPLE_STACK_LOGGING_FLAGS, "malloc (%p/%llu): ",
- ptr, (unsigned long long)size);
- }
-
- MALLOC_TRACE(TRACE_malloc | DBG_FUNC_END, (uintptr_t)zone, size,
- (uintptr_t)ptr, type_id);
-out:
-#if MALLOC_TARGET_64BIT
- if (clear_type) {
- malloc_set_tsd_type_descriptor(MALLOC_TYPE_DESCRIPTOR_NONE);
- }
-#endif // MALLOC_TARGET_64BIT
- if (os_unlikely(ptr == NULL)) {
- malloc_set_errno_fast(mzo, ENOMEM);
- }
- return ptr;
-}
-
-void *
-_malloc_zone_malloc(malloc_zone_t *zone, size_t size, malloc_zone_options_t mzo)
-{
- if (zone == default_zone && !lite_zone) {
- // Eagerly resolve the virtual default zone to make the zone version
- // check accurate
- zone = malloc_zones[0];
- }
-
- if (os_unlikely(malloc_slowpath || malloc_logger || zone->version < 13)) {
- return _malloc_zone_malloc_instrumented_or_legacy(zone, size, mzo);
- }
-
- if (os_unlikely(size > malloc_absolute_max_size)) {
- malloc_set_errno_fast(mzo, ENOMEM);
- return NULL;
- }
-
-
- // zone versions >= 13 set errno on failure so we can tail-call
- return zone->malloc(zone, size);
-}
-
-MALLOC_NOINLINE
void *
malloc_zone_malloc(malloc_zone_t *zone, size_t size)
{
- return _malloc_zone_malloc(zone, size, MZ_NONE);
-}
-
-MALLOC_NOINLINE
-static void *
-_malloc_zone_calloc_instrumented_or_legacy(malloc_zone_t *zone,
- size_t num_items, size_t size, malloc_zone_options_t mzo)
-{
- uint64_t type_id = malloc_get_tsd_type_id();
-#if MALLOC_TARGET_64BIT
- bool clear_type = false;
- if (!type_id) {
- malloc_type_descriptor_t fallback =
- malloc_callsite_fallback_type_descriptor();
- malloc_set_tsd_type_descriptor(fallback);
- type_id = fallback.type_id;
- clear_type = true;
- }
-#endif // MALLOC_TARGET_64BIT
- MALLOC_TRACE(TRACE_calloc | DBG_FUNC_START, (uintptr_t)zone, num_items,
- size, type_id);
+ MALLOC_TRACE(TRACE_malloc | DBG_FUNC_START, (uintptr_t)zone, size, 0, 0);
void *ptr;
- if (malloc_check_start) {
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
-
- ptr = zone->calloc(zone, num_items, size);
-
- if (os_unlikely(malloc_logger)) {
- uint32_t logger_type = MALLOC_LOG_TYPE_ALLOCATE |
- MALLOC_LOG_TYPE_HAS_ZONE | MALLOC_LOG_TYPE_CLEARED;
- malloc_logger(logger_type, (uintptr_t)zone,
- (uintptr_t)(num_items * size), 0, (uintptr_t)ptr, 0);
- }
-
- if (os_unlikely(malloc_simple_stack_logging)) {
- malloc_report(MALLOC_SIMPLE_STACK_LOGGING_FLAGS,
- "calloc (%p/%llu*%llu): ", ptr, (unsigned long long)num_items,
- (unsigned long long)size);
- }
-
- MALLOC_TRACE(TRACE_calloc | DBG_FUNC_END, (uintptr_t)zone, num_items, size,
- (uintptr_t)ptr);
-#if MALLOC_TARGET_64BIT
- if (clear_type) {
- malloc_set_tsd_type_descriptor(MALLOC_TYPE_DESCRIPTOR_NONE);
- }
-#endif // MALLOC_TARGET_64BIT
- if (os_unlikely(ptr == NULL)) {
- malloc_set_errno_fast(mzo, ENOMEM);
- }
+ if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
+ return NULL;
+ }
+
+ ptr = zone->malloc(zone, size); // if lite zone is passed in then we still call the lite methods
+
+
+ if (malloc_logger) {
+ malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)ptr, 0);
+ }
+
+ MALLOC_TRACE(TRACE_malloc | DBG_FUNC_END, (uintptr_t)zone, size, (uintptr_t)ptr, 0);
return ptr;
}
-MALLOC_NOINLINE
-void *
-_malloc_zone_calloc(malloc_zone_t *zone, size_t num_items, size_t size,
- malloc_zone_options_t mzo)
-{
- if (zone == default_zone && !lite_zone) {
- // Eagerly resolve the virtual default zone to make the zone version
- // check accurate
- zone = malloc_zones[0];
- }
-
- if (os_unlikely(malloc_slowpath || malloc_logger || zone->version < 13)) {
- return _malloc_zone_calloc_instrumented_or_legacy(zone, num_items, size, mzo);
- }
-
-
- // zone versions >= 13 set errno on failure so we can tail-call
- return zone->calloc(zone, num_items, size);
-}
-
-MALLOC_NOINLINE
void *
malloc_zone_calloc(malloc_zone_t *zone, size_t num_items, size_t size)
{
- return _malloc_zone_calloc(zone, num_items, size, MZ_NONE);
-}
-
-MALLOC_NOINLINE
-void *
-_malloc_zone_valloc(malloc_zone_t *zone, size_t size, malloc_zone_options_t mzo)
-{
- uint64_t type_id = malloc_get_tsd_type_id();
-#if MALLOC_TARGET_64BIT
- bool clear_type = false;
- if (!type_id) {
- malloc_type_descriptor_t fallback =
- malloc_callsite_fallback_type_descriptor();
- malloc_set_tsd_type_descriptor(fallback);
- type_id = fallback.type_id;
- clear_type = true;
- }
-#endif // MALLOC_TARGET_64BIT
- MALLOC_TRACE(TRACE_valloc | DBG_FUNC_START, (uintptr_t)zone, size, type_id,
- 0);
-
- void *ptr = NULL;
- if (malloc_check_start) {
+ MALLOC_TRACE(TRACE_calloc | DBG_FUNC_START, (uintptr_t)zone, num_items, size, 0);
+
+ void *ptr;
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
- if (size > malloc_absolute_max_size) {
- goto out;
- }
-
- ptr = zone->valloc(zone, size);
-
- if (os_unlikely(malloc_logger)) {
- malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE,
- (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)ptr, 0);
- }
-
- if (os_unlikely(malloc_simple_stack_logging)) {
- malloc_report(MALLOC_SIMPLE_STACK_LOGGING_FLAGS, "valloc (%p/%llu): ",
- ptr, (unsigned long long)size);
- }
-
- MALLOC_TRACE(TRACE_valloc | DBG_FUNC_END, (uintptr_t)zone, size,
- (uintptr_t)ptr, type_id);
-out:
-#if MALLOC_TARGET_64BIT
- if (clear_type) {
- malloc_set_tsd_type_descriptor(MALLOC_TYPE_DESCRIPTOR_NONE);
- }
-#endif // MALLOC_TARGET_64BIT
-
- if (os_unlikely(ptr == NULL)) {
- malloc_set_errno_fast(mzo, ENOMEM);
- }
+
+ 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);
return ptr;
}
-MALLOC_NOINLINE
void *
malloc_zone_valloc(malloc_zone_t *zone, size_t size)
{
- return _malloc_zone_valloc(zone, size, MZ_NONE);
-}
-
-// We have this function so code within libmalloc can call it without going
-// through the (potentially interposed) dyld symbol stub
+ MALLOC_TRACE(TRACE_valloc | DBG_FUNC_START, (uintptr_t)zone, size, 0, 0);
+
+ void *ptr;
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
+ internal_check();
+ }
+ if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
+ return NULL;
+ }
+
+ ptr = zone->valloc(zone, size);
+
+ if (malloc_logger) {
+ malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)ptr, 0);
+ }
+
+ MALLOC_TRACE(TRACE_valloc | DBG_FUNC_END, (uintptr_t)zone, size, (uintptr_t)ptr, 0);
+ return ptr;
+}
+
void *
-_malloc_zone_realloc(malloc_zone_t *zone, void * __unsafe_indexable ptr,
- size_t size, malloc_type_descriptor_t type_desc)
-{
- uint64_t type_id = malloc_get_tsd_type_id();
-#if MALLOC_TARGET_64BIT
- bool clear_type = false;
- if (!type_id) {
- // A type descriptor in the TSD takes precendence over one passed as a
- // parameter - the one in the TSD will be a real one set by e.g.
- // _malloc_type_realloc_outlined(), whereas the parameter will be a
- // callsite-derived fallback
- malloc_set_tsd_type_descriptor(type_desc);
- type_id = type_desc.type_id;
- clear_type = true;
- }
-#endif // MALLOC_TARGET_64BIT
- MALLOC_TRACE(TRACE_realloc | DBG_FUNC_START, (uintptr_t)zone,
- (uintptr_t)ptr, size, type_id);
-
- void *new_ptr = NULL;
- if (malloc_check_start) {
+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;
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
- if (size > malloc_absolute_max_size) {
- goto out;
+ if (size > MALLOC_ABSOLUTE_MAX_SIZE) {
+ return NULL;
}
new_ptr = zone->realloc(zone, ptr, size);
- if (os_unlikely(malloc_logger)) {
- uint32_t logger_type = MALLOC_LOG_TYPE_ALLOCATE |
- MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE;
- malloc_logger(logger_type, (uintptr_t)zone, (uintptr_t)ptr,
- (uintptr_t)size, (uintptr_t)new_ptr, 0);
- }
-
- if (os_unlikely(malloc_simple_stack_logging)) {
- malloc_report(MALLOC_SIMPLE_STACK_LOGGING_FLAGS,
- "realloc (%p->%p/%llu): ", ptr, new_ptr,
- (unsigned long long)size);
- }
-
- MALLOC_TRACE(TRACE_realloc | DBG_FUNC_END, (uintptr_t)zone, (uintptr_t)ptr,
- size, (uintptr_t)new_ptr);
-out:
-#if MALLOC_TARGET_64BIT
- if (clear_type) {
- malloc_set_tsd_type_descriptor(MALLOC_TYPE_DESCRIPTOR_NONE);
- }
-#endif // MALLOC_TARGET_64BIT
+ 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);
return new_ptr;
}
-MALLOC_NOINLINE
-void *
-malloc_zone_realloc(malloc_zone_t *zone, void * __unsafe_indexable ptr,
- size_t size)
-{
- return _malloc_zone_realloc(zone, ptr, size,
- malloc_callsite_fallback_type_descriptor());
-}
-
-MALLOC_NOINLINE
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 (os_unlikely(malloc_logger)) {
+ if (malloc_logger) {
malloc_logger(MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)ptr, 0, 0, 0);
}
- if (os_unlikely(malloc_simple_stack_logging)) {
- malloc_report(MALLOC_SIMPLE_STACK_LOGGING_FLAGS, "malloc_zone_free (%p): ", ptr);
- }
- if (malloc_check_start) {
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
@@ -2386,14 +1549,10 @@
{
MALLOC_TRACE(TRACE_free, (uintptr_t)zone, (uintptr_t)ptr, size, (ptr && size) ? *(uintptr_t*)ptr : 0);
- if (os_unlikely(malloc_logger)) {
+ if (malloc_logger) {
malloc_logger(MALLOC_LOG_TYPE_DEALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)ptr, 0, 0, 0);
}
- if (os_unlikely(malloc_simple_stack_logging)) {
- malloc_report(MALLOC_SIMPLE_STACK_LOGGING_FLAGS, "free (%p/%llu): ",
- ptr, (unsigned long long)size);
- }
- if (malloc_check_start) {
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
@@ -2406,96 +1565,41 @@
if (!ptr) {
return NULL;
} else {
- return find_registered_zone(ptr, NULL, false);
- }
-}
-
-MALLOC_NOINLINE
-void *
-_malloc_zone_memalign(malloc_zone_t *zone, size_t alignment, size_t size,
- malloc_zone_options_t mzo, malloc_type_descriptor_t type_desc)
-{
- uint64_t type_id = malloc_get_tsd_type_id();
-#if MALLOC_TARGET_64BIT
- bool clear_type = false;
- if (!type_id) {
- // A type descriptor in the TSD takes precendence over one passed as a
- // parameter - the one in the TSD will be a real one set by e.g.
- // _malloc_type_aligned_alloc_outlined(), whereas the parameter will
- // usually be a callsite-derived fallback
- malloc_set_tsd_type_descriptor(type_desc);
- type_id = type_desc.type_id;
- clear_type = true;
- }
-#endif // MALLOC_TARGET_64BIT
- MALLOC_TRACE(TRACE_memalign | DBG_FUNC_START, (uintptr_t)zone, alignment,
- size, type_id);
-
- void *ptr = NULL;
- int err = ENOMEM;
- // Version must be >= 5 to look at the new memalign field.
- if (zone->version < 5) {
- goto out;
- }
- if (malloc_check_start) {
- internal_check();
- }
- if (size > malloc_absolute_max_size) {
- goto out;
- }
- // excludes 0 == alignment
- // relies on sizeof(void *) being a power of two.
- if (alignment < sizeof(void *) ||
- 0 != (alignment & (alignment - 1))) {
- err = EINVAL;
- goto out;
- }
- // C11 aligned_alloc requires size to be a multiple of alignment, but
- // posix_memalign does not
- if ((mzo & MZ_C11) && (size & (alignment - 1)) != 0) {
- err = EINVAL;
- goto out;
- }
-
- if (!(zone->memalign)) {
- goto out;
- }
- ptr = zone->memalign(zone, alignment, size);
-
- if (os_unlikely(malloc_logger)) {
- malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE,
- (uintptr_t)zone, (uintptr_t)size, 0, (uintptr_t)ptr, 0);
- }
- if (os_unlikely(malloc_simple_stack_logging)) {
- malloc_report(MALLOC_SIMPLE_STACK_LOGGING_FLAGS,
- "memalign (%p/%llu,%llu): ", ptr, (unsigned long long)alignment,
- (unsigned long long)size);
- }
-
- MALLOC_TRACE(TRACE_memalign | DBG_FUNC_END, (uintptr_t)zone, alignment,
- size, (uintptr_t)ptr);
-
-out:
-#if MALLOC_TARGET_64BIT
- if (clear_type) {
- malloc_set_tsd_type_descriptor(MALLOC_TYPE_DESCRIPTOR_NONE);
- }
-#endif // MALLOC_TARGET_64BIT
-
- if (os_unlikely(ptr == NULL)) {
- if (mzo & MZ_POSIX) {
- malloc_set_errno_fast(mzo, err);
- }
- }
- return ptr;
-}
-
-MALLOC_NOINLINE
+ return find_registered_zone(ptr, NULL);
+ }
+}
+
void *
malloc_zone_memalign(malloc_zone_t *zone, size_t alignment, size_t size)
{
- return _malloc_zone_memalign(zone, alignment, size, MZ_NONE,
- malloc_callsite_fallback_type_descriptor());
+ 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.
+ 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.
+ return NULL;
+ }
+
+ if (!(zone->memalign)) {
+ return NULL;
+ }
+ ptr = zone->memalign(zone, alignment, 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_memalign | DBG_FUNC_END, (uintptr_t)zone, alignment, size, (uintptr_t)ptr);
+ return ptr;
}
boolean_t
@@ -2506,7 +1610,7 @@
return false;
}
- if (malloc_check_start) {
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
@@ -2525,7 +1629,7 @@
malloc_zone_register(malloc_zone_t *zone)
{
MALLOC_LOCK();
- malloc_zone_register_while_locked(zone, false);
+ malloc_zone_register_while_locked(zone);
MALLOC_UNLOCK();
}
@@ -2557,12 +1661,8 @@
mprotect(malloc_zones, protect_size, PROT_READ);
- // MAX(num_zones, 1) retains the fast path in find_registered_zone() for zone 0 even
- // if it is a custom zone, e.g., ASan and user zones.
- initial_num_zones = MAX(MIN(malloc_num_zones, initial_num_zones), 1);
-
// Exchange the roles of the FRZ counters. The counter that has captured the number of threads presently
- // executing *inside* find_registered_zone is swapped with the counter drained to zero last time through.
+ // 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;
pFRZCounterLive = pFRZCounterDrain;
@@ -2584,54 +1684,24 @@
void
malloc_set_zone_name(malloc_zone_t *z, const char *name)
{
- // TODO: save and restore permissions generally
- if (z != initial_xzone_zone) {
- mprotect(z, sizeof(malloc_zone_t), PROT_READ | PROT_WRITE);
- }
+ char *newName;
+
+ mprotect(z, sizeof(malloc_zone_t), PROT_READ | PROT_WRITE);
if (z->zone_name) {
- malloc_zone_t *old_zone = find_registered_zone(z->zone_name, NULL, false);
- if (old_zone) {
- malloc_zone_free(old_zone, (char *)z->zone_name);
- }
+ free((char *)z->zone_name);
z->zone_name = NULL;
}
if (name) {
size_t buflen = strlen(name) + 1;
- if (_dyld_is_memory_immutable(name, buflen)) {
- z->zone_name = name;
+ newName = malloc_zone_malloc(z, buflen);
+ if (newName) {
+ strlcpy(newName, name, buflen);
+ z->zone_name = (const char *)newName;
} else {
- char *name_copy = _malloc_zone_malloc(z, buflen, MZ_NONE);
- if (name_copy) {
- strcpy(name_copy, name);
- z->zone_name = name_copy;
- }
- }
-
- malloc_zone_t *wrapped_zone = get_wrapped_zone(z);
- if (wrapped_zone) {
- // <name>-<wrapper_label>-<suffix>\0 // Wrapped zone name format
- // ^ ^ ^ // 2 dashes and \0 -> +3
- const char *wrapper_label = get_wrapper_zone_label(z);
- const char *suffix = "Wrapped";
- size_t buflen = strlen(name) + strlen(wrapper_label) + strlen(suffix) + 3;
- char *wz_name = _malloc_zone_malloc(wrapped_zone, buflen, MZ_NONE);
- if (wz_name) {
- // snprintf() may allocate (not safe to use from libmalloc) and
- // _simple_sprintf()/_simple_salloc() call vm_allocate() which is
- // undesirable for such a simple API as malloc_set_zone_name()
- strcpy(wz_name, name);
- strcat(wz_name, "-");
- strcat(wz_name, wrapper_label);
- strcat(wz_name, "-");
- strcat(wz_name, suffix);
- malloc_set_zone_name(wrapped_zone, wz_name);
- malloc_zone_free(wrapped_zone, wz_name);
- }
- }
- }
- if (z != initial_xzone_zone) {
- mprotect(z, sizeof(malloc_zone_t), PROT_READ);
- }
+ z->zone_name = NULL;
+ }
+ }
+ mprotect(z, sizeof(malloc_zone_t), PROT_READ);
}
const char *
@@ -2640,8 +1710,33 @@
return zone->zone_name;
}
-void
-find_zone_and_free(void *ptr, bool known_non_default)
+
+/********* Generic ANSI callouts ************/
+
+void *
+malloc(size_t size)
+{
+ void *retval;
+ retval = malloc_zone_malloc(default_zone, size);
+ if (retval == NULL) {
+ errno = ENOMEM;
+ }
+ return retval;
+}
+
+void *
+calloc(size_t num_items, size_t size)
+{
+ void *retval;
+ retval = malloc_zone_calloc(default_zone, num_items, size);
+ if (retval == NULL) {
+ errno = ENOMEM;
+ }
+ return retval;
+}
+
+void
+free(void *ptr)
{
malloc_zone_t *zone;
size_t size;
@@ -2649,7 +1744,7 @@
return;
}
- zone = find_registered_zone(ptr, &size, known_non_default);
+ 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))) {
@@ -2664,69 +1759,11 @@
}
}
-
-/********* Generic ANSI callouts ************/
-
-MALLOC_NOINLINE
void *
-malloc(size_t size)
-{
- return _malloc_zone_malloc(default_zone, size, MZ_POSIX);
-}
-
-MALLOC_NOINLINE
-void *
-aligned_alloc(size_t alignment, size_t size)
-{
- return _malloc_zone_memalign(default_zone, alignment, size,
- MZ_POSIX | MZ_C11, malloc_callsite_fallback_type_descriptor());
-}
-
-MALLOC_NOINLINE
-void *
-calloc(size_t num_items, size_t size)
-{
- return _malloc_zone_calloc(default_zone, num_items, size, MZ_POSIX);
-}
-
-// We have this function so code within libmalloc can call it without going
-// through the (potentially interposed) dyld symbol stub
-void
-_free(void *ptr)
-{
- if (!ptr) {
- return;
- }
-
- malloc_zone_t *zone0 = malloc_zones[0];
- if (os_unlikely(malloc_slowpath ||
- malloc_logger ||
- zone0->version < 13)) {
- find_zone_and_free(ptr, false);
- return;
- }
-
-
- if (zone0->try_free_default) {
- zone0->try_free_default(zone0, ptr);
- } else {
- find_zone_and_free(ptr, false);
- }
-}
-
-MALLOC_NOINLINE
-void
-free(void *ptr)
-{
- return _free(ptr);
-}
-
-// We have this function so code within libmalloc can call it without going
-// through the (potentially interposed) dyld symbol stub
-void *
-_realloc(void *in_ptr, size_t new_size)
+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
@@ -2737,74 +1774,46 @@
// malloc_zone_malloc with zero size, which matches "If ptr is a null
// pointer, realloc() shall be equivalent to malloc() for the specified
// size." So we only free the original memory if the allocation succeeds.
- //
- // When in_ptr is NULL, we want to ensure that the fallback type descriptor
- // is good. We can ensure that by tail-calling from here, so that the
- // callsite information is accurate.
- //
- // We don't really care about the quality of the type descriptor
- // for the new_size == 0 allocation, so it's fine for it to always be based
- // on the callsite in this function.
- if (!in_ptr) {
- return _malloc_zone_malloc(default_zone, new_size, MZ_POSIX);
+ old_ptr = (new_size == 0) ? NULL : in_ptr;
+ if (!old_ptr) {
+ retval = malloc_zone_malloc(default_zone, new_size);
+ } else {
+ zone = find_registered_zone(old_ptr, NULL);
+ if (!zone) {
+ int flags = MALLOC_REPORT_DEBUG;
+ if (malloc_debug_flags & (MALLOC_ABORT_ON_CORRUPTION | MALLOC_ABORT_ON_ERROR)) {
+ flags = MALLOC_REPORT_CRASH;
+ }
+ 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) {
- retval = _malloc_zone_malloc(default_zone, new_size, MZ_NONE);
- } else {
- zone = find_registered_zone(in_ptr, NULL, false);
- if (!zone) {
- int flags = MALLOC_REPORT_DEBUG | MALLOC_REPORT_NOLOG;
- const int abort_flags =
- (MALLOC_ABORT_ON_CORRUPTION | MALLOC_ABORT_ON_ERROR);
- if (malloc_debug_flags & abort_flags) {
- flags = MALLOC_REPORT_CRASH | MALLOC_REPORT_NOLOG;
- }
- malloc_report(flags, "*** error for object %p: "
- "pointer being realloc'd was not allocated\n", in_ptr);
- } else {
- retval = _malloc_zone_realloc(zone, in_ptr, new_size,
- malloc_callsite_fallback_type_descriptor());
- }
- }
-
- if (retval == NULL) {
- malloc_set_errno_fast(MZ_POSIX, ENOMEM);
- } else if (new_size == 0) {
- _free(in_ptr);
+ free(in_ptr);
}
return retval;
}
-MALLOC_NOINLINE
-void *
-realloc(void *in_ptr, size_t new_size)
-{
- return _realloc(in_ptr, new_size);
-}
-
-MALLOC_NOINLINE
-void *
-reallocf(void *in_ptr, size_t new_size)
-{
- void *ptr = realloc(in_ptr, new_size);
-
- if (!ptr && in_ptr && new_size != 0) {
- free(in_ptr);
- }
-
- return ptr;
-}
-
-MALLOC_NOINLINE
void *
valloc(size_t size)
{
- return _malloc_zone_valloc(default_zone, size, MZ_POSIX);
+ void *retval;
+ malloc_zone_t *zone = default_zone;
+ retval = malloc_zone_valloc(zone, size);
+ if (retval == NULL) {
+ errno = ENOMEM;
+ }
+ return retval;
}
extern void
vfree(void *ptr)
{
- _free(ptr);
+ free(ptr);
}
size_t
@@ -2816,7 +1825,7 @@
return size;
}
- (void)find_registered_zone(ptr, &size, false);
+ (void)find_registered_zone(ptr, &size);
return size;
}
@@ -2843,17 +1852,14 @@
* There is insufficient memory available with the requested alignment.
*/
-// We have this function so code within libmalloc can call it without going
-// through the (potentially interposed) dyld symbol stub
int
-_posix_memalign(void **memptr, size_t alignment, size_t size)
+posix_memalign(void **memptr, size_t alignment, size_t size)
{
void *retval;
/* POSIX is silent on NULL == memptr !?! */
- retval = _malloc_zone_memalign(default_zone, alignment, size, MZ_NONE,
- malloc_callsite_fallback_type_descriptor());
+ retval = malloc_zone_memalign(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
@@ -2870,13 +1876,6 @@
}
}
-MALLOC_NOINLINE
-int
-posix_memalign(void **memptr, size_t alignment, size_t size)
-{
- return _posix_memalign(memptr, alignment, size);
-}
-
boolean_t
malloc_claimed_address(void *ptr)
{
@@ -2891,11 +1890,9 @@
return true;
}
- // Next, try the initial zones.
- for (uint32_t i = 0; i < initial_num_zones; i++) {
- if (malloc_zone_claimed_address(malloc_zones[i], ptr)) {
- return true;
- }
+ // Next, try the default zone, which is always present.
+ if (malloc_zone_claimed_address(malloc_zones[0], ptr)) {
+ return true;
}
// Try all the other zones. Increment the FRZ barrier so that we can
@@ -2905,9 +1902,10 @@
OSAtomicIncrement32Barrier(pFRZCounter);
int32_t limit = *(int32_t volatile *)&malloc_num_zones;
+ malloc_zone_t **zones = &malloc_zones[1];
boolean_t result = false;
- for (uint32_t i = initial_num_zones; i < limit; i++) {
- malloc_zone_t *zone = malloc_zones[i];
+ for (unsigned index = 1; index < limit; ++index, ++zones) {
+ malloc_zone_t *zone = *zones;
if (malloc_zone_claimed_address(zone, ptr)) {
result = true;
break;
@@ -2922,7 +1920,7 @@
reallocarray(void * in_ptr, size_t nmemb, size_t size){
size_t alloc_size;
if (os_mul_overflow(nmemb, size, &alloc_size)){
- malloc_set_errno_fast(MZ_POSIX, ENOMEM);
+ errno = ENOMEM;
return NULL;
}
return realloc(in_ptr, alloc_size);
@@ -2932,135 +1930,10 @@
reallocarrayf(void * in_ptr, size_t nmemb, size_t size){
size_t alloc_size;
if (os_mul_overflow(nmemb, size, &alloc_size)){
- malloc_set_errno_fast(MZ_POSIX, ENOMEM);
+ errno = ENOMEM;
return NULL;
}
return reallocf(in_ptr, alloc_size);
-}
-
-void *
-_malloc_zone_malloc_with_options_np_outlined(malloc_zone_t *zone, size_t align,
- size_t size, malloc_options_np_t options)
-{
- void *ptr = NULL;
-
- if (zone == NULL || zone == default_zone) {
- zone = runtime_default_zone();
- }
-
- uint64_t type_id = malloc_get_tsd_type_id();
-#if MALLOC_TARGET_64BIT
- bool clear_type = false;
- if (!type_id) {
- malloc_type_descriptor_t fallback =
- malloc_callsite_fallback_type_descriptor();
- malloc_set_tsd_type_descriptor(fallback);
- type_id = fallback.type_id;
- clear_type = true;
- }
-#endif // MALLOC_TARGET_64BIT
-
- if (malloc_interposition_compat || (zone->version < 15)) {
- // There's no reasonable way to have the fallback callsite type
- // descriptor work here. That's okay, as it's uncommon and SPI, so its
- // callers should be built with TMO.
- if (align) {
- ptr = malloc_zone_memalign(zone, align, size);
- if (ptr && (options & MALLOC_NP_OPTION_CLEAR)) {
- memset(ptr, 0, size);
- }
- } else if (options & MALLOC_NP_OPTION_CLEAR) {
- ptr = malloc_zone_calloc(zone, 1, size);
- } else {
- ptr = malloc_zone_malloc(zone, size);
- }
- } else {
- MALLOC_TRACE(TRACE_malloc_options | DBG_FUNC_START, (uintptr_t)zone,
- align, size, 0);
- ptr = zone->malloc_with_options(zone, align, size, options);
-
- if (os_unlikely(malloc_logger)) {
- uint32_t flags = MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE;
- if (options & MALLOC_NP_OPTION_CLEAR) {
- flags |= MALLOC_LOG_TYPE_CLEARED;
- }
- malloc_logger(flags, (uintptr_t)zone, (uintptr_t)size,
- 0, (uintptr_t)ptr, 0);
- }
- if (os_unlikely(malloc_simple_stack_logging)) {
- malloc_report(MALLOC_SIMPLE_STACK_LOGGING_FLAGS,
- "malloc_with_options (%p/%llu,%llu): ", ptr,
- (unsigned long long)align, (unsigned long long)size);
- }
- MALLOC_TRACE(TRACE_malloc_options | DBG_FUNC_END,
- (uintptr_t)zone, align, size, (uintptr_t)ptr);
- }
-
-#if MALLOC_TARGET_64BIT
- if (clear_type) {
- malloc_set_tsd_type_descriptor(MALLOC_TYPE_DESCRIPTOR_NONE);
- }
-#endif
-
- return ptr;
-}
-
-void *
-malloc_zone_malloc_with_options_np(malloc_zone_t *zone, size_t align,
- size_t size, malloc_options_np_t options)
-{
- if (os_unlikely((align != 0) && (!powerof2(align) ||
- ((size & (align-1)) != 0)))) { // equivalent to (size % align != 0)
- return NULL;
- }
-
- if (os_unlikely(malloc_logger || malloc_slowpath)) {
- return _malloc_zone_malloc_with_options_np_outlined(zone, align, size,
- options);
- }
-
- if (zone == NULL || zone == default_zone) {
- zone = malloc_zones[0];
- }
-
-
- return _malloc_zone_malloc_with_options_np_outlined(zone, align, size,
- options);
-}
-
-/********* Purgeable zone ************/
-
-static void
-_malloc_create_purgeable_zone(void * __unused ctx)
-{
- //
- // PR_7288598: Must pass a *scalable* zone (szone) as the helper for create_purgeable_zone().
- // Take care that the zone so obtained is not subject to interposing.
- //
- if (!initial_scalable_zone) {
- // If the process didn't initially create a scalable zone because xzone
- // malloc is enabled, we should create one now.
- //
- // TODO: xzone-backed purgeable zone
- initial_scalable_zone = create_scalable_zone(0, malloc_debug_flags);
- malloc_set_zone_name(initial_scalable_zone,
- DEFAULT_SCALABLE_ZONE_STRING);
- malloc_zone_register(initial_scalable_zone);
- }
-
- default_purgeable_zone = create_purgeable_zone(0, initial_scalable_zone,
- malloc_debug_flags);
- malloc_zone_register(default_purgeable_zone);
- malloc_set_zone_name(default_purgeable_zone,
- DEFAULT_PUREGEABLE_ZONE_STRING);
-}
-
-malloc_zone_t *
-malloc_default_purgeable_zone(void)
-{
- static os_once_t pred;
- os_once(&pred, NULL, _malloc_create_purgeable_zone);
- return default_purgeable_zone;
}
static malloc_zone_t *
@@ -3077,7 +1950,7 @@
* and only search those.
*/
size_t size = 0;
- malloc_zone_t *zone = find_registered_zone(ptr, &size, false);
+ malloc_zone_t *zone = find_registered_zone(ptr, &size);
/* FIXME: would really like a zone->introspect->flags->purgeable check, but haven't determined
* binary compatibility impact of changing the introspect struct yet. */
@@ -3126,38 +1999,177 @@
return 0;
}
-/********* Memory events ************/
-
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 CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_DEFERRED_RECLAIM)
- if (event & MALLOC_MEMORYSTATUS_MASK_PRESSURE_RELIEF) {
+ if (event & NOTE_MEMORYSTATUS_PRESSURE_WARN) {
malloc_zone_pressure_relief(0, 0);
}
-#endif /* CONFIG_MADVISE_PRESSURE_RELIEF || (CONFIG_LARGE_CACHE && !CONFIG_DEFERRED_RECLAIM) */
-
- if ((event & NOTE_MEMORYSTATUS_MSL_STATUS) != 0 && (event & ~NOTE_MEMORYSTATUS_MSL_STATUS) == 0) {
- malloc_register_stack_logger();
+
+ // 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 (event & MALLOC_MEMORYSTATUS_MASK_RESOURCE_EXCEPTION_HANDLING) {
- malloc_register_stack_logger();
- }
-#endif /* ENABLE_MEMORY_RESOURCE_EXCEPTION_HANDLING */
-
- if (msl.handle_memory_event) {
- // Let MSL see the event.
- msl.handle_memory_event(event);
- }
+ // 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
@@ -3207,12 +2219,12 @@
if (!zone->batch_malloc) {
return 0;
}
- if (malloc_check_start) {
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
unsigned batched = zone->batch_malloc(zone, size, results, num_requested);
- if (os_unlikely(malloc_logger)) {
+ if (malloc_logger) {
unsigned index = 0;
while (index < batched) {
malloc_logger(MALLOC_LOG_TYPE_ALLOCATE | MALLOC_LOG_TYPE_HAS_ZONE, (uintptr_t)zone, (uintptr_t)size, 0,
@@ -3226,10 +2238,10 @@
void
malloc_zone_batch_free(malloc_zone_t *zone, void **to_be_freed, unsigned num)
{
- if (malloc_check_start) {
+ if (malloc_check_start && (malloc_check_counter++ >= malloc_check_start)) {
internal_check();
}
- if (os_unlikely(malloc_logger)) {
+ if (malloc_logger) {
unsigned index = 0;
while (index < num) {
malloc_logger(
@@ -3250,86 +2262,14 @@
}
}
-/********* Functions for sanitization ************/
-
-#if TARGET_OS_OSX
-
-// Shadow memory helpers
-#define SHADOW_MEMORY_BASE (0x0000200000000000ull)
-#define SHADOW_GRANULARITY_BITS 3u
-#define SHADOW_GRANULARITY (1u << SHADOW_GRANULARITY_BITS)
-#define PTR_TO_SHADOW(p) (void *)((((uintptr_t)ptr) >> SHADOW_GRANULARITY_BITS) + SHADOW_MEMORY_BASE)
-#define SIZE_TO_SHADOW_SIZE(p) ((p) >> SHADOW_GRANULARITY_BITS)
-#define SHADOW_POISON_HEAP_LEFT_RZ 0xfa
-#define SHADOW_POISON_HEAP_RIGHT_RZ 0xfb
-#define SHADOW_POISON_HEAP_FREED 0xfd
-
-static void
-malloc_sanitizer_fallback_allocate_poison(uintptr_t ptr, size_t leftrz_sz, size_t alloc_sz, size_t rightrz_sz)
-{
- uintptr_t alloc_ptr, rightrz_ptr;
- MALLOC_ASSERT(!os_add_overflow(ptr, leftrz_sz, &alloc_ptr) &&
- !os_add_overflow(alloc_ptr, alloc_sz, &rightrz_ptr));
-
- // Tag the ASan shadow as ASAN_POISON_USER/ASAN_VALID/ASAN_POISON_USER
- if (sanitizer_fallback_ptrs.memory_poison && sanitizer_fallback_ptrs.memory_unpoison) {
- (*sanitizer_fallback_ptrs.memory_poison)(ptr, leftrz_sz);
- (*sanitizer_fallback_ptrs.memory_unpoison)(alloc_ptr, alloc_sz);
- (*sanitizer_fallback_ptrs.memory_poison)(rightrz_ptr, rightrz_sz);
- } else {
- // This code should only be executed by Rosetta on macOS
- MALLOC_ASSERT(!(leftrz_sz % SHADOW_GRANULARITY) &&
- !((alloc_sz + rightrz_sz) % SHADOW_GRANULARITY));
-
- const uint8_t partial = alloc_sz & (SHADOW_GRANULARITY - 1);
- // Partial poison is not supported, leave it unpoisoned
- const size_t left = SIZE_TO_SHADOW_SIZE(leftrz_sz),
- right = SIZE_TO_SHADOW_SIZE(rightrz_sz),
- alloc = SIZE_TO_SHADOW_SIZE(alloc_sz) + !!partial;
- uint8_t *shadow = PTR_TO_SHADOW(ptr);
- memset(shadow, SHADOW_POISON_HEAP_LEFT_RZ, left);
- shadow += left;
- bzero(shadow + left, alloc);
- shadow += alloc;
- memset(shadow, SHADOW_POISON_HEAP_RIGHT_RZ, right);
- }
-}
-
-static void
-malloc_sanitizer_fallback_deallocate_poison(uintptr_t ptr, size_t sz)
-{
- // Tag the ASan shadow as ASAN_POISON_USER
- if (sanitizer_fallback_ptrs.memory_poison) {
- (*sanitizer_fallback_ptrs.memory_poison)(ptr, sz);
- } else {
- memset(PTR_TO_SHADOW(ptr), SHADOW_POISON_HEAP_FREED, SIZE_TO_SHADOW_SIZE(sz));
- }
-}
-
-#endif // TARGET_OS_OSX
-
-bool malloc_sanitizer_is_enabled(void)
-{
- return malloc_sanitizer_enabled;
-}
-
-const struct malloc_sanitizer_poison *
-malloc_sanitizer_get_functions(void)
-{
-#if TARGET_OS_OSX
- return sanitizer ? sanitizer : &sanitizer_fallback;
-#else
- return sanitizer;
-#endif
-}
-
-void
-malloc_sanitizer_set_functions(struct malloc_sanitizer_poison *s)
-{
- sanitizer = s;
-}
-
/********* Functions for performance tools ************/
+
+static kern_return_t
+_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)
@@ -3343,8 +2283,9 @@
vm_address_t *zones_address_ref;
unsigned num_zones;
unsigned *num_zones_ref;
- reader = reader_or_in_memory_fallback(reader, task);
-
+ 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);
@@ -3496,32 +2437,22 @@
{
unsigned index = 0;
MALLOC_LOCK();
-#if CONFIG_EARLY_MALLOC
- mfm_lock();
-#endif
while (index < malloc_num_zones) {
malloc_zone_t *zone = malloc_zones[index++];
zone->introspect->force_lock(zone);
}
- if (callout) {
- callout();
- }
+ callout();
}
static void
_malloc_unlock_all(void (*callout)(void))
{
unsigned index = 0;
- if (callout) {
- callout();
- }
+ callout();
while (index < malloc_num_zones) {
malloc_zone_t *zone = malloc_zones[index++];
zone->introspect->force_unlock(zone);
}
-#if CONFIG_EARLY_MALLOC
- mfm_unlock();
-#endif
MALLOC_UNLOCK();
}
@@ -3529,9 +2460,7 @@
_malloc_reinit_lock_all(void (*callout)(void))
{
unsigned index = 0;
- if (callout) {
- callout();
- }
+ 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
@@ -3540,9 +2469,6 @@
zone->introspect->reinit_lock(zone);
}
}
-#if CONFIG_EARLY_MALLOC
- mfm_reinit_lock();
-#endif
MALLOC_REINIT_LOCK();
}
@@ -3553,14 +2479,14 @@
void
_malloc_fork_prepare(void)
{
- return _malloc_lock_all(msl.fork_prepare);
+ return _malloc_lock_all(&__stack_logging_fork_prepare);
}
// Called in the parent process after fork() to resume normal operation.
void
_malloc_fork_parent(void)
{
- return _malloc_unlock_all(msl.fork_parent);
+ return _malloc_unlock_all(&__stack_logging_fork_parent);
}
// Called in the child process after fork() to resume normal operation.
@@ -3568,13 +2494,15 @@
_malloc_fork_child(void)
{
#if CONFIG_NANOZONE
- if (_malloc_entropy_initialized) {
- if (initial_nano_zone) {
- nanov2_forked_zone((nanozonev2_t *)initial_nano_zone);
+ 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());
}
}
#endif
- return _malloc_reinit_lock_all(msl.fork_child);
+ return _malloc_reinit_lock_all(&__stack_logging_fork_child);
}
/*
@@ -3668,27 +2596,7 @@
}
}
-void
-malloc_zero_on_free_disable(void)
-{
- malloc_zero_policy = MALLOC_ZERO_NONE;
-}
-
-bool
-malloc_variant_is_debug_4test(void)
-{
-#ifdef DEBUG
- return true;
-#else
- return false;
-#endif
-}
-
/***************** OBSOLETE ENTRY POINTS ********************/
-
-#ifndef PHASE_OUT_OLD_MALLOC
-#define PHASE_OUT_OLD_MALLOC 0
-#endif
#if PHASE_OUT_OLD_MALLOC
#error PHASE OUT THE FOLLOWING FUNCTIONS
@@ -3723,397 +2631,4 @@
return 0;
}
-#pragma mark -
-#pragma mark Malloc Thread Options
-
-typedef union {
- malloc_thread_options_t options;
- void *storage;
-} th_opts_t;
-
-MALLOC_STATIC_ASSERT(sizeof(th_opts_t) == sizeof(void *), "Options fit into pointer bits");
-
-malloc_thread_options_t
-malloc_get_thread_options(void)
-{
- th_opts_t x = {.storage = _pthread_getspecific_direct(__TSD_MALLOC_THREAD_OPTIONS)};
- return x.options;
-}
-
-void
-malloc_set_thread_options(malloc_thread_options_t opts)
-{
- // Canonicalize options
- if (opts.DisableExpensiveDebuggingOptions) {
- opts.DisableProbabilisticGuardMalloc = true;
- opts.DisableMallocStackLogging = true;
- }
-
- pgm_thread_set_disabled(opts.DisableProbabilisticGuardMalloc);
-
- th_opts_t x = {.options = opts};
- _pthread_setspecific_direct(__TSD_MALLOC_THREAD_OPTIONS, x.storage);
-}
-
-#pragma mark -
-#pragma mark Malloc Stack Logging
-
-static bool _malloc_register_stack_logger(bool at_startup);
-
-/* this is called from libsystem during initialization. */
-static void
-stack_logging_early_finished(const struct _malloc_late_init *funcs)
-{
-#if !TARGET_OS_DRIVERKIT
- _dlopen = funcs->dlopen;
- _dlsym = funcs->dlsym;
-#endif
- if (funcs->version >= 2 && funcs->msl) {
- msl = *funcs->msl;
- }
- const char **env = (const char**) *_NSGetEnviron();
- for (const char **e = env; *e; e++) {
- if (0==strncmp(*e, "MallocStackLogging", 18)) {
- _malloc_register_stack_logger(true);
- if (msl.set_flags_from_environment) {
- msl.set_flags_from_environment(env);
- }
- break;
- }
- }
- if (msl.initialize) {
- msl.initialize();
- }
-}
-
-
-static os_once_t _register_msl_dylib_pred;
-
-static void
-register_msl_dylib(void *dylib)
-{
-#if TARGET_OS_DRIVERKIT
- set_msl_lite_hooks(msl.copy_msl_lite_hooks);
-#else
- if (!dylib) {
- return;
- }
- msld.dylib = dylib;
- msl.handle_memory_event = _dlsym(dylib, "msl_handle_memory_event");
- msl.stack_logging_locked = _dlsym(dylib, "msl_stack_logging_locked");
- msl.fork_prepare = _dlsym(dylib, "msl_fork_prepare");
- msl.fork_child = _dlsym(dylib, "msl_fork_child");
- msl.fork_parent = _dlsym(dylib, "msl_fork_parent");
- msl.turn_on_stack_logging = _dlsym(dylib, "msl_turn_on_stack_logging");
- msl.turn_off_stack_logging = _dlsym(dylib, "msl_turn_off_stack_logging");
- msl.set_flags_from_environment = _dlsym(dylib, "msl_set_flags_from_environment");
- msl.initialize = _dlsym(dylib, "msl_initialize");
-
-
- // TODO delete these ones
- msld.get_frames_for_address = _dlsym(dylib, "msl_get_frames_for_address");
- msld.stackid_for_vm_region = _dlsym(dylib, "msl_stackid_for_vm_region");
- msld.get_frames_for_stackid = _dlsym(dylib, "msl_get_frames_for_stackid");
- msld.uniquing_table_read_stack = _dlsym(dylib, "msl_uniquing_table_read_stack");
-
- void (*msl_copy_msl_lite_hooks) (struct _malloc_msl_lite_hooks_s *hooksp, size_t size);
- msl_copy_msl_lite_hooks = _dlsym(dylib, "msl_copy_msl_lite_hooks");
- if (msl_copy_msl_lite_hooks) {
- set_msl_lite_hooks(msl_copy_msl_lite_hooks);
- }
-#endif
-}
-
-MALLOC_EXPORT
-boolean_t
-malloc_register_stack_logger(void)
-{
- return _malloc_register_stack_logger(false);
-}
-
-static bool
-_malloc_register_stack_logger(bool at_startup)
-{
- void *dylib = NULL;
- if (malloc_sanitizer_enabled && !at_startup) {
- return false;
- }
-#if !TARGET_OS_DRIVERKIT
- if (msl.handle_memory_event != NULL) {
- return true;
- }
- if (_dlopen == NULL) {
- return false;
- }
- dylib = _dlopen("/System/Library/PrivateFrameworks/MallocStackLogging.framework/MallocStackLogging", RTLD_GLOBAL);
- if (dylib == NULL) {
- return false;
- }
-#endif
- os_once(&_register_msl_dylib_pred, dylib, register_msl_dylib);
- if (!msl.handle_memory_event) {
- malloc_report(ASL_LEVEL_WARNING, "failed to load MallocStackLogging.framework\n");
- return false;
- }
- return true;
-}
-
-/* Symbolication.framework looks up this symbol by name inside libsystem_malloc.dylib. */
-uint64_t __mach_stack_logging_shared_memory_address = 0;
-
-
-#pragma mark -
-#pragma mark Malloc Stack Logging - Legacy stubs
-
-/*
- * legacy API for MallocStackLogging.
- *
- * TODO, deprecate this, move clients off it and delete it. Clients should move
- * to MallocStackLogging.framework for these APIs.
- */
-
-MALLOC_EXPORT
-boolean_t
-turn_on_stack_logging(stack_logging_mode_type mode)
-{
- malloc_register_stack_logger();
- if (!msl.turn_on_stack_logging) {
- return false;
- }
- return msl.turn_on_stack_logging(mode);
-}
-
-MALLOC_EXPORT
-void turn_off_stack_logging(void)
-{
- malloc_register_stack_logger();
- if (msl.turn_off_stack_logging) {
- msl.turn_off_stack_logging();
- }
-}
-
-//deprecated
-kern_return_t
-__mach_stack_logging_start_reading(task_t task, vm_address_t shared_memory_address, boolean_t *uses_lite_mode)
-{
- malloc_register_stack_logger();
- if (!msld.dylib) {
- return KERN_FAILURE;
- }
- kern_return_t (*f) (task_t task, vm_address_t shared_memory_address, boolean_t *uses_lite_mode);
- f = _dlsym(msld.dylib, "msl_start_reading");
- if (!f) {
- return KERN_FAILURE;
- }
- return f(task, shared_memory_address, uses_lite_mode);
-}
-
-
-//deprecated
-kern_return_t
-__mach_stack_logging_stop_reading(task_t task)
-{
- malloc_register_stack_logger();
- if (!msld.dylib) {
- return KERN_FAILURE;
- }
- kern_return_t (*f) (task_t task);
- f = _dlsym(msld.dylib, "msl_stop_reading");
- if (!f) {
- return KERN_FAILURE;
- }
- return f(task);
-}
-
-kern_return_t
-__mach_stack_logging_get_frames(task_t task,
- mach_vm_address_t address,
- mach_vm_address_t *stack_frames_buffer,
- uint32_t max_stack_frames,
- uint32_t *count)
-{
- malloc_register_stack_logger();
- if (!msld.get_frames_for_address) {
- return KERN_FAILURE;
- }
- return msld.get_frames_for_address(task, address, stack_frames_buffer, max_stack_frames, count);
-}
-
-uint64_t
-__mach_stack_logging_stackid_for_vm_region(task_t task, mach_vm_address_t address)
-{
- malloc_register_stack_logger();
- if (!msld.stackid_for_vm_region) {
- return -1ull;
- }
- return msld.stackid_for_vm_region(task, address);
-}
-
-//deprecated
-kern_return_t
-__mach_stack_logging_frames_for_uniqued_stack(task_t task,
- uint64_t stack_identifier,
- mach_vm_address_t *stack_frames_buffer,
- uint32_t max_stack_frames,
- uint32_t *count)
-{
- malloc_register_stack_logger();
- if (!msld.get_frames_for_stackid) {
- return KERN_FAILURE;
- }
- return msld.get_frames_for_stackid(task, stack_identifier, stack_frames_buffer, max_stack_frames, count, NULL);
-}
-
-//deprecated
-kern_return_t
-__mach_stack_logging_get_frames_for_stackid(task_t task,
- uint64_t stack_identifier,
- mach_vm_address_t *stack_frames_buffer,
- uint32_t max_stack_frames,
- uint32_t *count,
- bool *last_frame_is_threadid)
-{
- malloc_register_stack_logger();
- if (!msld.get_frames_for_stackid) {
- return KERN_FAILURE;
- }
- return msld.get_frames_for_stackid(task, stack_identifier, stack_frames_buffer, max_stack_frames, count, last_frame_is_threadid);
-}
-
-//deprecated
-kern_return_t
-__mach_stack_logging_uniquing_table_read_stack(struct backtrace_uniquing_table *uniquing_table,
- uint64_t stackid,
- mach_vm_address_t *out_frames_buffer,
- uint32_t *out_frames_count,
- uint32_t max_frames)
-{
- malloc_register_stack_logger();
- if (!msld.uniquing_table_read_stack) {
- return KERN_FAILURE;
- }
- return msld.uniquing_table_read_stack(uniquing_table, stackid, out_frames_buffer, out_frames_count, max_frames);
-}
-
-//deprecated
-kern_return_t
-__mach_stack_logging_enumerate_records(task_t task,
- mach_vm_address_t address,
- void enumerator(mach_stack_logging_record_t, void *),
- void *context)
-{
- malloc_register_stack_logger();
- kern_return_t (*f) (task_t task,
- mach_vm_address_t address,
- void enumerator(mach_stack_logging_record_t, void *),
- void *context);
- if (!msld.dylib) {
- return KERN_FAILURE;
- }
- f = _dlsym(msld.dylib, "msl_disk_stack_logs_enumerate_from_task");
- if (!f) {
- return KERN_FAILURE;
- }
- return f(task, address, enumerator, context);
-}
-
-
-//deprecated
-struct backtrace_uniquing_table *
-__mach_stack_logging_copy_uniquing_table(task_t task)
-{
- malloc_register_stack_logger();
- struct backtrace_uniquing_table * (*f) (task_t task);
- if (!msld.dylib) {
- return NULL;
- }
- f = _dlsym(msld.dylib, "msl_uniquing_table_copy_from_task");
- if (!f) {
- return NULL;
- }
- return f(task);
-}
-
-//deprecated
-struct backtrace_uniquing_table *
-__mach_stack_logging_uniquing_table_copy_from_serialized(void *buffer, size_t size)
-{
- malloc_register_stack_logger();
- struct backtrace_uniquing_table * (*f) (void *buffer, size_t size);
- if (!msld.dylib) {
- return NULL;
- }
- f = _dlsym(msld.dylib, "msl_uniquing_table_copy_from_serialized");
- if (!f) {
- return NULL;
- }
- return f(buffer, size);
-}
-
-//deprecated
-void
-__mach_stack_logging_uniquing_table_release(struct backtrace_uniquing_table *table)
-{
- malloc_register_stack_logger();
- if (!msld.dylib) {
- return;
- }
- void (*f) (struct backtrace_uniquing_table *table);
- f = _dlsym(msld.dylib, "msl_uniquing_table_release");
- if (f) {
- f(table);
- }
-}
-
-//deprecated
-void
-__mach_stack_logging_uniquing_table_retain(struct backtrace_uniquing_table *table)
-{
- malloc_register_stack_logger();
- if (!msld.dylib) {
- return;
- }
- void (*f) (struct backtrace_uniquing_table *table);
- f = _dlsym(msld.dylib, "msl_uniquing_table_retain");
- if (f) {
- f(table);
- }
-}
-
-//deprecated
-extern
-size_t
-__mach_stack_logging_uniquing_table_sizeof(struct backtrace_uniquing_table *table)
-{
- malloc_register_stack_logger();
- size_t (*f) (struct backtrace_uniquing_table *table);
- f = _dlsym(msld.dylib, "msl_uniquing_table_retain");
- return f(table);
-}
-
-//deprecated
-void *
-__mach_stack_logging_uniquing_table_serialize(struct backtrace_uniquing_table *table, mach_vm_size_t *size)
-{
- malloc_register_stack_logger();
- if (!msld.dylib) {
- return NULL;
- }
- void * (*f) (struct backtrace_uniquing_table *table, mach_vm_size_t *size);
- f = _dlsym(msld.dylib, "msl_uniquing_table_serialize");
- if (!f) {
- return NULL;
- }
- return f(table, size);
-}
-
-kern_return_t
-__mach_stack_logging_set_file_path(task_t task, char* file_path)
-{
- return KERN_SUCCESS;
-}
-
-/* WeChat references this, only god knows why. This symbol does nothing. */
-int stack_logging_enable_logging = 0;
-
/* vim: set noet:ts=4:sw=4:cindent: */