8323685: PrintSystemDictionaryAtExit has mutex rank assert #17471

coleenp · 2024-01-17T22:55:30Z

Use variant 2 change from PR #16062 that allows the ConcurrentHashTable to specify lock ranking for the resize lock at construction. SystemDictionary printing takes out both CHT resize lock and the ttyLocker.

Tested with tier1-7, special stress test in tier7 to verify JDK-8317440 is still fixed.

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-8323685: PrintSystemDictionaryAtExit has mutex rank assert (Bug - P4)

Reviewers

Thomas Schatzl (@tschatzl - Reviewer) ⚠️ Review applies to e08dfa30
Albert Mingkun Yang (@albertnetymk - Reviewer)

Contributors

Thomas Schatzl <tschatzl@openjdk.org>

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17471

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

Using diff file

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

Webrev

Link to Webrev Comment

coleenp · 2024-01-17T22:56:12Z

/contributor add @tschatzl

bridgekeeper · 2024-01-17T22:56:42Z

👋 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 · 2024-01-17T22:58:30Z

@coleenp
Contributor Thomas Schatzl <tschatzl@openjdk.org> successfully added.

openjdk · 2024-01-17T22:59:00Z

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

mlbridge · 2024-01-17T23:02:15Z

Webrevs

01: Full - Incremental (0adf54c0)
00: Full (e08dfa30)

tschatzl · 2024-01-19T10:22:12Z

/label add hotspot-gc

openjdk · 2024-01-19T10:23:53Z

@tschatzl
The hotspot-gc label was successfully added.

tschatzl

Seems to be just like that suggestion in #16062.

Feel free to ignore the other comment, at least I try to avoid extra files if not necessary.

tschatzl · 2024-01-19T10:26:22Z

test/hotspot/jtreg/runtime/PrintingTests/SampleClass.java

+class SampleClass {
+    public static void main(java.lang.String[] unused) {
+        System.out.println("Hello from the sample class");
+    }
+}


My recommendation to decrease the amount of noise would be to put this class into the other test file, and use SampleClass.class.getname() to use in ProcessTools.
Avoids an extra file and an extra copyright header...

Thanks for the suggestion, it's much better.

openjdk · 2024-01-19T10:29:00Z

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

8323685: PrintSystemDictionaryAtExit has mutex rank assert

Co-authored-by: Thomas Schatzl <tschatzl@openjdk.org>
Reviewed-by: tschatzl, ayang

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

16be388: 8322383: G1: Only preserve marks on objects that are actually moved
0081d8c: 8324147: Serial: Remove generation::compute_new_size
5f71419: 8322366: Add IEEE rounding mode corruption check to JNI checks
0533022: 8222719: libperfstat on AIX - cleanup old API versions
05dad67: 8295804: javax/swing/JFileChooser/JFileChooserSetLocationTest.java failed with "setLocation() is not working properly"
9efdd24: 8324053: Use the blessed modifier order for sealed in java.base
81df265: 8320458: Improve structural navigation in API documentation
a6c0b10: 8323684: TypeMirror.{getAnnotationsByType, getAnnotation} return uninformative results
5c874c1: 8324161: validate-source fails after JDK-8275338
b6233c3: 8321925: sun/security/mscapi/KeytoolChangeAlias.java fails with "Alias <246810> does not exist"
... and 14 more: https://git.openjdk.org/jdk/compare/ffa33d7b807bfef6ff05c9adba869dddf813cf68...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.

tstuefe

Could there be a reasonable default rank?

coleenp · 2024-01-19T15:32:27Z

The default rank is nosafepoint-2, from before the G1 fix. G1 just needed a lower ranking.

coleenp · 2024-01-19T15:33:44Z

src/hotspot/share/utilities/concurrentHashTable.hpp

