Skip to content
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

JDK-8266802: Shenandoah: Round up region size to page size unconditionally #3945

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented May 10, 2021

Since JDK-8265239, runtime/os/TestTracePageSizes.java fails with Shenandoah like this:

# Internal Error (/home/buildbot/worker/test-jdkX-linux/build/src/hotspot/share/gc/shenandoah/shenandoahHeap.cpp:156), pid=55712, tid=55720
# assert(_num_regions == (max_byte_size / reg_size_bytes)) failed: Must match

This is because Shenandoah region sizes are rounded up to page size only when ShenandoahUncommit is true. In the failing test configuration, ShenandoahUncommit is false, because Xmx == Xms.

Additional testing:

  • New regression test, now passes
  • tier1 with Shenandoah

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8266802: Shenandoah: Round up region size to page size unconditionally

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/3945/head:pull/3945
$ git checkout pull/3945

Update a local copy of the PR:
$ git checkout pull/3945
$ git pull https://git.openjdk.java.net/jdk pull/3945/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3945

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/3945.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 10, 2021

👋 Welcome back shade! 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 openjdk bot added the rfr Pull request is ready for review label May 10, 2021
@openjdk
Copy link

openjdk bot commented May 10, 2021

@shipilev The following labels will be automatically applied to this pull request:

  • hotspot-gc
  • shenandoah

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

@openjdk openjdk bot added hotspot-gc hotspot-gc-dev@openjdk.org shenandoah shenandoah-dev@openjdk.org labels May 10, 2021
@mlbridge
Copy link

mlbridge bot commented May 10, 2021

Webrevs

@zhengyu123
Copy link
Contributor

I filed JDK-8266740, that is related. I believe we should defer region count calculation after heap size adjustment to avoid miscalculating the value. Do you think we should consolidate the 2 CRs?

@zhengyu123
Copy link
Contributor

I filed JDK-8266740, that is related. I believe we should defer region count calculation after heap size adjustment to avoid miscalculating the value. Do you think we should consolidate the 2 CRs?

Never mind. Your change looks good. I will make JDK-8266740 a dup.

Copy link
Contributor

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

@openjdk
Copy link

openjdk bot commented May 10, 2021

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

8266802: Shenandoah: Round up region size to page size unconditionally

Reviewed-by: zgu

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 4 new commits pushed to the master branch:

  • de78431: 8241502: C2: Migrate x86_64.ad to MacroAssembler
  • c8b7447: 8266603: jpackage: Add missing copyright file in Java runtime .deb installers
  • c494efc: 8266774: System property values for stdout/err on Windows UTF-8
  • 25d99e5: 8266330: itableMethodEntry::initialize() asserts with archived old classes

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 ready Pull request is ready to be integrated label May 10, 2021
@shipilev
Copy link
Member Author

I filed JDK-8266740, that is related. I believe we should defer region count calculation after heap size adjustment to avoid miscalculating the value. Do you think we should consolidate the 2 CRs?

Oh, I have not seen that. Yes, I reckon doing the way this PR approaches it is cleaner. I'll integrate once tests are green.

@shipilev
Copy link
Member Author

/integrate

@openjdk openjdk bot closed this May 10, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 10, 2021
@openjdk
Copy link

openjdk bot commented May 10, 2021

@shipilev Since your change was applied there have been 7 commits pushed to the master branch:

  • 8851cb6: 8266779: Use instead of ZERO_WIDTH_SPACE
  • 0cc7833: 8265208: [JEP-356] : SplittableRandom and SplittableGenerators - splits() methods does not throw NullPointerException when source is null
  • f78440a: 8266440: Shenandoah: TestReferenceShortcutCycle.java test failed on AArch64
  • de78431: 8241502: C2: Migrate x86_64.ad to MacroAssembler
  • c8b7447: 8266603: jpackage: Add missing copyright file in Java runtime .deb installers
  • c494efc: 8266774: System property values for stdout/err on Windows UTF-8
  • 25d99e5: 8266330: itableMethodEntry::initialize() asserts with archived old classes

Your commit was automatically rebased without conflicts.

Pushed as commit e5d3ee3.

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

@shipilev shipilev deleted the JDK-8266802-shenandoah-region-size branch May 11, 2021 07:18
@zhengyu123
Copy link
Contributor

/backport jdk16u

@openjdk
Copy link

openjdk bot commented May 20, 2021

@zhengyu123 Unknown command backport - for a list of valid commands use /help.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-gc hotspot-gc-dev@openjdk.org integrated Pull request has been integrated shenandoah shenandoah-dev@openjdk.org
2 participants