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

8267042: bug in monitor locking/unlocking on ARM32 C1 due to uninitialized BasicObjectLock::_displaced_header #4218

Closed

Conversation

bulasevich
Copy link
Contributor

@bulasevich bulasevich commented May 27, 2021

Hi,

Could we have a review of this change?

The bug was discovered in ARM32 C1 monitor locking/unlocking: the
displaced header is not initialized to the non-zero value which results in deadlock.

Thanks,
Boris


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8267042: bug in monitor locking/unlocking on ARM32 C1 due to uninitialized BasicObjectLock::_displaced_header

Reviewers

Contributors

  • Chris Cole <chris@sageembedded.com>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4218

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 27, 2021

👋 Welcome back bulasevich! 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 label May 27, 2021
@openjdk
Copy link

@openjdk openjdk bot commented May 27, 2021

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

  • hotspot-compiler

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-compiler label May 27, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented May 27, 2021

Webrevs

@bulasevich
Copy link
Contributor Author

@bulasevich bulasevich commented May 27, 2021

/contributor add Chris Cole chris@sageembedded.com

@openjdk
Copy link

@openjdk openjdk bot commented May 27, 2021

@bulasevich
Contributor Chris Cole <chris@sageembedded.com> successfully added.

Copy link

@dsamersoff dsamersoff left a comment

Looks good to me

@openjdk
Copy link

@openjdk openjdk bot commented Jun 18, 2021

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

8267042: bug in monitor locking/unlocking on ARM32 C1 due to uninitialized BasicObjectLock::_displaced_header

Co-authored-by: Chris Cole <chris@sageembedded.com>
Reviewed-by: dsamersoff

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

  • f4d20b2: 8268900: com/sun/net/httpserver/Headers.java: Fix indentation and whitespace
  • a051e73: Merge
  • 9130b8a: 8268371: C2: assert(_gvn.type(obj)->higher_equal(tjp)) failed: cast_up is no longer needed
  • 8545269: 8268676: assert(!ik->is_interface() && !ik->has_subklass()) failed: inconsistent klass hierarchy
  • c98d508: 8268265: MutableSpaceUsedHelper::take_sample() hits assert(left >= right) failed: avoid overflow
  • b66001a: 8268971: ProblemList tools/jpackage/windows/WinInstallerIconTest.java on win-x64
  • 0011b52: 8264843: Javac crashes with NullPointerException when finding unencoded XML in
     tag
  • 2047da7: 8265297: javax/net/ssl/SSLSession/TestEnabledProtocols.java failed with "RuntimeException: java.net.SocketException: Connection reset"
  • 091bc4a: 8268353: Test libsvml.so is and is not present in jdk image
  • 69d01b6: 8249899: jdk/javadoc/tool/InlineTagsWithBraces.java uses @ignore w/o bug-id
  • ... and 345 more: https://git.openjdk.java.net/jdk/compare/37bc4e2e3c2968d7419dae4f421755b6f7d06090...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 label Jun 18, 2021
@bulasevich
Copy link
Contributor Author

@bulasevich bulasevich commented Jun 18, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jun 18, 2021

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

  • 5ae9a12: 8268964: Remove unused ReferenceProcessorAtomicMutator
  • f4d20b2: 8268900: com/sun/net/httpserver/Headers.java: Fix indentation and whitespace
  • a051e73: Merge
  • 9130b8a: 8268371: C2: assert(_gvn.type(obj)->higher_equal(tjp)) failed: cast_up is no longer needed
  • 8545269: 8268676: assert(!ik->is_interface() && !ik->has_subklass()) failed: inconsistent klass hierarchy
  • c98d508: 8268265: MutableSpaceUsedHelper::take_sample() hits assert(left >= right) failed: avoid overflow
  • b66001a: 8268971: ProblemList tools/jpackage/windows/WinInstallerIconTest.java on win-x64
  • 0011b52: 8264843: Javac crashes with NullPointerException when finding unencoded XML in
     tag
  • 2047da7: 8265297: javax/net/ssl/SSLSession/TestEnabledProtocols.java failed with "RuntimeException: java.net.SocketException: Connection reset"
  • 091bc4a: 8268353: Test libsvml.so is and is not present in jdk image
  • ... and 346 more: https://git.openjdk.java.net/jdk/compare/37bc4e2e3c2968d7419dae4f421755b6f7d06090...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jun 18, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jun 18, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jun 18, 2021

@bulasevich Pushed as commit 8f2456e.

💡 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-compiler integrated
2 participants