8354358: ZGC: ZPartition::prime handle discontiguous reservations correctly#24589
8354358: ZGC: ZPartition::prime handle discontiguous reservations correctly#24589xmas92 wants to merge 3 commits intoopenjdk:masterfrom
Conversation
|
👋 Welcome back aboldtch! A progress list of the required criteria for merging this PR into |
|
@xmas92 This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 27 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
Webrevs
|
stefank
left a comment
There was a problem hiding this comment.
Looks good.
As a follow-up, we might want to move the pre-touching so that we don't start and stop threads multiple times.
| const ZVirtualMemory vmem = claim_virtual(size); | ||
| const size_t claimed_size = claim_virtual(size, &vmems); | ||
|
|
||
| // Each partition must have at least size total vmems available when priming. |
There was a problem hiding this comment.
Maybe something like "The partition must have size available in virtual memory when priming"? I'm reading this as the number of vmems, not the size of them combined.
jsikstro
left a comment
There was a problem hiding this comment.
Looks good. As you say, this is nicely implemented with features from the Mapped Cache.
|
Thanks for the reviews. |
|
Going to push as commit 97e1075.
Your commit was automatically rebased without conflicts. |
Prior to JDK-8350441 the VM would not have started if we received a discontiguous heap reservation with all reservations smaller than the inital heap capacity. Now we crash because
ZPartition::primedoes not take this into account.However in contrast to the page cache, the mapped cache makes it trivial to support this scenario. So I propose fixing
ZPartition::primeto handle any discontiguous heap reservation.Can be provoked in a debug build by using ZForceDiscontiguousHeapReservations > 16
java -XX:+UseZGC -XX:ZForceDiscontiguousHeapReservations=17 -Xmx128m -Xms128m --versionCurrently running this through testing.
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24589/head:pull/24589$ git checkout pull/24589Update a local copy of the PR:
$ git checkout pull/24589$ git pull https://git.openjdk.org/jdk.git pull/24589/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 24589View PR using the GUI difftool:
$ git pr show -t 24589Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24589.diff
Using Webrev
Link to Webrev Comment