Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 21:01:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1546442 - Leading guard pages for normal allocations. r=glandium

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D28516
This commit is contained in:
Gian-Carlo Pascutto 2021-11-26 11:46:25 +00:00
parent 4354146592
commit b936d4f576
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
memory/build/mozjemalloc.cpp
View File

@ -541,13 +541,13 @@ DEFINE_GLOBAL(size_t) gPageSizeMask = gPageSize - 1;
// Number of pages in a chunk. // Number of pages in a chunk.
DEFINE_GLOBAL(size_t) gChunkNumPages = kChunkSize >> gPageSize2Pow; DEFINE_GLOBAL(size_t) gChunkNumPages = kChunkSize >> gPageSize2Pow;
// Number of pages necessary for a chunk header. // Number of pages necessary for a chunk header plus a guard page.
DEFINE_GLOBAL(size_t) DEFINE_GLOBAL(size_t)
gChunkHeaderNumPages = gChunkHeaderNumPages =
((sizeof(arena_chunk_t) + sizeof(arena_chunk_map_t) * (gChunkNumPages - 1) + 1 + (((sizeof(arena_chunk_t) +
gPageSizeMask) & sizeof(arena_chunk_map_t) * (gChunkNumPages - 1) + gPageSizeMask) &
~gPageSizeMask) >> ~gPageSizeMask) >>
gPageSize2Pow; gPageSize2Pow);
// One chunk, minus the header, minus a guard page // One chunk, minus the header, minus a guard page
DEFINE_GLOBAL(size_t) DEFINE_GLOBAL(size_t)
@ -2469,31 +2469,40 @@ void arena_t::InitChunk(arena_chunk_t* aChunk, bool aZeroed) {
aChunk->ndirty = 0; aChunk->ndirty = 0;
// Initialize the map to contain one maximal free untouched run. // Initialize the map to contain one maximal free untouched run.
#ifdef MALLOC_DECOMMIT
arena_run_t* run = (arena_run_t*)(uintptr_t(aChunk) + arena_run_t* run = (arena_run_t*)(uintptr_t(aChunk) +
(gChunkHeaderNumPages << gPageSize2Pow)); (gChunkHeaderNumPages << gPageSize2Pow));
#endif
for (i = 0; i < gChunkHeaderNumPages; i++) { // Clear the bits for the real header pages.
for (i = 0; i < gChunkHeaderNumPages - 1; i++) {
aChunk->map[i].bits = 0; aChunk->map[i].bits = 0;
} }
aChunk->map[i].bits = gMaxLargeClass | flags; // Mark the leading guard page (last header page) as decommitted.
for (i++; i < gChunkNumPages - 2; i++) { aChunk->map[i++].bits = CHUNK_MAP_DECOMMITTED;
// Mark the area usable for runs as available, note size at start and end
aChunk->map[i++].bits = gMaxLargeClass | flags;
for (; i < gChunkNumPages - 2; i++) {
aChunk->map[i].bits = flags; aChunk->map[i].bits = flags;
} }
aChunk->map[gChunkNumPages - 2].bits = gMaxLargeClass | flags; aChunk->map[gChunkNumPages - 2].bits = gMaxLargeClass | flags;
// Mark the guard page as decommited.
// Mark the trailing guard page as decommitted.
aChunk->map[gChunkNumPages - 1].bits = CHUNK_MAP_DECOMMITTED; aChunk->map[gChunkNumPages - 1].bits = CHUNK_MAP_DECOMMITTED;
#ifdef MALLOC_DECOMMIT #ifdef MALLOC_DECOMMIT
// Start out decommitted, in order to force a closer correspondence // Start out decommitted, in order to force a closer correspondence
// between dirty pages and committed untouched pages. // between dirty pages and committed untouched pages. This includes
pages_decommit(run, gMaxLargeClass + gPageSize); // leading and trailing guard pages.
pages_decommit((void*)(uintptr_t(run) - gPageSize),
gMaxLargeClass + 2 * gPageSize);
#else #else
// Only decommit the last page as a guard. // Decommit the last header page (=leading page) as a guard.
pages_decommit((void*)(uintptr_t(run) - gPageSize), gPageSize);
// Decommit the last page as a guard.
pages_decommit((void*)(uintptr_t(aChunk) + kChunkSize - gPageSize), pages_decommit((void*)(uintptr_t(aChunk) + kChunkSize - gPageSize),
gPageSize); gPageSize);
#endif #endif
mStats.committed += gChunkHeaderNumPages; mStats.committed += gChunkHeaderNumPages;
// Insert the run into the tree of available runs. // Insert the run into the tree of available runs.