[23.1] Cgroups initialization cycle fix for unpatched JDK 21+35 #569
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
First, we use a separate accessor for page-alignedness as it doesn't need the more sophisticated initialization of the directMemory field. Next, ensure PhysicalMemory initialization is serialized and when it is, set directMemory to a static value so that the container code can finish initialization without introducing a cyle. The final directMemory value based on the heap size is then published to JDK code by setting the VM init level to 1. Therefore, application code would use the non-static value as the upper bound. Closes: oracle#556
oracle-contributor-agreement
bot
added
the
OCA Verified
zakkak
requested changes
Sep 13, 2023
substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PhysicalMemory.java
Outdated
Show resolved
Hide resolved
substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PhysicalMemory.java
Outdated
Show resolved
Hide resolved
zakkak
reviewed
Sep 13, 2023
...tratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/jdk/Target_jdk_internal_misc_VM.java
Outdated
Show resolved
Hide resolved
zakkak
reviewed
Sep 13, 2023
substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/heap/PhysicalMemory.java
Outdated
Show resolved
Hide resolved
Don't use volatile in DirectMemoryAccessors.isInitialized and don't use synchronization as the outcome of those races should amount to the same values.
jerboaa
force-pushed
the
cgroups_23.1_backport
branch
from
d8c648e to
f6a60b2
Compare
|
@zakkak Please take another look. Thanks! |
|
Thanks for the review! CI looks good, so I'll merge. |
zakkak
added
the
release/noteworthy-feature
|
I'll also propose this patch upstream at some point (probably next week). |
Yes, we need it for 24.0 as well, so getting it upstream would be the best. |
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Break the initialization cycle in NIO/cgroups code
First, we use a separate accessor for page-alignedness as it doesn't
need the more sophisticated initialization of the directMemory field.
Next, ensure PhysicalMemory initialization is serialized and when it is,
set directMemory to a static value so that the container code can finish
initialization without introducing a cyle. The final directMemory value
based on the heap size is then published to JDK code by setting the VM
init level to 1. Therefore, application code would use the non-static
value as the upper bound.
Closes: #556