@@ -406,10 +407,11 @@ class ConcurrentHashTable : public CHeapObj<F> {
                      size_t log2size_limit = DEFAULT_MAX_SIZE_LOG2,
                      size_t grow_hint = DEFAULT_GROW_HINT,
                      bool enable_statistics = DEFAULT_ENABLE_STATISTICS,
+                      Mutex::Rank rank = Mutex::nosafepoint-2,


This is the default rank. It seems reasonable to not stop for safepoints with the resizing lock (since it's the lock taken while in a safepoint - do_safepoint_scan). This was the default before it was lowered to service-1.

Ah. Sorry for missing it. I was thrown off by the explicit constructor below and the different order of arguments.

It took me while to find it from Thomas's original patch too. Thanks!

coleenp · 2024-01-19T16:52:47Z

Thanks Thomas and Albert for reviews, Thomas Stuefe for your comments.
/integrate

openjdk · 2024-01-19T16:54:07Z

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

6997bfc: 8323154: C2: assert(cmp != nullptr && cmp->Opcode() == Op_Cmp(bt)) failed: no exit test
16be388: 8322383: G1: Only preserve marks on objects that are actually moved
0081d8c: 8324147: Serial: Remove generation::compute_new_size
5f71419: 8322366: Add IEEE rounding mode corruption check to JNI checks
0533022: 8222719: libperfstat on AIX - cleanup old API versions
05dad67: 8295804: javax/swing/JFileChooser/JFileChooserSetLocationTest.java failed with "setLocation() is not working properly"
9efdd24: 8324053: Use the blessed modifier order for sealed in java.base
81df265: 8320458: Improve structural navigation in API documentation
a6c0b10: 8323684: TypeMirror.{getAnnotationsByType, getAnnotation} return uninformative results
5c874c1: 8324161: validate-source fails after JDK-8275338
... and 15 more: https://git.openjdk.org/jdk/compare/ffa33d7b807bfef6ff05c9adba869dddf813cf68...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-01-19T16:54:13Z

@coleenp Pushed as commit 2865afe.

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

tschatzl · 2024-04-23T11:01:52Z

/backport jdk22u

openjdk · 2024-04-23T11:02:25Z

@tschatzl the backport was successfully created on the branch backport-tschatzl-2865afe7 in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u: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 2865afe7 from the openjdk/jdk repository.

The commit being backported was authored by Coleen Phillimore on 19 Jan 2024 and was reviewed by Thomas Schatzl and Albert Mingkun Yang.

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/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-tschatzl-2865afe7:backport-tschatzl-2865afe7
$ git checkout backport-tschatzl-2865afe7
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-tschatzl-2865afe7

8323685: PrintSystemDictionaryAtExit has mutex rank assert

e08dfa3

openjdk bot added the rfr Pull request is ready for review label Jan 17, 2024

openjdk bot added the hotspot hotspot-dev@openjdk.org label Jan 17, 2024

openjdk bot added the hotspot-gc hotspot-gc-dev@openjdk.org label Jan 19, 2024

tschatzl approved these changes Jan 19, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jan 19, 2024

Fold SampleClass into printing test.

0adf54c

albertnetymk approved these changes Jan 19, 2024

View reviewed changes

tstuefe reviewed Jan 19, 2024

View reviewed changes

coleenp commented Jan 19, 2024

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jan 19, 2024

openjdk bot closed this Jan 19, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 19, 2024

coleenp deleted the cht-mutex branch January 19, 2024 16:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8323685: PrintSystemDictionaryAtExit has mutex rank assert #17471

8323685: PrintSystemDictionaryAtExit has mutex rank assert #17471

coleenp commented Jan 17, 2024 •

edited by openjdk bot

Loading

coleenp commented Jan 17, 2024

bridgekeeper bot commented Jan 17, 2024

openjdk bot commented Jan 17, 2024

openjdk bot commented Jan 17, 2024

mlbridge bot commented Jan 17, 2024 •

edited

Loading

tschatzl commented Jan 19, 2024

openjdk bot commented Jan 19, 2024

tschatzl left a comment

tschatzl Jan 19, 2024

coleenp Jan 19, 2024

openjdk bot commented Jan 19, 2024 •

edited

Loading

tstuefe left a comment

coleenp commented Jan 19, 2024

coleenp Jan 19, 2024

tstuefe Jan 19, 2024

coleenp Jan 19, 2024

coleenp commented Jan 19, 2024

openjdk bot commented Jan 19, 2024

openjdk bot commented Jan 19, 2024

tschatzl commented Apr 23, 2024

openjdk bot commented Apr 23, 2024

8323685: PrintSystemDictionaryAtExit has mutex rank assert #17471

8323685: PrintSystemDictionaryAtExit has mutex rank assert #17471

Conversation

coleenp commented Jan 17, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Contributors

Reviewing

Webrev

coleenp commented Jan 17, 2024

bridgekeeper bot commented Jan 17, 2024

openjdk bot commented Jan 17, 2024

openjdk bot commented Jan 17, 2024

mlbridge bot commented Jan 17, 2024 • edited Loading

Webrevs

tschatzl commented Jan 19, 2024

openjdk bot commented Jan 19, 2024

tschatzl left a comment

Choose a reason for hiding this comment

tschatzl Jan 19, 2024

Choose a reason for hiding this comment

coleenp Jan 19, 2024

Choose a reason for hiding this comment

openjdk bot commented Jan 19, 2024 • edited Loading

tstuefe left a comment

Choose a reason for hiding this comment

coleenp commented Jan 19, 2024

coleenp Jan 19, 2024

Choose a reason for hiding this comment

tstuefe Jan 19, 2024

Choose a reason for hiding this comment

coleenp Jan 19, 2024

Choose a reason for hiding this comment

coleenp commented Jan 19, 2024

openjdk bot commented Jan 19, 2024

openjdk bot commented Jan 19, 2024

tschatzl commented Apr 23, 2024

openjdk bot commented Apr 23, 2024

coleenp commented Jan 17, 2024 •

edited by openjdk bot

Loading

mlbridge bot commented Jan 17, 2024 •

edited

Loading

openjdk bot commented Jan 19, 2024 •

edited

Loading