Skip to content

Account for committed memory when VMChunkCreate fails after ChunkInit starts #320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
defmacro-jam wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Account for committed memory when VMChunkCreate fails after ChunkInit starts #320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion code/arenavm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ typedef struct VMArenaStruct { /* VM arena structure */
static void VMFree(Addr base, Size size, Pool pool);
static Size VMPurgeSpare(Arena arena, Size size);
static Size vmArenaUnmapSpare(Arena arena, Size size, Chunk filter);
static void VMChunkFinish(Chunk chunk);
DECLARE_CLASS(Arena, VMArena, AbstractArena);
static void VMCompact(Arena arena, Trace trace);
static void pageDescUnmap(VMChunk vmChunk, Index basePI, Index limitPI);
Expand Down Expand Up @@ -350,7 +351,13 @@ static Res VMChunkCreate(Chunk *chunkReturn, VMArena vmArena, Size size)
return ResOK;

failChunkInit:
VMUnmap(vm, VMBase(vm), chunkStructLimit);
/* ChunkInit leaves undoing VMChunkInit to its caller. VMChunkFinish
unmaps the chunk's overhead through vmArenaUnmap, so that
arena->committed stays equal to what is mapped, and finishes the VM.
See GitHub issue #319 <https://github.com/Ravenbrook/mps/issues/319>. */
VMChunkFinish(VMChunk2Chunk(vmChunk));
return res;

failChunkMap:
failChunkAlloc:
failBootInit:
Expand Down
6 changes: 4 additions & 2 deletions code/tract.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,9 +238,11 @@ Res ChunkInit(Chunk chunk, Arena arena, Addr base, Addr limit, Size reserved,
return ResOK;

failLandInsert:
Method(Arena, arena, chunkFinish)(chunk);
/* .no-clean: No clean-ups needed past this point for boot, as we will
discard the chunk. */
discard the chunk. The caller undoes the arena class's chunkInit, as
it must for every failure after it: calling chunkFinish here as well
made the VM arena unmap and finish the chunk's VM twice. See GitHub
issue #319 <https://github.com/Ravenbrook/mps/issues/319>. */
failClassInit:
failAllocTable:
return res;
Expand Down