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

8307156: native_thread not protected by TLH #1442

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jun 15, 2023

Unclean backport to improve JFR reliability. The original patch does not apply to JDK 17, because later refactorings during Loom integration introduced significant contextual differences. I reapplied and fixed the patch, making sure every get_native call is protected by TLH.

Additional testing:

  • Linux x86_64 fastdebug jdk/jfr
  • Linux x86_64 fastdebug tier1 tier2 tier3
  • Linux AArch64 fastdebug tier1 tier2 tier3

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-8307156: native_thread not protected by TLH (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1442

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 15, 2023

👋 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 changed the title Backport 0c6529d2d38a668f74936cca7803ca9de1a05d49 8307156: native_thread not protected by TLH Jun 15, 2023
@openjdk
Copy link

openjdk bot commented Jun 15, 2023

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

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jun 15, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 15, 2023

Webrevs

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.

Lgtm.

@openjdk
Copy link

openjdk bot commented Jun 15, 2023

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

8307156: native_thread not protected by TLH

Reviewed-by: phh, mgronlun

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

  • eed854c: 8309340: Provide sctpHandleSocketErrorWithMessage
  • f9a6075: 8302150: Speed up compiler/codegen/Test7100757.java
  • 954bbaa: 8282651: ZGC: vmTestbase/gc/ArrayJuggle/ tests fails intermittently with exit code 97
  • 30d0484: 8299962: Speed up compiler/intrinsics/unsafe/DirectByteBufferTest.java and HeapByteBufferTest.java
  • 31a7fd3: 8298921: Create a regression test for JDK-8139581
  • faafe22: 8305858: Resolve multiple definition of 'handleSocketError' when statically linking with JDK native libraries
  • 01ac9cb: 8309138: Fix container tests for jdks with symlinked conf dir

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 Jun 15, 2023
@shipilev
Copy link
Member Author

@mgronlun, if you want to look at it too?

Copy link

@mgronlun mgronlun 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. Thank you.

@shipilev
Copy link
Member Author

Tests are clean. Push approval is here. There is no relevant bug tail in mainline.

/integrate

@openjdk
Copy link

openjdk bot commented Jun 29, 2023

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

  • 295cf44: 8290464: Optimize ResourceArea zapping on ResourceMark release
  • b8a0a22: 8295812: Skip the "half float" support in LittleCMS during the build
  • 3d53b27: 8308152: PropertyDescriptor should work with overridden generic getter method
  • 95b4ddc: 8310126: C1: Missing receiver null check in Reference::get intrinsic
  • 4fd0ee5: 8305425: Thread.isAlive0 doesn't need to call into the VM
  • 8204dfa: 8289238: Refactoring changes to PassFailJFrame Test Framework
  • d27e56e: 8305950: Have -XshowSettings option display tzdata version
  • 9b89523: 8298974: Add ftcolor.c to imported freetype sources
  • 5021a07: 8287227: Shenandoah: A couple of virtual thread tests failed with iu mode even without Loom enabled.
  • b8a65e0: 8277654: Shenandoah: Don't produce new memory state in C2 LRB runtime call
  • ... and 58 more: https://git.openjdk.org/jdk17u-dev/compare/6991372a06f7e623112f1437eeaed7ad7eb6eb99...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 29, 2023

@shipilev Pushed as commit 4dd316b.

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

@shipilev shipilev deleted the JDK-8307156-jfr-missing-tlh branch July 20, 2023 11:44
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