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 #2797

Closed

Conversation

pengxiaolong
Copy link
Contributor

@pengxiaolong pengxiaolong commented Aug 13, 2024

Hi,
This PR is a Backport of JDK-8325587: Shenandoah: ShenandoahLock should allow blocking in VM, the original commit was authored by Aleksey Shipilev on 21 Feb 2024 and was reviewed by Robbin Ehn and Roman Kennke, and already backported to jdk21.
It is not a clean backport for JDK17 due to code style change(NULL -> nullptr) and thread header file and API changes.
This is the first backport of a series of improvements for ShenandoahLock to improve contention issue which we I have seem in our customer's production load running with JDK17, here are the series of improvements I'm going to backport to JDK17:

Bug Title
JDK-8325587 ShenandoahLock should allow blocking in VM
JDK-8331405 Optimize ShenandoahLock with TTAS
JDK-8331411 Reconsider spinning duration in ShenandoahLock
JDK-8335904 Fix invalid comment in ShenandoahLock

Best,
Xiaolong.

Additional tests:

  • hotspot_gc_shenandoah
  • Linux x86_64 server fastdebug, all passes with -XX:+UseShenandoahGC

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
  • JDK-8325587 needs maintainer approval

Issue

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2797

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 13, 2024

👋 Welcome back xpeng! 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 Aug 13, 2024

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

Reviewed-by: shade, phh
Backport-of: 492e8bf563135d27b46fde198880e62d5f1940e8

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

  • 90b0fb0: 8332589: ubsan: unix/native/libjava/ProcessImpl_md.c:562:5: runtime error: null pointer passed as argument 2, which is declared to never be null
  • 9150f50: 8337780: RISC-V: C2: Change C calling convention for sp to NS
  • b2c92fd: 8319817: Charset constructor should make defensive copy of aliases
  • 42b5e12: 8287003: InputStreamReader::read() can return zero despite writing a char in the buffer
  • 3ddae29: 8331789: ubsan: deoptimization.cpp:403:29: runtime error: load of value 208, which is not a valid value for type 'bool'
  • acfce69: 8332904: ubsan ppc64le: c1_LIRGenerator_ppc.cpp:581:21: runtime error: signed integer overflow: 9223372036854775807 + 1 cannot be represented in type 'long int'
  • a9d755c: 8336342: Fix known X11 library locations in sysroot
  • 7374e7d: 8336343: Add more known sysroot library locations for ALSA
  • fd38e86: 8338286: GHA: Demote x86_32 to hotspot build only
  • ada58fa: 8336854: CAInterop.java#actalisauthenticationrootca conflicted with /manual and /timeout
  • ... and 34 more: https://git.openjdk.org/jdk17u-dev/compare/2e9152dc268ee946680f274c9e6006edfb8d0398...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. Possible candidates are the reviewers of this PR (@phohensee, @shipilev) but any other Committer may sponsor as well.

➡️ 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 Aug 13, 2024
@openjdk
Copy link

openjdk bot commented Aug 13, 2024

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

@openjdk openjdk bot added the backport label Aug 13, 2024
@pengxiaolong pengxiaolong marked this pull request as ready for review August 13, 2024 17:18
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 13, 2024
@mlbridge
Copy link

mlbridge bot commented Aug 13, 2024

Webrevs

@phohensee
Copy link
Member

Outline the backport series you're proposing?

@pengxiaolong
Copy link
Contributor Author

Outline the backport series you're proposing?

Thanks Paul, I have provided the list of bugs I'm going to backport.

Copy link
Member

@phohensee phohensee left a comment

Choose a reason for hiding this comment

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

Thank you. Lgtm.

@openjdk
Copy link

openjdk bot commented Aug 15, 2024

⚠️ @pengxiaolong 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.

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks fine, with minor nit.

src/hotspot/share/gc/shenandoah/shenandoahLock.cpp Outdated Show resolved Hide resolved
@pengxiaolong
Copy link
Contributor Author

/approval request Backport of 8325587: Shenandoah: ShenandoahLock should allow blocking in VM, not a clean backport, fixed the conflicts and code style issues, ran hotspot_gc_shenandoah test suite and all tests with -XX:+UseShenandoahGC; overall risk should be low.

@openjdk
Copy link

openjdk bot commented Aug 19, 2024

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

@openjdk openjdk bot added the approval label Aug 19, 2024
@shipilev
Copy link
Member

I agree it is a good time to bring all 4 backports into JDK 17u.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Aug 29, 2024
@pengxiaolong
Copy link
Contributor Author

Thanks all for the reviews!

/integrate

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

openjdk bot commented Sep 3, 2024

@pengxiaolong
Your change (at version 22086ff) is now ready to be sponsored by a Committer.

@shipilev
Copy link
Member

shipilev commented Sep 3, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 3, 2024

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

  • 90b0fb0: 8332589: ubsan: unix/native/libjava/ProcessImpl_md.c:562:5: runtime error: null pointer passed as argument 2, which is declared to never be null
  • 9150f50: 8337780: RISC-V: C2: Change C calling convention for sp to NS
  • b2c92fd: 8319817: Charset constructor should make defensive copy of aliases
  • 42b5e12: 8287003: InputStreamReader::read() can return zero despite writing a char in the buffer
  • 3ddae29: 8331789: ubsan: deoptimization.cpp:403:29: runtime error: load of value 208, which is not a valid value for type 'bool'
  • acfce69: 8332904: ubsan ppc64le: c1_LIRGenerator_ppc.cpp:581:21: runtime error: signed integer overflow: 9223372036854775807 + 1 cannot be represented in type 'long int'
  • a9d755c: 8336342: Fix known X11 library locations in sysroot
  • 7374e7d: 8336343: Add more known sysroot library locations for ALSA
  • fd38e86: 8338286: GHA: Demote x86_32 to hotspot build only
  • ada58fa: 8336854: CAInterop.java#actalisauthenticationrootca conflicted with /manual and /timeout
  • ... and 34 more: https://git.openjdk.org/jdk17u-dev/compare/2e9152dc268ee946680f274c9e6006edfb8d0398...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 3, 2024
@openjdk openjdk bot closed this Sep 3, 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 Sep 3, 2024
@openjdk
Copy link

openjdk bot commented Sep 3, 2024

@shipilev @pengxiaolong Pushed as commit dc69e05.

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

Successfully merging this pull request may close these issues.

3 participants