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

8327036: [macosx-aarch64] SIGBUS in MarkActivationClosure::do_code_blob reached from Unsafe_CopySwapMemory0 #305

Conversation

reinrich
Copy link
Member

@reinrich reinrich commented Feb 29, 2024

This changes JVM_ENTRY_FROM_LEAF to switch to WXWrite before transitioning to the vm.
This is needed on macos/aarch64 because there it is an invariant of vm coding that a thread is in WXWrite mode.

Without we can get similar crashes as described in the bug report when writing to the code cache.
Note that in jdk21 we cannot get the very same crash because the nmethod sweeper was removed in jdk20 with JDK-8290025.

Also test/jdk/sun/nio/cs/FindDecoderBugs.java fails with an assertion if the vm option -XX:+AssertWXAtThreadSync is set.

Testing:
test/jdk/sun/nio/cs/FindDecoderBugs.java with -XX:+AssertWXAtThreadSync

The fix passed our CI testing: JTReg tests: tier1-4 of hotspot and jdk. All of Langtools and jaxp. JCK, SPECjvm2008, SPECjbb2015, Renaissance Suite, and SAP specific tests (also with ParallelGC).
Testing was done with fastdebug builds on the main platforms and also on Linux/PPC64le.


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-8327036 needs maintainer approval

Issue

  • JDK-8327036: [macosx-aarch64] SIGBUS in MarkActivationClosure::do_code_blob reached from Unsafe_CopySwapMemory0 (Bug - P3 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 305

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 29, 2024

👋 Welcome back rrich! 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.

@reinrich
Copy link
Member Author

reinrich commented Mar 1, 2024

Riscv64 error in GHA is unrelated.

@reinrich reinrich marked this pull request as ready for review March 1, 2024 07:14
@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 1, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 1, 2024

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr 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 Mar 1, 2024

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

@theRealAph
Copy link

So that adds a WX transition to every JVM_ENTRY_FROM_LEAF? I think we need to think about the cost of that. Isn't it better to do the transition when we actually need it?

@TheRealMDoerr
Copy link
Contributor

So that adds a WX transition to every JVM_ENTRY_FROM_LEAF? I think we need to think about the cost of that. Isn't it better to do the transition when we actually need it?

There is only one usage.

@reinrich
Copy link
Member Author

reinrich commented Mar 1, 2024

So that adds a WX transition to every JVM_ENTRY_FROM_LEAF? I think we need to think about the cost of that. Isn't it better to do the transition when we actually need it?

There are no usages of JVM_ENTRY_FROM_LEAF where the WX transition already happened. So I think it is safest to add it to JVM_ENTRY_FROM_LEAF.

@openjdk openjdk bot added the approval label Mar 4, 2024
@openjdk
Copy link

openjdk bot commented Mar 6, 2024

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

8327036: [macosx-aarch64] SIGBUS in MarkActivationClosure::do_code_blob reached from Unsafe_CopySwapMemory0

Reviewed-by: mdoerr

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

  • 930344a: Merge
  • 29bf21f: 8322750: Test "api/java_awt/interactive/SystemTrayTests.html" failed because A blue ball icon is added outside of the system tray
  • 4244cb0: 8306040: HttpResponseInputStream.available() returns 1 on empty stream
  • d6ad625: 8324648: Avoid NoSuchMethodError when instantiating NativePRNG
  • 2d62854: 8320343: Generate GIF images for AbstractButton/5049549/bug5049549.java
  • fdbed07: 8325862: set -XX:+ErrorFileToStderr when executing java in containers for some container related jtreg tests
  • dbcce04: 8323519: Add applications/ctw/modules to Hotspot tiered testing
  • 500d85a: 8318580: "javax/swing/MultiMonitor/MultimonVImage.java failing with Error. Can't find library: /open/test/jdk/java/awt/regtesthelpers" after JDK-8316053
  • ee6445c: 8323210: Update the usage of cmsFLAGS_COPY_ALPHA
  • 94634c0: 8313394: Array Elements in OldObjectSample event has the incorrect description
  • ... and 2 more: https://git.openjdk.org/jdk21u-dev/compare/76ebcc19d7d4a3eb42aa9b6bbaa169652b94b157...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Mar 6, 2024
@reinrich
Copy link
Member Author

reinrich commented Mar 6, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 6, 2024

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

  • 930344a: Merge
  • 29bf21f: 8322750: Test "api/java_awt/interactive/SystemTrayTests.html" failed because A blue ball icon is added outside of the system tray
  • 4244cb0: 8306040: HttpResponseInputStream.available() returns 1 on empty stream
  • d6ad625: 8324648: Avoid NoSuchMethodError when instantiating NativePRNG
  • 2d62854: 8320343: Generate GIF images for AbstractButton/5049549/bug5049549.java
  • fdbed07: 8325862: set -XX:+ErrorFileToStderr when executing java in containers for some container related jtreg tests
  • dbcce04: 8323519: Add applications/ctw/modules to Hotspot tiered testing
  • 500d85a: 8318580: "javax/swing/MultiMonitor/MultimonVImage.java failing with Error. Can't find library: /open/test/jdk/java/awt/regtesthelpers" after JDK-8316053
  • ee6445c: 8323210: Update the usage of cmsFLAGS_COPY_ALPHA
  • 94634c0: 8313394: Array Elements in OldObjectSample event has the incorrect description
  • ... and 2 more: https://git.openjdk.org/jdk21u-dev/compare/76ebcc19d7d4a3eb42aa9b6bbaa169652b94b157...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 6, 2024

@reinrich Pushed as commit ad1d324.

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

@reinrich
Copy link
Member Author

reinrich commented Mar 6, 2024

/backport jdk17u-dev

@openjdk
Copy link

openjdk bot commented Mar 6, 2024

@reinrich the backport was successfully created on the branch backport-reinrich-ad1d3248 in my personal fork of openjdk/jdk17u-dev. To create a pull request with this backport targeting openjdk/jdk17u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ad1d3248 from the openjdk/jdk21u-dev repository.

The commit being backported was authored by Richard Reingruber on 6 Mar 2024 and was reviewed by Martin Doerr.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk17u-dev:

$ git fetch https://github.com/openjdk-bots/jdk17u-dev.git backport-reinrich-ad1d3248:backport-reinrich-ad1d3248
$ git checkout backport-reinrich-ad1d3248
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk17u-dev.git backport-reinrich-ad1d3248

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants