Loading...
--- libmalloc/libmalloc-374.60.3/src/nanov2_malloc.c
+++ libmalloc/libmalloc-166.251.2/src/nanov2_malloc.c
@@ -29,31 +29,25 @@
#pragma mark Forward Declarations
#if OS_VARIANT_NOTRESOLVED
-static kern_return_t
-nanov2_statistics_task_printer(task_t task, vm_address_t zone_address,
- memory_reader_t reader, print_task_printer_t printer,
- malloc_statistics_t *stats);
-static kern_return_t
-nanov2_statistics_task(task_t task, vm_address_t zone_address,
- memory_reader_t reader, malloc_statistics_t *stats);
+static void nanov2_statistics(nanozonev2_t *nanozone, malloc_statistics_t *stats);
#endif // OS_VARIANT_NOTRESOLVED
#pragma mark -
#pragma mark Externals for resolved functions
-MALLOC_NOEXPORT extern void *nanov2_allocate(nanozonev2_t *nanozone, size_t rounded_size,
+extern void *nanov2_allocate(nanozonev2_t *nanozone, size_t rounded_size,
boolean_t clear);
-MALLOC_NOEXPORT extern void nanov2_free_to_block(nanozonev2_t *nanozone, void *ptr,
+extern void nanov2_free_to_block(nanozonev2_t *nanozone, void *ptr,
nanov2_size_class_t size_class);
-MALLOC_NOEXPORT extern boolean_t nanov2_madvise_block(nanozonev2_t *nanozone,
+extern boolean_t nanov2_madvise_block(nanozonev2_t *nanozone,
nanov2_block_meta_t *block_metap, nanov2_block_t *blockp,
nanov2_size_class_t size_class);
-MALLOC_NOEXPORT extern size_t nanov2_pointer_size(nanozonev2_t *nanozone, void *ptr,
+extern size_t nanov2_pointer_size(nanozonev2_t *nanozone, void *ptr,
boolean_t allow_inner);
-MALLOC_NOEXPORT extern size_t nanov2_pressure_relief(nanozonev2_t *nanozone, size_t goal);
+extern size_t nanov2_pressure_relief(nanozonev2_t *nanozone, size_t goal);
#if OS_VARIANT_RESOLVED
-MALLOC_NOEXPORT extern boolean_t nanov2_allocate_new_region(nanozonev2_t *nanozone);
+extern boolean_t nanov2_allocate_new_region(nanozonev2_t *nanozone);
#endif // OS_VARIANT_RESOLVED
#pragma mark -
@@ -110,9 +104,9 @@
#if OS_VARIANT_NOTRESOLVED
// Madvise policy. Set from the MallocNanoMadvisePolicy environment variable.
-MALLOC_NOEXPORT nanov2_madvise_policy_t nanov2_madvise_policy;
-
-MALLOC_NOEXPORT nanov2_policy_config_t nanov2_policy_config = {
+nanov2_madvise_policy_t nanov2_madvise_policy;
+
+nanov2_policy_config_t nanov2_policy_config = {
.block_scan_policy = NANO_SCAN_CAPACITY_BASED,
.block_scan_min_capacity = DEFAULT_SCAN_MIN_CAPACITY,
.block_scan_max_capacity = DEFAULT_SCAN_MAX_CAPACITY,
@@ -123,8 +117,8 @@
#else // OS_VARIANT_NOTRESOLVED
-MALLOC_NOEXPORT extern nanov2_policy_config_t nanov2_policy_config;
-MALLOC_NOEXPORT extern nanov2_madvise_policy_t nanov2_madvise_policy;
+extern nanov2_policy_config_t nanov2_policy_config;
+extern nanov2_madvise_policy_t nanov2_madvise_policy;
#endif // OS_VARIANT_NOTRESOLVED
@@ -139,7 +133,7 @@
// up to 64. One unit corresponds to BLOCKS_PER_UNIT blocks in the corresponding
// size class, so 64 units maps to a total of 64 * 64 = 4096 blocks and each
// block is 16K, making a total of 64MB, which is the size of an arena.
-static int block_units_by_size_class[] = {
+int block_units_by_size_class[] = {
2, // 16-byte allocations (less 1 for the metadata block)
10, // 32-byte allocations
11, // 48-byte allocations
@@ -169,18 +163,18 @@
// Offsets to the first and last blocks for each size class within an arena, in
// the logical address space. These tables are constructed from the values in
// the block_units_by_size_class table.
-MALLOC_NOEXPORT int first_block_offset_by_size_class[NANO_SIZE_CLASSES];
-MALLOC_NOEXPORT int last_block_offset_by_size_class[NANO_SIZE_CLASSES];
+int first_block_offset_by_size_class[NANO_SIZE_CLASSES];
+int last_block_offset_by_size_class[NANO_SIZE_CLASSES];
// Table mapping the part of a logical address that depends on size class to
// the size class. Also built from the block_units_by_size_class table.
-MALLOC_NOEXPORT int ptr_offset_to_size_class[TOTAL_BLOCK_UNITS];
+int ptr_offset_to_size_class[TOTAL_BLOCK_UNITS];
// Number of slots in a block, indexed by size class. Note that there is a small
// amount of wastage in some size classes because the block size is not always
// exactly divisible by the allocation size. The number of wasted bytes is shown
// in parentheses in the comments below.
-MALLOC_NOEXPORT const int slots_by_size_class[] = {
+const int slots_by_size_class[] = {
NANOV2_BLOCK_SIZE/(1 * NANO_REGIME_QUANTA_SIZE), // 16 bytes: 1024 (0)
NANOV2_BLOCK_SIZE/(2 * NANO_REGIME_QUANTA_SIZE), // 32 bytes: 512 (0)
NANOV2_BLOCK_SIZE/(3 * NANO_REGIME_QUANTA_SIZE), // 48 bytes: 341 (16)
@@ -239,14 +233,13 @@
// Given a block metadata pointer, returns whether the block is active (that is,
// it is being used for allocations, it has allocations that have not been freed,
-// or is waiting to be madvised and is not a guard block).
+// or is waiting to be madvised).
static MALLOC_ALWAYS_INLINE MALLOC_INLINE boolean_t
nanov2_is_block_active(nanov2_block_meta_t block_meta)
{
return block_meta.next_slot != SLOT_NULL
&& block_meta.next_slot != SLOT_MADVISING
- && block_meta.next_slot != SLOT_MADVISED
- && block_meta.next_slot != SLOT_GUARD;
+ && block_meta.next_slot != SLOT_MADVISED;
}
#if OS_VARIANT_RESOLVED
@@ -422,7 +415,6 @@
nanov2_metablock_meta_index(nanozone)];
}
-#if OS_VARIANT_RESOLVED
// Given a pointer to a region, returns a pointer to the region that follows it,
// or NULL if there isn't one.
static MALLOC_ALWAYS_INLINE MALLOC_INLINE nanov2_region_t *
@@ -433,24 +425,6 @@
int offset = linkage->next_region_offset;
return offset ? region + offset : NULL;
}
-#endif // OS_VARIANT_RESOLVED
-
-#if OS_VARIANT_NOTRESOLVED
-// Given a pointer to a region, returns a pointer to the region that follows it,
-// or NULL if there isn't one. This variant is used when mapping the nanozone
-// for another process.
-static MALLOC_ALWAYS_INLINE MALLOC_INLINE nanov2_region_t *
-nanov2_next_region_for_region_offset(nanozonev2_t *nanozone,
- nanov2_region_t *region, off_t region_offset)
-{
- nanov2_region_linkage_t *linkage =
- nanov2_region_linkage_for_region(nanozone, region);
- nanov2_region_linkage_t *mapped_linkage = (nanov2_region_linkage_t *)
- ((uintptr_t)linkage + region_offset);
- int offset = mapped_linkage->next_region_offset;
- return offset ? region + offset : NULL;
-}
-#endif // OS_VARIANT_NOTRESOLVED
// Given the index of a slot in a block of a given size and the base address of
// the block, returns a pointer to the start of the slot. This works for both
@@ -596,15 +570,15 @@
#if CONFIG_NANO_USES_HYPER_SHIFT
if (os_likely(nano_common_max_magazines_is_ncpu)) {
// Default case is max magazines == physical number of CPUs, which
- // must be > _malloc_cpu_number() >> hyper_shift, so the modulo
+ // must be > _os_cpu_number() >> hyper_shift, so the modulo
// operation is not required.
- return _malloc_cpu_number() >> hyper_shift;
+ return _os_cpu_number() >> hyper_shift;
}
#else // CONFIG_NANO_USES_HYPER_SHIFT
if (os_likely(nano_common_max_magazines_is_ncpu)) {
// Default case is max magazines == logical number of CPUs, which
- // must be > _malloc_cpu_number() so the modulo operation is not required.
- return _malloc_cpu_number();
+ // must be > _os_cpu_number() so the modulo operation is not required.
+ return _os_cpu_number();
}
#endif // CONFIG_NANO_USES_HYPER_SHIFT
@@ -614,62 +588,11 @@
#endif // CONFIG_NANO_USES_HYPER_SHIFT
if (os_likely(_os_cpu_number_override == -1)) {
- return (_malloc_cpu_number() >> shift) % nano_common_max_magazines;
+ return (_os_cpu_number() >> shift) % nano_common_max_magazines;
}
return (_os_cpu_number_override >> shift) % nano_common_max_magazines;
}
#endif // OS_VARIANT_RESOLVED
-
-#pragma mark -
-#pragma mark Guard Blocks
-
-// Converts a given block (specified by absolute block number) in an arena into
-// a guard block. The block will be marked as in-use so that it is not available
-// for allocations and its permissions are set to PROT_READ. Note that
-// PROT_READ is used instead of PROT_NONE because the latter breaks the
-// enumerator, which tries to map the whole region and fails if there are
-// PROT_NONE pages in the range. We can't fix that in the allocator because the
-// code that does the mapping is part of the sampling tools and is simply
-// invoked as a callback from the enumerator.
-static MALLOC_ALWAYS_INLINE MALLOC_INLINE void
-nanov2_create_guard_block(nanozonev2_t *nanozone, nanov2_arena_t *arena,
- nanov2_block_index_t block_index) {
- // Mark the block as in-use in the meta data
- static nanov2_block_meta_t in_use_block = {
- .in_use = 1,
- .next_slot = SLOT_GUARD
- };
- nanov2_meta_index_t block_meta_index =
- nanov2_block_index_to_meta_index(block_index);
- nanov2_arena_metablock_t *block_metap = nanov2_metablock_address_for_ptr(
- nanozone, arena);
- block_metap->arena_block_meta[block_meta_index] = in_use_block;
- void *block_ptr = &arena->blocks[block_index];
-
- // Apply PROT_NONE to the block itself.
- kern_return_t err = mprotect(block_ptr, NANOV2_BLOCK_SIZE, PROT_READ);
- if (err != KERN_SUCCESS) {
- malloc_report(ASL_LEVEL_ERR, "Failed to create guard block at %p (%d)\n",
- block_ptr, err);
- }
-}
-
-// Creates the guard blocks for an arena, if required. The guard blocks are
-// the first and last physical blocks in the arena that are not the metadata
-// block.
-static MALLOC_ALWAYS_INLINE MALLOC_INLINE void
-nanov2_init_guard_blocks(nanozonev2_t *nanozone, nanov2_arena_t *arena)
-{
- if (nanozone->debug_flags & MALLOC_ALL_GUARD_PAGE_FLAGS) {
- // Use the first and last blocks in the arena as guard regions,
- // avoiding the metadata block.
- nanov2_meta_index_t meta_index = nanov2_metablock_meta_index(nanozone);
- nanov2_create_guard_block(nanozone, arena, meta_index == 0 ? 1 : 0);
- nanov2_create_guard_block(nanozone, arena,
- meta_index == NANOV2_BLOCKS_PER_ARENA - 1 ?
- NANOV2_BLOCKS_PER_ARENA - 2 : NANOV2_BLOCKS_PER_ARENA - 1);
- }
-}
#pragma mark -
#pragma mark Allocator Initialization
@@ -998,14 +921,14 @@
// determine whether the pointer is for a Nano V2 allocation and, if not,
// delegates to the helper zone. Returns 0 if the pointer is not to memory
// allocated by Nano V2 or attributable to the helper zone.
-MALLOC_NOEXPORT size_t
+size_t
nanov2_size(nanozonev2_t *nanozone, const void *ptr)
{
size_t size = nanov2_pointer_size(nanozone, (void *)ptr, FALSE);
return size ? size : nanozone->helper_zone->size(nanozone->helper_zone, ptr);
}
-MALLOC_NOEXPORT void *
+void *
nanov2_malloc(nanozonev2_t *nanozone, size_t size)
{
size_t rounded_size = _nano_common_good_size(size);
@@ -1024,7 +947,7 @@
return nanozone->helper_zone->malloc(nanozone->helper_zone, size);
}
-MALLOC_NOEXPORT void
+void
nanov2_free_definite_size(nanozonev2_t *nanozone, void *ptr, size_t size)
{
// Check whether it's a Nano pointer and get the size. We should only get
@@ -1042,7 +965,7 @@
size);
}
-MALLOC_NOEXPORT void
+void
nanov2_free(nanozonev2_t *nanozone, void *ptr)
{
if (ptr && nanov2_has_valid_signature(ptr)) {
@@ -1060,7 +983,7 @@
return nanozone->helper_zone->free(nanozone->helper_zone, ptr);
}
-MALLOC_NOEXPORT void *
+void *
nanov2_calloc(nanozonev2_t *nanozone, size_t num_items, size_t size)
{
size_t total_bytes;
@@ -1091,7 +1014,7 @@
#endif // OS_VARIANT_NOTRESOLVED
#if OS_VARIANT_RESOLVED
-MALLOC_NOEXPORT void *
+void *
nanov2_realloc(nanozonev2_t *nanozone, void *ptr, size_t new_size)
{
// If we are given a NULL pointer, just allocate memory of the requested
@@ -1163,14 +1086,13 @@
#endif // OS_VARIANT_NOTRESOLVED
#if OS_VARIANT_RESOLVED
-MALLOC_NOEXPORT boolean_t
+boolean_t
nanov2_claimed_address(nanozonev2_t *nanozone, void *ptr)
{
- return nanov2_pointer_size(nanozone, ptr, TRUE)
- || malloc_zone_claimed_address(nanozone->helper_zone, ptr);
-}
-
-MALLOC_NOEXPORT unsigned
+ return nanov2_pointer_size(nanozone, ptr, TRUE) != 0;
+}
+
+unsigned
nanov2_batch_malloc(nanozonev2_t *nanozone, size_t size, void **results,
unsigned count)
{
@@ -1197,7 +1119,7 @@
nanozone->helper_zone, size, results, count - allocated);
}
-MALLOC_NOEXPORT void
+void
nanov2_batch_free(nanozonev2_t *nanozone, void **to_be_freed, unsigned count)
{
if (count) {
@@ -1334,7 +1256,7 @@
if (kr) {
return kr;
}
- boolean_t self_zone = mach_task_is_self(task) && (nanozonev2_t *)zone_address == nanozone;
+ boolean_t self_zone = (nanozonev2_t *)zone_address == nanozone;
memcpy(&zone_copy, nanozone, sizeof(zone_copy));
nanozone = &zone_copy;
nanov2_meta_index_t metablock_meta_index = nanov2_metablock_meta_index(nanozone);
@@ -1486,90 +1408,72 @@
static boolean_t
nanov2_check(nanozonev2_t *nanozone)
{
- // Does nothing
+ // Does nothing, just like Nano V1.
return 1;
}
static void
-nanov2_print(task_t task, unsigned level, vm_address_t zone_address,
- memory_reader_t reader, print_task_printer_t printer)
-{
- // Ensure that we have configured enough of the allocator to be able to
- // examine its data structures. In tools that do not directly use Nano, we
- // won't have done this yet. nanov2_configure() runs the initialization
- // only once.
- nanov2_configure();
-
- nanozonev2_t *mapped_nanozone;
- if (reader(task, (vm_address_t)zone_address, sizeof(nanozonev2_t),
- (void **)&mapped_nanozone)) {
- printer("Failed to map nanozonev2_s at %p\n", zone_address);
- return;
- }
-
+nanov2_print(nanozonev2_t *nanozone, boolean_t verbose)
+{
// Zone-wide statistics
malloc_statistics_t stats;
- nanov2_statistics_task_printer(task, zone_address, reader, printer, &stats);
- nanov2_statistics_t *nano_stats = &mapped_nanozone->statistics;
- printer("Nanozonev2 %p: blocks in use: %llu, size in use: %llu "
- "allocated size: %llu, allocated regions: %d, region holes: %d\n",
- zone_address, (uint64_t)stats.blocks_in_use,
- (uint64_t)stats.size_in_use, (uint64_t)stats.size_allocated,
- nano_stats->allocated_regions, nano_stats->region_address_clashes);
+ nanov2_statistics_t *nano_stats = &nanozone->statistics;
+ nanov2_statistics(nanozone, &stats);
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ "Nanozonev2 %p: blocks in use: %llu, size in use: %llu allocated size: %llu, "
+ "allocated regions: %d, region holes: %d\n",
+ nanozone, (uint64_t)stats.blocks_in_use, (uint64_t)stats.size_in_use,
+ (uint64_t)stats.size_allocated, nano_stats->allocated_regions,
+ nano_stats->region_address_clashes);
#if DEBUG_MALLOC
// Per-size class statistics
- printer("\nPer size-class statistics:\n");
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ "\nPer size-class statistics:\n");
for (int i = 0; i < NANO_SIZE_CLASSES; i++) {
nanov2_size_class_statistics *cs = &nano_stats->size_class_statistics[i];
- printer(" Class %d: ", i);
- printer("total alloc: %llu, total frees: %llu, madvised blocks: %llu, "
- "madvise races: %llu",
- cs->total_allocations, cs->total_frees, cs->madvised_blocks,
- cs->madvise_races);
- printer("\n");
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ " Class %d: ", i);
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ "total alloc: %llu, total frees: %llu, madvised blocks: %llu, madvise races: %llu",
+ cs->total_allocations, cs->total_frees, cs->madvised_blocks,
+ cs->madvise_races);
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX, "\n");
}
#endif // DEBUG_MALLOC
// Per-context block pointers.
- printer("Current Allocation Blocks By Size Class/Context [CPU]\n");
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ "Current Allocation Blocks By Size Class/Context [CPU]\n");
for (int i = 0; i < NANO_SIZE_CLASSES; i++) {
- printer(" Class %d: ", i);
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ " Class %d: ", i);
for (int j = 0; j < MAX_CURRENT_BLOCKS; j++) {
- if (mapped_nanozone->current_block[i][j]) {
- printer("%d: %p; ", j, mapped_nanozone->current_block[i][j]);
- }
- }
- printer("\n");
- }
-
- nanov2_meta_index_t metablock_meta_index =
- nanov2_metablock_meta_index(mapped_nanozone);
- nanov2_region_t *region = mapped_nanozone->first_region_base;
+ if (nanozone->current_block[i][j]) {
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ "%d: %p; ", j, nanozone->current_block[i][j]);
+ }
+ }
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX, "\n");
+ }
+
+ nanov2_meta_index_t metablock_meta_index = nanov2_metablock_meta_index(nanozone);
+ nanov2_region_t *region = nanozone->first_region_base;
int region_index = 0;
while (region) {
- printer("\nRegion %d: base address %p\n", region_index, region);
- nanov2_region_t *mapped_region;
- if (reader(task, (vm_address_t)region, sizeof(nanov2_region_t),
- (void **)&mapped_region)) {
- printer("Failed to map nanov2 region at %p\n", region);
- return;
- }
- off_t region_offset = (uintptr_t)mapped_region - (uintptr_t)region;
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ "\nRegion %d: base address %p\n", region_index, region);
nanov2_arena_t *arena = nanov2_first_arena_for_region(region);
- nanov2_arena_t *limit_arena = nanov2_limit_arena_for_region(
- mapped_nanozone, region);
+ nanov2_arena_t *limit_arena = nanov2_limit_arena_for_region(nanozone, region);
int arena_index = 0;
while (arena < limit_arena) {
// Find the metadata block and process every entry, apart from the
// one for the metadata block itself.
nanov2_arena_metablock_t *arena_meta_blockp =
- nanov2_metablock_address_for_ptr(mapped_nanozone, arena);
- nanov2_arena_metablock_t *mapped_arena_meta_blockp =
- (nanov2_arena_metablock_t *)((uintptr_t)arena_meta_blockp + region_offset);
+ nanov2_metablock_address_for_ptr(nanozone, arena);
+
nanov2_block_meta_t *block_metap = &arena_meta_blockp->arena_block_meta[0];
- nanov2_block_meta_t *mapped_block_metap = &mapped_arena_meta_blockp->arena_block_meta[0];
int active_blocks = 0;
int madvisable_blocks = 0;
@@ -1581,7 +1485,7 @@
// Skip the metadata block.
continue;
}
- nanov2_block_meta_t meta = mapped_block_metap[i];
+ nanov2_block_meta_t meta = block_metap[i];
switch (meta.next_slot) {
case SLOT_NULL:
unused_blocks++;
@@ -1600,7 +1504,8 @@
break;
}
}
- printer("Arena #%d: base address %p. Blocks - active: %d, "
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ "Arena #%d: base address %p. Blocks - active: %d, "
"madvisable: %d, madvising: %d, madvised: %d, unused: %d\n",
arena_index, arena, active_blocks, madvisable_blocks,
madvising_blocks, madvised_blocks, unused_blocks);
@@ -1615,9 +1520,9 @@
// Skip the metadata block.
continue;
}
- nanov2_block_meta_t meta = mapped_block_metap[i];
+ nanov2_block_meta_t meta = block_metap[i];
nanov2_size_class_t size_class =
- nanov2_size_class_for_meta_index(mapped_nanozone, i);
+ nanov2_size_class_for_meta_index(nanozone, i);
switch (meta.next_slot) {
case SLOT_FULL:
case SLOT_BUMP:
@@ -1632,97 +1537,85 @@
break;
}
}
- printer("Size classes with allocated blocks: ");
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ "Size classes with allocated blocks: ");
for (int i = 0; i < NANO_SIZE_CLASSES; i++) {
if (non_empty_size_classes[i]) {
- printer("%d ", i);
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ "%d ", i);
}
}
- printer("\n");
-
- if (level >= MALLOC_VERBOSE_PRINT_LEVEL) {
- for (nanov2_meta_index_t i = 0; i < NANOV2_BLOCKS_PER_ARENA; i++) {
- if (i == metablock_meta_index) {
- // Skip the metadata block.
- continue;
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX, "\n");
+
+ for (nanov2_meta_index_t i = 0; i < NANOV2_BLOCKS_PER_ARENA; i++) {
+ if (i == metablock_meta_index) {
+ // Skip the metadata block.
+ continue;
+ }
+ nanov2_block_meta_t meta = block_metap[i];
+ if (!nanov2_is_block_active(meta) && !verbose) {
+ continue;
+ }
+ nanov2_size_class_t size_class =
+ nanov2_size_class_for_meta_index(nanozone, i);
+ char *slot_text;
+ switch (meta.next_slot) {
+ case SLOT_NULL:
+ slot_text = "NOT USED";
+ break;
+ case SLOT_FULL:
+ slot_text = "FULL";
+ break;
+ case SLOT_CAN_MADVISE:
+ slot_text = "CAN MADVISE";
+ break;
+ case SLOT_MADVISING:
+ slot_text = "MADVISING";
+ break;
+ case SLOT_MADVISED:
+ slot_text = "MADVISED";
+ break;
+ default:
+ slot_text = NULL;
+ break;
+ }
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ " Block %d: base %p; metadata: %p, size %d (class %d) in-use: %d ",
+ i, nanov2_block_address_from_meta_index(nanozone, arena, i),
+ &block_metap[i], nanov2_size_from_size_class(size_class),
+ size_class, meta.in_use);
+ if (slot_text) {
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ "%s\n", slot_text);
+ } else {
+ int allocated = slots_by_size_class[size_class] - meta.free_count - 1;
+ if (meta.next_slot == SLOT_BUMP) {
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ "BUMP (free list empty)");
+ } else {
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ "next_slot (1-based) = %d", meta.next_slot);
+
}
- nanov2_block_meta_t meta = mapped_block_metap[i];
- if (!nanov2_is_block_active(meta)) {
- continue;
- }
- nanov2_size_class_t size_class =
- nanov2_size_class_for_meta_index(mapped_nanozone, i);
- char *slot_text;
- switch (meta.next_slot) {
- case SLOT_NULL:
- slot_text = "NOT USED";
- break;
- case SLOT_FULL:
- slot_text = "FULL";
- break;
- case SLOT_CAN_MADVISE:
- slot_text = "CAN MADVISE";
- break;
- case SLOT_MADVISING:
- slot_text = "MADVISING";
- break;
- case SLOT_MADVISED:
- slot_text = "MADVISED";
- break;
- default:
- slot_text = NULL;
- break;
- }
- printer(" Block %d: base %p; metadata: %p, size %d "
- "(class %d) in-use: %d ",
- i, nanov2_block_address_from_meta_index(mapped_nanozone, arena, i),
- &block_metap[i], nanov2_size_from_size_class(size_class),
- size_class, meta.in_use);
- if (slot_text) {
- printer("%s\n", slot_text);
- } else {
- int allocated = slots_by_size_class[size_class] - meta.free_count - 1;
- if (meta.next_slot == SLOT_BUMP) {
- printer("BUMP (free list empty)");
- } else {
- printer("next_slot (1-based) = %d", meta.next_slot);
-
- }
- printer(", allocated slots: %d, free slots = %d, "
- "occupancy: %d%%\n",
- allocated, meta.free_count + 1,
- (100 * allocated)/slots_by_size_class[size_class]);
- }
+ malloc_report(MALLOC_REPORT_NOLOG | MALLOC_REPORT_NOPREFIX,
+ ", allocated slots: %d, free slots = %d, occupancy: %d%%\n",
+ allocated, meta.free_count + 1,
+ (100 * allocated)/slots_by_size_class[size_class]);
}
}
arena++;
arena_index++;
}
- region = nanov2_next_region_for_region_offset(mapped_nanozone, region,
- region_offset);
+ region = nanov2_next_region_for_region(nanozone, region);
region_index++;
}
-}
-
-static void
-nanov2_print_self(nanozonev2_t *nanozone, boolean_t verbose)
-{
- nanov2_print(mach_task_self(), verbose ? MALLOC_VERBOSE_PRINT_LEVEL : 0,
- (vm_address_t)nanozone, _malloc_default_reader, malloc_report_simple);
-}
-
-static void
-nanov2_print_task(task_t task, unsigned level, vm_address_t zone_address,
- memory_reader_t reader, print_task_printer_t printer)
-{
- nanov2_print(task, level, zone_address, reader, printer);
}
static void
nanov2_log(malloc_zone_t *zone, void *log_address)
{
- // Does nothing
+ // Does nothing, just like Nano V1.
}
static void
@@ -1751,71 +1644,35 @@
}
static void
-nanov2_null_printer(const char __unused *fmt, ...)
-{
-}
-
-static kern_return_t
-nanov2_statistics(task_t task, vm_address_t zone_address,
- memory_reader_t reader, print_task_printer_t printer,
- malloc_statistics_t *stats)
-{
- printer = printer ? printer : nanov2_null_printer;
- reader = !reader && task == mach_task_self() ? _malloc_default_reader : reader;
-
- kern_return_t err;
-
- // Ensure that we have configured enough of the allocator to be able to
- // examine its data structures. In tools that do not directly use Nano, we
- // won't have done this yet. nanov2_configure() runs the initialization
- // only once.
- nanov2_configure();
-
+nanov2_statistics(nanozonev2_t *nanozone, malloc_statistics_t *stats)
+{
memset(stats, '\0', sizeof(*stats));
- nanozonev2_t *mapped_nanozone;
- err = reader(task, (vm_address_t)zone_address, sizeof(nanozonev2_t),
- (void **)&mapped_nanozone);
- if (err) {
- printer("Failed to map nanozonev2_s at %p\n", zone_address);
- return err;
- }
-
nanov2_region_t *region;
- nanov2_arena_t *arena;
- nanov2_meta_index_t metadata_block_index =
- nanov2_metablock_meta_index(mapped_nanozone);
+ nanov2_arena_t * arena;
+ nanov2_meta_index_t metadata_block_index = nanov2_metablock_meta_index(nanozone);
// Iterate over each arena in each region. Within each region, add
// statistics for each slot in each block, excluding the meta data block.
- for (region = mapped_nanozone->first_region_base; region;) {
- nanov2_region_t *mapped_region;
- err = reader(task, (vm_address_t)region, sizeof(nanov2_region_t), (void **)&mapped_region);
- if (err) {
- printer("Failed to map nanov2 region at %p\n", region);
- return err;
- }
- off_t region_offset = (uintptr_t)mapped_region - (uintptr_t)region;
+ for (region = nanozone->first_region_base; region;
+ region = nanov2_next_region_for_region(nanozone, region)) {
for (arena = nanov2_first_arena_for_region(region);
- arena < nanov2_limit_arena_for_region(mapped_nanozone, region);
+ arena < nanov2_limit_arena_for_region(nanozone, region);
arena++) {
nanov2_arena_metablock_t *meta_block =
- nanov2_metablock_address_for_ptr(mapped_nanozone, arena);
- nanov2_arena_metablock_t *mapped_meta_block =
- (nanov2_arena_metablock_t *)((uintptr_t)meta_block + region_offset);
+ nanov2_metablock_address_for_ptr(nanozone, arena);
for (nanov2_meta_index_t i = 0; i < NANOV2_BLOCKS_PER_ARENA; i++) {
if (i == metadata_block_index) {
// Skip the metadata block.
continue;
}
- nanov2_block_meta_t *mapped_block_metap = &mapped_meta_block->arena_block_meta[i];
+ nanov2_block_meta_t *block_metap = &meta_block->arena_block_meta[i];
nanov2_size_class_t size_class =
- nanov2_size_class_for_meta_index(mapped_nanozone, i);
+ nanov2_size_class_for_meta_index(nanozone, i);
int slot_size = nanov2_size_from_size_class(size_class);
- nanov2_block_meta_t meta =
- os_atomic_load(mapped_block_metap, relaxed);
+ nanov2_block_meta_t meta = os_atomic_load(block_metap, relaxed);
int slots_in_use = 0;
switch (meta.next_slot) {
case SLOT_NULL:
@@ -1825,8 +1682,6 @@
case SLOT_MADVISING:
// FALLTHRU
case SLOT_MADVISED:
- // FALLTHRU
- case SLOT_GUARD:
// These blocks have no active content.
break;
case SLOT_FULL:
@@ -1848,43 +1703,18 @@
}
}
}
- region = nanov2_next_region_for_region_offset(mapped_nanozone,
- region, region_offset);
- }
- return KERN_SUCCESS;
-}
-
-static void
-nanov2_statistics_self(nanozonev2_t *nanozone, malloc_statistics_t *stats)
-{
- nanov2_statistics(mach_task_self(), (vm_address_t)nanozone,
- _malloc_default_reader, malloc_report_simple, stats);
-}
-
-static kern_return_t
-nanov2_statistics_task_printer(task_t task, vm_address_t zone_address,
- memory_reader_t reader, print_task_printer_t printer,
- malloc_statistics_t *stats)
-{
- return nanov2_statistics(task, zone_address, reader, printer, stats);
-}
-
-static kern_return_t
-nanov2_statistics_task(task_t task, vm_address_t zone_address, memory_reader_t reader, malloc_statistics_t *stats)
-{
- return nanov2_statistics(task, zone_address, reader, NULL, stats);
-}
-
+ }
+}
static const struct malloc_introspection_t nanov2_introspect = {
.enumerator = (void *)nanov2_ptr_in_use_enumerator,
.good_size = (void *)nanov2_good_size,
.check = (void *)nanov2_check,
- .print = (void *)nanov2_print_self,
+ .print = (void *)nanov2_print,
.log = (void *)nanov2_log,
.force_lock = (void *)nanov2_force_lock,
.force_unlock = (void *)nanov2_force_unlock,
- .statistics = (void *)nanov2_statistics_self,
+ .statistics = (void *)nanov2_statistics,
.zone_locked = (void *)nanov2_locked,
.enable_discharge_checking = NULL,
.disable_discharge_checking = NULL,
@@ -1894,8 +1724,6 @@
.enumerate_unavailable_without_blocks = NULL,
#endif // __BLOCKS__
.reinit_lock = (void *)nanov2_reinit_lock,
- .print_task = (void *)nanov2_print_task,
- .task_statistics = (void*)nanov2_statistics_task,
};
#endif // OS_VARIANT_NOTRESOLVED
@@ -2070,7 +1898,7 @@
// Allocates a new region adjacent to the current one. If the allocation fails,
// keep sliding up by the size of a region until we either succeed or run out of
// address space. The caller must own the Nanozone regions lock.
-MALLOC_NOEXPORT boolean_t
+boolean_t
nanov2_allocate_new_region(nanozonev2_t *nanozone)
{
#if NANOV2_MULTIPLE_REGIONS
@@ -2122,7 +1950,6 @@
// unused region of the block if not. If the block is no longer in use or is
// full, NULL is returned and the caller is expected to find another block to
// allocate from.
-MALLOC_NOEXPORT
void *
nanov2_allocate_from_block(nanozonev2_t *nanozone,
nanov2_block_meta_t *block_metap, nanov2_size_class_t size_class)
@@ -2204,7 +2031,8 @@
ptr = nanov2_slot_in_block_ptr(blockp, size_class, slot);
}
- nanov2_free_slot_t *slotp = os_atomic_inject_dependency(ptr,
+ nanov2_free_slot_t *slotp =
+ (nanov2_free_slot_t *)os_atomic_force_dependency_on(ptr,
(unsigned long)old_meta_view.bits);
if (from_free_list) {
// We grabbed the item from the free list. Check the free list canary
@@ -2213,7 +2041,7 @@
// write to it.
uintptr_t guard = os_atomic_load(&slotp->double_free_guard, relaxed);
if ((guard ^ nanozone->slot_freelist_cookie) != (uintptr_t)ptr) {
- malloc_zone_error(MALLOC_ABORT_ON_CORRUPTION, true,
+ malloc_zone_error(MALLOC_ABORT_ON_CORRUPTION, false,
"Heap corruption detected, free list is damaged at %p\n"
"*** Incorrect guard value: %lu\n", ptr, guard);
__builtin_unreachable();
@@ -2438,7 +2266,7 @@
//
// In order to avoid races, this function must be called with the
// current_block_lock for the calling context [CPU] and size class locked.
-MALLOC_NOEXPORT MALLOC_NOINLINE void *
+MALLOC_NOINLINE void *
nanov2_find_block_and_allocate(nanozonev2_t *nanozone,
nanov2_size_class_t size_class, nanov2_block_meta_t **block_metapp)
{
@@ -2512,22 +2340,14 @@
}
// Allocate a new arena and maybe a new region. To do either of those
- // things, we need to take the regions_lock. After doing so, check that the
- // state is unchanged. If it has _and_ the initial next arena is safe, just
- // assume that we might have some new space to allocate into and try again.
+ // things, we need to take the regions_lock. After doing so, check that
+ // the state is unchanged. If it has, just assume that we might have some
+ // new space to allocate into and try again.
boolean_t failed = FALSE;
arena = initial_region_next_arena;
-
- // The initial next arena may actually be the limit arena of its region, in
- // which case it's not safe to attempt to allocate from.
- bool initial_region_next_arena_is_limit =
- (arena == (nanov2_arena_t *)nanov2_region_address_for_ptr(arena));
-
_malloc_lock_lock(&nanozone->regions_lock);
- if (nanozone->current_region_next_arena == arena ||
- initial_region_next_arena_is_limit) {
- if ((void *)nanozone->current_region_next_arena >=
- nanozone->current_region_limit) {
+ if (nanozone->current_region_next_arena == arena) {
+ if ((void *)arena >= nanozone->current_region_limit) {
// Reached the end of the region. Allocate a new one, if we can.
if (nanov2_allocate_new_region(nanozone)) {
arena = nanozone->current_region_next_arena++;
@@ -2535,13 +2355,8 @@
failed = TRUE;
}
} else {
- // Assign the new arena, in the current region.
- arena = nanozone->current_region_next_arena++;
- }
-
- // Set up the guard blocks for the new arena, if requested
- if (!failed) {
- nanov2_init_guard_blocks(nanozone, arena);
+ // Assign the new arena, in the same region.
+ nanozone->current_region_next_arena = arena + 1;
}
}
_malloc_lock_unlock(&nanozone->regions_lock);
@@ -2752,7 +2567,7 @@
}
// Set up the basic_zone portion of the nanozonev2 structure
- nanozone->basic_zone.version = 12;
+ nanozone->basic_zone.version = 10;
nanozone->basic_zone.size = OS_RESOLVED_VARIANT_ADDR(nanov2_size);
nanozone->basic_zone.malloc = OS_RESOLVED_VARIANT_ADDR(nanov2_malloc);
nanozone->basic_zone.calloc = OS_RESOLVED_VARIANT_ADDR(nanov2_calloc);
@@ -2776,6 +2591,12 @@
// Prevent overwriting the function pointers in basic_zone.
mprotect(nanozone, sizeof(nanozone->basic_zone), PROT_READ);
+ // Nano V2 zone does not support MALLOC_ADD_GUARD_PAGES
+ if (debug_flags & MALLOC_ADD_GUARD_PAGES) {
+ malloc_report(ASL_LEVEL_INFO, "nano does not support guard pages\n");
+ debug_flags &= ~MALLOC_ADD_GUARD_PAGES;
+ }
+
// Set up the remainder of the nanozonev2 structure
nanozone->debug_flags = debug_flags;
nanozone->helper_zone = helper_zone;
@@ -2827,9 +2648,6 @@
nanozone->current_region_limit = region + 1;
nanozone->statistics.allocated_regions = 1;
- // Set up the guard blocks for the initial arena, if requested
- nanov2_init_guard_blocks(nanozone, (nanov2_arena_t *)region);
-
return (malloc_zone_t *)nanozone;
}
#endif // OS_VARIANT_NOTRESOLVED
@@ -2845,7 +2663,7 @@
// leak, but this is better than possibly crashing.
#if OS_VARIANT_RESOLVED
-MALLOC_NOEXPORT void *
+void *
nanov2_forked_malloc(nanozonev2_t *nanozone, size_t size)
{
// Just hand to the helper zone.
@@ -2867,7 +2685,7 @@
#if OS_VARIANT_RESOLVED
-MALLOC_NOEXPORT void
+void
nanov2_forked_free(nanozonev2_t *nanozone, void *ptr)
{
if (!ptr) {
@@ -2889,13 +2707,13 @@
/* NOTREACHED */
}
-MALLOC_NOEXPORT void
+void
nanov2_forked_free_definite_size(nanozonev2_t *nanozone, void *ptr, size_t size)
{
nanov2_forked_free(nanozone, ptr);
}
-MALLOC_NOEXPORT void *
+void *
nanov2_forked_realloc(nanozonev2_t *nanozone, void *ptr, size_t new_size)
{
// could occur through malloc_zone_realloc() path
@@ -2953,7 +2771,7 @@
#if OS_VARIANT_RESOLVED
-MALLOC_NOEXPORT void
+void
nanov2_forked_batch_free(nanozonev2_t *nanozone, void **to_be_freed,
unsigned count)
{