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

8325587: Shenandoah: ShenandoahLock should allow blocking in VM #560

Closed
wants to merge 1 commit into from

Conversation

mmyxym
Copy link

@mmyxym mmyxym commented May 9, 2024

Clean backport of fixing rare long hand shake while mutator threads in heavy contention on ShenandoahLock.

Additional testing:

  • Linux aarch64 server fastdebug, hotspot/jtreg/tier1 with +UseShenandoahGC

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8325587 needs maintainer approval

Issue

  • JDK-8325587: Shenandoah: ShenandoahLock should allow blocking in VM (Bug - P3 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/560/head:pull/560
$ git checkout pull/560

Update a local copy of the PR:
$ git checkout pull/560
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/560/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 560

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/560.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 9, 2024

👋 Welcome back lmao! 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 May 9, 2024

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

8325587: Shenandoah: ShenandoahLock should allow blocking in VM

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

  • 8c00900: 8315969: compiler/rangechecks/TestRangeCheckHoistingScaledIV.java: make flagless
  • d7db5c5: 8320608: Many jtreg printing tests are missing the @printer keyword
  • 9a4da24: 8329103: assert(!thread->in_asgct()) failed during multi-mode profiling
  • 153accc: 8330849: Add test to verify memory usage with recursive locking
  • 99b50b3: 8332248: (fc) java/nio/channels/FileChannel/BlockDeviceSize.java failed with RuntimeException
  • 8c6ad58: 8317372: Refactor some NumberFormat tests to use JUnit
  • 98cfde4: 8222884: ConcurrentClassDescLookup.java times out intermittently
  • 2c3a40b: 8328647: TestGarbageCollectorMXBean.java fails with C1-only and -Xcomp
  • c0050ca: 8322062: com/sun/jdi/JdwpAllowTest.java does not performs negative testing with prefix length
  • 4be1a02: 8328697: SubMenuShowTest and SwallowKeyEvents tests stabilization
  • ... and 213 more: https://git.openjdk.org/jdk21u-dev/compare/93d091ad35cccc9c7010ae6481a61feee7830e92...master

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport 492e8bf563135d27b46fde198880e62d5f1940e8 8325587: Shenandoah: ShenandoahLock should allow blocking in VM May 9, 2024
@openjdk
Copy link

openjdk bot commented May 9, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented May 9, 2024

⚠️ @mmyxym This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label May 9, 2024
@mlbridge
Copy link

mlbridge bot commented May 9, 2024

Webrevs

@mmyxym
Copy link
Author

mmyxym commented May 9, 2024

/approval request Clean backport of fixing rare long hand shake while mutator threads in heavy contention on ShenandoahLock. Risk is quite low.

@openjdk
Copy link

openjdk bot commented May 9, 2024

@mmyxym
8325587: The approval request has been created successfully.

@openjdk openjdk bot added the approval label May 9, 2024
@GoeLin
Copy link
Member

GoeLin commented May 10, 2024

Please backport to 22 first.

@shipilev
Copy link
Member

Too early for 21u-dev anyway; there are follow-up improvements that we want to resolve first, and then backport all of them at once, so that JDK 21 is not in some intermediate state.

@RealCLanger
Copy link
Contributor

Too early for 21u-dev anyway; there are follow-up improvements that we want to resolve first, and then backport all of them at once, so that JDK 21 is not in some intermediate state.

Rampdown for 21.0.4 started. So, @shipilev, is it time now to approve this for 21.0.5 or shall we wait?

@shipilev
Copy link
Member

Rampdown for 21.0.4 started. So, @shipilev, is it time now to approve this for 21.0.5 or shall we wait?

We are working on JDK-8331411, I would instead prefer wait for that to complete and then backport both back to back.

@RealCLanger
Copy link
Contributor

Rampdown for 21.0.4 started. So, @shipilev, is it time now to approve this for 21.0.5 or shall we wait?

We are working on JDK-8331411, I would instead prefer wait for that to complete and then backport both back to back.

OK, then I'll remove the fix-request label for now. Please re-request when this is ready.

@openjdk openjdk bot removed the approval label May 29, 2024
@shipilev
Copy link
Member

Hey @mmyxym! I think we are completing our rework of Shenandoah lock, and can therefore proceed with building out the backports. Feel free to re-request this one. We will pile on more backports on top of it.

@mmyxym
Copy link
Author

mmyxym commented Jun 26, 2024

/approval request Clean backport of fixing rare long hand shake while mutator threads in heavy contention on ShenandoahLock. Risk is quite low.

@openjdk
Copy link

openjdk bot commented Jun 26, 2024

@mmyxym
8325587: The approval request was already up to date.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 26, 2024
@mmyxym
Copy link
Author

mmyxym commented Jun 26, 2024

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 26, 2024
@openjdk
Copy link

openjdk bot commented Jun 26, 2024

@mmyxym
Your change (at version cb87b77) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 26, 2024

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

  • 03a7176: 8333099: Missing check for is_LoadVector in StoreNode::Identity
  • f9f11d7: 8334867: Add back assertion from JDK-8325494
  • 65cf18a: 8328896: Fontmetrics for large Fonts has zero width
  • e257ae5: 8051959: Add thread and timestamp options to java.security.debug system property
  • 4dceb87: 8321176: [Screencast] make a second attempt on screencast failure
  • 8c00900: 8315969: compiler/rangechecks/TestRangeCheckHoistingScaledIV.java: make flagless
  • d7db5c5: 8320608: Many jtreg printing tests are missing the @printer keyword
  • 9a4da24: 8329103: assert(!thread->in_asgct()) failed during multi-mode profiling
  • 153accc: 8330849: Add test to verify memory usage with recursive locking
  • 99b50b3: 8332248: (fc) java/nio/channels/FileChannel/BlockDeviceSize.java failed with RuntimeException
  • ... and 218 more: https://git.openjdk.org/jdk21u-dev/compare/93d091ad35cccc9c7010ae6481a61feee7830e92...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 26, 2024
@openjdk openjdk bot closed this Jun 26, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jun 26, 2024
@openjdk
Copy link

openjdk bot commented Jun 26, 2024

@shipilev @mmyxym Pushed as commit ad5e16f.

💡 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
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants