Skip to content

8354358: ZGC: ZPartition::prime handle discontiguous reservations correctly #24589

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.

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

Closed
wants to merge 3 commits into from

Conversation

xmas92
Copy link
Member

@xmas92 xmas92 commented Apr 11, 2025

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::prime does 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::prime to handle any discontiguous heap reservation.

Can be provoked in a debug build by using ZForceDiscontiguousHeapReservations > 16
java -XX:+UseZGC -XX:ZForceDiscontiguousHeapReservations=17 -Xmx128m -Xms128m --version

Currently running this through testing.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8354358: ZGC: ZPartition::prime handle discontiguous reservations correctly (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/24589/head:pull/24589
$ git checkout pull/24589

Update a local copy of the PR:
$ git checkout pull/24589
$ git pull https://git.openjdk.org/jdk.git pull/24589/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 24589

View PR using the GUI difftool:
$ git pr show -t 24589

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/24589.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 11, 2025

👋 Welcome back aboldtch! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Apr 11, 2025

@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:

8354358: ZGC: ZPartition::prime handle discontiguous reservations correctly

Reviewed-by: stefank, jsikstro, eosterlund

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 master branch:

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Apr 11, 2025
@openjdk
Copy link

openjdk bot commented Apr 11, 2025

@xmas92 The following label will be automatically applied to this pull request:

  • hotspot-gc

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@mlbridge
Copy link

mlbridge bot commented Apr 11, 2025

Webrevs

Copy link
Member

@stefank stefank left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 11, 2025
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.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Apr 11, 2025
Copy link
Member

@jsikstro jsikstro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. As you say, this is nicely implemented with features from the Mapped Cache.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 11, 2025
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Apr 14, 2025
@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 14, 2025
@xmas92
Copy link
Member Author

xmas92 commented Apr 14, 2025

Thanks for the reviews.
/integrate

@openjdk
Copy link

openjdk bot commented Apr 14, 2025

Going to push as commit 97e1075.
Since your change was applied there have been 27 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 14, 2025
@openjdk openjdk bot closed this Apr 14, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 14, 2025
@openjdk
Copy link

openjdk bot commented Apr 14, 2025

@xmas92 Pushed as commit 97e1075.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants