Skip to content

Conversation

@zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Jun 1, 2022

Please review this trivial patch to ensure disarm value offset is less than 128.

At least on x86_64, nmethod entry barrier encodes disarmed value offset as disp8 immed, overflowing the value can result crashes, see JDK-8244420 for details.

Test:

  • jdk_loom and hotspot_loom on Linux x86_64

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-8287686: Add assertion to ensure that disarm value offset < 128

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8977/head:pull/8977
$ git checkout pull/8977

Update a local copy of the PR:
$ git checkout pull/8977
$ git pull https://git.openjdk.java.net/jdk pull/8977/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8977

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8977.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 1, 2022

👋 Welcome back zgu! 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 Jun 1, 2022

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

  • hotspot-runtime

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-runtime hotspot-runtime-dev@openjdk.org label Jun 1, 2022
@zhengyu123
Copy link
Contributor Author

/label add hotspot-gc
/label remove hotspot-runtime

@zhengyu123 zhengyu123 marked this pull request as ready for review June 2, 2022 16:23
@openjdk openjdk bot added rfr Pull request is ready for review hotspot-gc hotspot-gc-dev@openjdk.org labels Jun 2, 2022
@openjdk
Copy link

openjdk bot commented Jun 2, 2022

@zhengyu123
The hotspot-gc label was successfully added.

@openjdk openjdk bot removed the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jun 2, 2022
@openjdk
Copy link

openjdk bot commented Jun 2, 2022

@zhengyu123
The hotspot-runtime label was successfully removed.

@mlbridge
Copy link

mlbridge bot commented Jun 2, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 3, 2022

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

8287686: Add assertion to ensure that disarm value offset < 128

Reviewed-by: tschatzl, shade

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

  • 407abf5: 8233477: [Win LAF]The tooltip doesn't display correctly in Win LAF
  • 625821d: 8287661: Fix and improve BitMap::print_on(outputStream*)
  • b544b8b: 8276789: Support C++ lambda in ResourceHashtable::iterate
  • ba9ee8c: 8287748: Fix issues in java.lang.foreign package javadoc
  • deb0653: 8287337: SnippetUtils should throw exceptions if snippets not found
  • cbaeb00: 8287600: AA Ovals not rendered under metal
  • 2776ff3: 8276266: Clean up incorrect client-libs ProblemList.txt entries
  • 409157d: 8287125: [macos] Multiple jpackage tests fail/timeout on same host
  • b5a646e: 8287425: Remove unnecessary register push for MacroAssembler::check_klass_subtype_slow_path
  • 26048ea: 8287695: Use String.contains() instead of String.indexOf() in jdk.hotspot.agent
  • ... and 40 more: https://git.openjdk.java.net/jdk/compare/8db5247ebc827bf4a428c2d46ebdda778be57860...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 the ready Pull request is ready to be integrated label Jun 3, 2022
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.

@zhengyu123
Copy link
Contributor Author

Thanks, @tschatzl @shipilev

@zhengyu123
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 3, 2022

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

  • 407abf5: 8233477: [Win LAF]The tooltip doesn't display correctly in Win LAF
  • 625821d: 8287661: Fix and improve BitMap::print_on(outputStream*)
  • b544b8b: 8276789: Support C++ lambda in ResourceHashtable::iterate
  • ba9ee8c: 8287748: Fix issues in java.lang.foreign package javadoc
  • deb0653: 8287337: SnippetUtils should throw exceptions if snippets not found
  • cbaeb00: 8287600: AA Ovals not rendered under metal
  • 2776ff3: 8276266: Clean up incorrect client-libs ProblemList.txt entries
  • 409157d: 8287125: [macos] Multiple jpackage tests fail/timeout on same host
  • b5a646e: 8287425: Remove unnecessary register push for MacroAssembler::check_klass_subtype_slow_path
  • 26048ea: 8287695: Use String.contains() instead of String.indexOf() in jdk.hotspot.agent
  • ... and 40 more: https://git.openjdk.java.net/jdk/compare/8db5247ebc827bf4a428c2d46ebdda778be57860...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 3, 2022

@zhengyu123 Pushed as commit a75299c.

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

Development

Successfully merging this pull request may close these issues.

3 participants