Skip to content

[GR-67472] Fix options ReservedAddressSpaceSize and MaxReservedAddressSpaceSize. #11687

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

Merged
merged 1 commit into from
Jul 17, 2025
Merged

[GR-67472] Fix options ReservedAddressSpaceSize and MaxReservedAddressSpaceSize. #11687

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: 6 additions & 3 deletions ....genscavenge/src/com/oracle/svm/core/genscavenge/AddressRangeCommittedMemoryProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,16 @@ public AddressRangeCommittedMemoryProvider() {
@Override
@Uninterruptible(reason = "Still being initialized.")
public int initialize(WordPointer heapBasePointer, IsolateArguments arguments) {
UnsignedWord maxAddressSpaceSize = ReferenceAccess.singleton().getMaxAddressSpaceSize();
UnsignedWord reserved = Word.unsigned(IsolateArgumentAccess.readLong(arguments, IsolateArgumentParser.getOptionIndex(SubstrateGCOptions.ReservedAddressSpaceSize)));
if (reserved.equal(0)) {
/* Reserve a 32 GB address space, except if a larger heap size was specified. */
/*
* Reserve a 32 GB address space, except if a larger heap size was specified, or if the
* maximum address space size is less than that.
*/
UnsignedWord maxHeapSize = Word.unsigned(IsolateArgumentAccess.readLong(arguments, IsolateArgumentParser.getOptionIndex(SubstrateGCOptions.MaxHeapSize)));
reserved = UnsignedUtils.clamp(maxHeapSize, Word.unsigned(MIN_RESERVED_ADDRESS_SPACE_SIZE), maxAddressSpaceSize);
reserved = UnsignedUtils.max(maxHeapSize, Word.unsigned(MIN_RESERVED_ADDRESS_SPACE_SIZE));
}
reserved = UnsignedUtils.min(reserved, ReferenceAccess.singleton().getMaxAddressSpaceSize());

UnsignedWord alignment = unsigned(Heap.getHeap().getPreferredAddressSpaceAlignment());
WordPointer beginOut = StackValue.get(WordPointer.class);
Expand Down
9 changes: 8 additions & 1 deletion substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/IsolateArgumentParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,14 @@ protected void initialize(IsolateArguments arguments, CEntryPointCreateIsolatePa
arguments.setIsCompilationIsolate(false);
}

writeLong(arguments, getOptionIndex(SubstrateGCOptions.ReservedAddressSpaceSize), parameters.reservedSpaceSize().rawValue());
/*
* If a value for ReservedAddressSpaceSize is set in the isolate parameters, then this value
* has a higher priority than a default value that was set at build-time.
*/
UnsignedWord reservedAddressSpaceSize = parameters.reservedSpaceSize();
if (reservedAddressSpaceSize.notEqual(0)) {
writeLong(arguments, getOptionIndex(SubstrateGCOptions.ReservedAddressSpaceSize), reservedAddressSpaceSize.rawValue());
}
}

@Uninterruptible(reason = CALLED_FROM_UNINTERRUPTIBLE_CODE, mayBeInlined = true)
Expand Down
Loading