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

8272447: Remove 'native' ranked Mutex #5116

Closed
wants to merge 3 commits into from
Closed

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Aug 13, 2021

See JBS issue for more details. The locks that were native ranking should have a real mutex ranking and participate in the deadlock detection mechanism. The MonitoringSupport_lock is taken out after the Notification_lock, which is aliased to the Service_lock if -XX:-UseNotificationThread. Service_lock is ranked tty-2 which is the same as access rank, so I made a new service rank for these two locks to share. As a future change we should verify that rank+-number doesn't overlap with a different rank.
Tested with tier1-6 in mach5.


Progress

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

Issue

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5116

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Aug 13, 2021

👋 Welcome back coleenp! 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 Aug 13, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 13, 2021

@coleenp 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 label Aug 13, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Aug 13, 2021

Webrevs

Copy link
Member

@tstuefe tstuefe left a comment

Hi Coleen, the metaspace-related changes are fine. The others look good to me too.

Cheers, Thomas

@openjdk
Copy link

@openjdk openjdk bot commented Aug 15, 2021

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

8272447: Remove 'native' ranked Mutex

Reviewed-by: stuefe, pchilanomate

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

  • 1ea437a: 8272720: Fix the implementation of loop unrolling heuristic with LoopPercentProfileLimit
  • 86add21: 8223923: C2: Missing interference with mismatched unsafe accesses
  • c701f6e: 8272739: Misformatted error message in EventHandlerCreator
  • fb1dfc6: 8267185: Add string deduplication support to ParallelGC
  • d874e96: 8271579: G1: Move copy before CAS in do_copy_to_survivor_space
  • 92bde67: 8271946: Cleanup leftovers in Space and subclasses
  • db9834f: 8258951: java/net/httpclient/HandshakeFailureTest.java failed with "RuntimeException: Not found expected SSLHandshakeException in java.io.IOException"
  • a81e5e9: 8272654: Mark word accesses should not use Access API
  • 4bd37c3: 8272708: [Test]: Cleanup: test/jdk/security/infra/java/security/cert/CertPathValidator/certification/BuypassCA.java no longer needs ocspEnabled
  • ddcd851: 8272602: [macos] not all KEY_PRESSED events sent when control modifier is used
  • ... and 56 more: https://git.openjdk.java.net/jdk/compare/d06d0b9e9d9d27aa549455f19b9803752431bcbb...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 Aug 15, 2021
Copy link
Member

@dholmes-ora dholmes-ora left a comment

Hi Coleen,

Sorry but other than the change to the MonitoringSupport_lock that you explained, I don't understand the basis for changing the other "native" mutexes. ??

David

src/hotspot/share/runtime/mutexLocker.cpp Show resolved Hide resolved
test/hotspot/gtest/runtime/test_mutex.cpp Outdated Show resolved Hide resolved
Copy link
Contributor Author

@coleenp coleenp left a comment

Thanks for reviewing David.

test/hotspot/gtest/runtime/test_mutex.cpp Outdated Show resolved Hide resolved
@coleenp
Copy link
Contributor Author

@coleenp coleenp commented Aug 19, 2021

Thanks @tstuefe for reviewing!

Copy link
Contributor

@pchilano pchilano left a comment

LGTM.

Thanks,
Patricio

@coleenp
Copy link
Contributor Author

@coleenp coleenp commented Aug 20, 2021

Thanks, Patricio!

@coleenp
Copy link
Contributor Author

@coleenp coleenp commented Aug 25, 2021

Thanks Thomas and Patricio for reviews and David for comments. This is blocking another change so I'm going to integrate.
/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Aug 25, 2021

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

  • 63e062f: 8236176: Parallel GC SplitInfo comment should be updated for shadow regions
  • c5a2712: 8272850: Drop zapping values in the Zap* option descriptions
  • 1e3e333: 8272884: Make VoidClosure::do_void pure virtual
  • 0f428ca: 8272570: C2: crash in PhaseCFG::global_code_motion
  • b17b821: 8272639: jpackaged applications using microphone on mac
  • 0e7288f: 8267125: AES Galois CounterMode (GCM) interleaved implementation using AVX512 + VAES instructions
  • 6ace805: 8272856: DoubleFlagWithIntegerValue uses G1GC-only flag
  • c547ead: 8272916: Copyright year was modified unintentionally in jlink.properties and ImagePluginStack.java
  • aaedac6: 8265261: java/nio/file/Files/InterruptCopy.java fails with java.lang.RuntimeException: Copy was not interrupted
  • d34f17c: 8270195: Add missing links between methods of JavaFX properties
  • ... and 90 more: https://git.openjdk.java.net/jdk/compare/d06d0b9e9d9d27aa549455f19b9803752431bcbb...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Aug 25, 2021
@openjdk openjdk bot added integrated and removed ready labels Aug 25, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Aug 25, 2021

@coleenp Pushed as commit 2ef6871.

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

@openjdk openjdk bot removed the rfr label Aug 25, 2021
@coleenp coleenp deleted the rank branch Aug 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime integrated
5 participants