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

8290780: AArch64: Crash in c2 nmethod running RunThese30M.java #9615

Closed
wants to merge 4 commits into from

Conversation

theRealAph
Copy link
Contributor

@theRealAph theRealAph commented Jul 22, 2022

Fix that masks the offsets used when adrp() is passed an unreachable destination. This reloc allows e.g. adrp; movk; ldr to access anywhere in the address space.

#  SIGSEGV (0xb) at pc=0x0000ffff55964edc, pid=2843096, tid=2850366
#
# JRE version: Java(TM) SE Runtime Environment (20.0+7) (fastdebug build 20-ea+7-377)
# Java VM: Java HotSpot(TM) 64-Bit Server VM (fastdebug 20-ea+7-377, compiled mode, sharing, compressed oops, compressed class ptrs, g1 gc, linux-aarch64)
# Problematic frame:
# J 91101 c2 java.io.ObjectOutputStream.enableReplaceObject(Z)Z java.base@20-ea (47 bytes) @ 0x0000ffff55964edc [0x0000ffff55964e80+0x000000000000005c]

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-8290780: AArch64: Crash in c2 nmethod running RunThese30M.java

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9615/head:pull/9615
$ git checkout pull/9615

Update a local copy of the PR:
$ git checkout pull/9615
$ git pull https://git.openjdk.org/jdk pull/9615/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9615

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9615.diff

@theRealAph theRealAph changed the title JDK-8290780: AArch64: Crash in c2 nmethod running RunThese30M.java 8290780: AArch64: Crash in c2 nmethod running RunThese30M.java Jul 22, 2022
@bridgekeeper
Copy link

bridgekeeper bot commented Jul 22, 2022

👋 Welcome back aph! 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 Jul 22, 2022
@openjdk
Copy link

openjdk bot commented Jul 22, 2022

@theRealAph The following label will be automatically applied to this pull request:

  • hotspot

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

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Jul 22, 2022
@mlbridge
Copy link

mlbridge bot commented Jul 22, 2022

Webrevs

Copy link
Member

@dean-long dean-long 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. To detect bad addresses at emit time, you could add some asserts that check is_valid_AArch64_address(target) in _adrp() and the patch code. Also maybe check after patching that the desired value was rewritten using target_addr_for_insn().

@openjdk
Copy link

openjdk bot commented Jul 22, 2022

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

8290780: AArch64: Crash in c2 nmethod running RunThese30M.java

Reviewed-by: dlong

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 18 new commits pushed to 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 Jul 22, 2022
@theRealAph
Copy link
Contributor Author

Looks good. To detect bad addresses at emit time, you could add some asserts that check is_valid_AArch64_address(target) in _adrp() and the patch code.

I'll look at that.

Also maybe check after patching that the desired value was rewritten using target_addr_for_insn().

I already do that in verify().

Thanks.

@theRealAph
Copy link
Contributor Author

Looks good. To detect bad addresses at emit time, you could add some asserts that check is_valid_AArch64_address(target) in _adrp() and the patch code.

I'll look at that.

I'm not going to do that because I think I remember in some cases we have generated a fake "pointer" which is used as a base address. Such a value may not be a legal address. I don't know that there's anywhere we do that now, but it it is a reasonable-enough thing to do.

@theRealAph
Copy link
Contributor Author

theRealAph commented Jul 25, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jul 25, 2022

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

  • b17269a: 8290959: Consistently use "grey" instead of "gray" in GC code
  • 350808a: 8290459: Remove unused GCCause enums
  • d0c365a: 8170794: [macosx] Error when using setDesktopManager on a JDesktopPane on MacOS X with Look and Feel Aqua
  • 80dc6ce: 8290730: compiler/vectorization/TestAutoVecIntMinMax.java failed with "IRViolationException: There were one or multiple IR rule failures."
  • 228e8e9: 8290700: Optimize AArch64 nmethod entry barriers
  • 852e71d: 8290870: NMT: Increase MallocSiteTable size and allocate it only when needed
  • 0599a05: 8290900: Build failure with Clang 14+ due to function warning attribute
  • 987656d: 8289471: Issue in Initialization of keys in ErrorMsg.java and XPATHErrorResources.java
  • 2660a92: 8290893: ProblemList java/lang/ClassLoader/loadLibraryUnload/LoadLibraryUnload
  • ef8486a: 8286270: [java.desktop] Replace color search in XColors with a switch statement
  • ... and 17 more: https://git.openjdk.org/jdk/compare/799a2c844d904b675abd324ab09cbda7faf70b0f...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jul 25, 2022

@theRealAph Pushed as commit 1e270ea.

💡 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
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
3 participants