8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074 #15028

phohensee · 2023-07-25T21:48:24Z

MonitoringSupport_lock is initialized only when UseG1GC is true, but JDK-8304074 uses it to implement getTotalThreadAllocatedBytes, which is available for all garbage collectors. While the current code sets UseG1GC regardless of which collector is specified, see FLAG_SET_ERGO_IF_DEFAULT(UseG1GC, true) in gcConfig.cpp, if G1 isn't included in the Hotspot build or Hotspot is not running on a server class machine (unlikely these days), the lock will not be initialized. The lock's initialization should be unconditional.

I updated ThreadAllocatedMemory.java to run the test using both G1 and Serial collectors.

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-8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074 (Bug - P4)

Reviewers

David Holmes (@dholmes-ora - Reviewer) ⚠️ Review applies to e84cb69c
Serguei Spitsyn (@sspitsyn - Reviewer) ⚠️ Review applies to e84cb69c
Aleksey Shipilev (@shipilev - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15028

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

Using diff file

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

Webrev

Link to Webrev Comment

… after 8304074

bridgekeeper · 2023-07-25T21:49:14Z

👋 Welcome back phh! 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 · 2023-07-25T21:50:53Z

@phohensee The following labels will be automatically applied to this pull request:

hotspot-runtime
jmx
serviceability

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

mlbridge · 2023-07-25T21:56:00Z

Webrevs

01: Full - Incremental (f83eccf7)
00: Full (e84cb69c)

dholmes-ora

Looks good.

Thanks.

openjdk · 2023-07-26T05:32:51Z

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

8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074

Reviewed-by: dholmes, sspitsyn, 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 10 new commits pushed to the master branch:

830413f: 8313087: DerValue::toString should output a hex view of the values in byte array
7412193: 4800398: (ch spec) Clarify Channels.newChannel(InputStream) spec
e7726fb: 8313155: Problem list some JUnit-based tests in test/jdk/java/lang/invoke
02a0473: 8312445: Array types in annotation elements show square brackets twice
c22cadf: 8312526: Test dk/jfr/event/oldobject/TestHeapDeep.java failed: Could not find ChainNode
cc2a75e: 8312619: Strange error message when switching over long
1f81e5b: 8312229: Crash involving yield, switch and anonymous classes
e9daf4a: 8312916: Remove remaining usages of -Xdebug from test/hotspot/jtreg
117f42d: 8312625: Test serviceability/dcmd/vm/TrimLibcHeapTest.java failed: RSS use increased
2d05d35: 8312979: Fix assembler_aarch64.hpp after JDK-8311847

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

sspitsyn

Looks good.
Thanks,
Serguei

shipilev · 2023-07-26T10:44:56Z

So... this does not visibly break right now, because the MutexLocker in jmm_GetTotalThreadAllocatedMemory silently accepts nullptr as the lock? I think we should assert(MonitoringSupport_lock != nullptr) there. This should also turn the new UseSerialGC test config into proper regression test: the test should fail on that assert without this patch.

phohensee · 2023-07-26T13:28:08Z

windows-aarch64 pre-submit build failure is due to an unrelated aarch64-specific issue.

phohensee · 2023-07-26T14:59:13Z

Thanks for the quick reviews!

Aleksey, no, it doesn't break now because (1) we don't appear to test on non-server class machines, and (2) FLAG_SET_ERGO_IF_DEFAULT sets UseG1GC unconditionally regardless of which GC is specified on the command line because it (UseG1GC) hasn't also been specified on the command line. So, the assert would have no effect unless run on a non-server class machine. I've added the assert though.

… after 8304074

shipilev

Looks good! I reverted the mutexLocker.cpp hunk locally, and the test fails on assert, as expected.

phohensee · 2023-07-26T15:29:56Z

Thanks, Aleksey. Will push once pre-submit tests finish.

phohensee · 2023-07-26T16:08:59Z

I filed JDK-8313200 to track the windows-aarch64 build issue.

But, it's a dup of JDK-8312979, so now closed.

shipilev · 2023-07-26T16:45:51Z

...and I filed JDK-8313202 to deal with MutexLocker accepting nullptrs more generically :)

phohensee · 2023-07-26T17:53:00Z

linux-x86 langtools/tools/javac/varargs/warning/Warn4.java presubmit test failure is a crash in G1ConcurrentMark.cpp which appears unrelated. Rerun on my test box succeeded.

phohensee · 2023-07-26T19:28:46Z

/integrate

openjdk · 2023-07-26T19:30:24Z

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

4c2e54f: 8309088: security/infra/java/security/cert/CertPathValidator/certification/AmazonCA.java fails
830413f: 8313087: DerValue::toString should output a hex view of the values in byte array
7412193: 4800398: (ch spec) Clarify Channels.newChannel(InputStream) spec
e7726fb: 8313155: Problem list some JUnit-based tests in test/jdk/java/lang/invoke
02a0473: 8312445: Array types in annotation elements show square brackets twice
c22cadf: 8312526: Test dk/jfr/event/oldobject/TestHeapDeep.java failed: Could not find ChainNode
cc2a75e: 8312619: Strange error message when switching over long
1f81e5b: 8312229: Crash involving yield, switch and anonymous classes
e9daf4a: 8312916: Remove remaining usages of -Xdebug from test/hotspot/jtreg
117f42d: 8312625: Test serviceability/dcmd/vm/TrimLibcHeapTest.java failed: RSS use increased
... and 1 more: https://git.openjdk.org/jdk/compare/78a8a99d990dcc0b77c096bb2ca2c1bb86462e3f...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-07-26T19:30:33Z

@phohensee Pushed as commit a9d21c6.

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

dholmes-ora · 2023-07-27T07:12:11Z

src/hotspot/share/services/management.cpp

@@ -2116,6 +2116,7 @@ JVM_ENTRY(jlong, jmm_GetTotalThreadAllocatedMemory(JNIEnv *env))
    }

    {
+      assert(MonitoringSupport_lock != nullptr, "Must be");


This was unnecessary. If you have this here you would have one before every single use of mutex that is expected to be non-null.

8313081: MonitoringSupport_lock should be unconditionally initialized…

e84cb69

… after 8304074

openjdk bot added the rfr Pull request is ready for review label Jul 25, 2023

openjdk bot added serviceability serviceability-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org jmx jmx-dev@openjdk.org labels Jul 25, 2023

dholmes-ora approved these changes Jul 26, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jul 26, 2023

sspitsyn approved these changes Jul 26, 2023

View reviewed changes

shipilev approved these changes Jul 26, 2023

View reviewed changes

8313081: MonitoringSupport_lock should be unconditionally initialized…

f83eccf

… after 8304074

shipilev approved these changes Jul 26, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Jul 26, 2023

openjdk bot closed this Jul 26, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jul 26, 2023

dholmes-ora reviewed Jul 27, 2023

View reviewed changes

phohensee deleted the 8313081 branch July 31, 2023 18:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074 #15028

8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074 #15028

phohensee commented Jul 25, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jul 25, 2023

openjdk bot commented Jul 25, 2023

mlbridge bot commented Jul 25, 2023 •

edited

Loading

dholmes-ora left a comment

openjdk bot commented Jul 26, 2023 •

edited

Loading

sspitsyn left a comment

shipilev commented Jul 26, 2023

phohensee commented Jul 26, 2023

phohensee commented Jul 26, 2023 •

edited

Loading

shipilev left a comment

phohensee commented Jul 26, 2023

phohensee commented Jul 26, 2023 •

edited

Loading

shipilev commented Jul 26, 2023

phohensee commented Jul 26, 2023

phohensee commented Jul 26, 2023

openjdk bot commented Jul 26, 2023

openjdk bot commented Jul 26, 2023

dholmes-ora Jul 27, 2023

8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074 #15028

8313081: MonitoringSupport_lock should be unconditionally initialized after 8304074 #15028

Conversation

phohensee commented Jul 25, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Jul 25, 2023

openjdk bot commented Jul 25, 2023

mlbridge bot commented Jul 25, 2023 • edited Loading

Webrevs

dholmes-ora left a comment

Choose a reason for hiding this comment

openjdk bot commented Jul 26, 2023 • edited Loading

sspitsyn left a comment

Choose a reason for hiding this comment

shipilev commented Jul 26, 2023

phohensee commented Jul 26, 2023

phohensee commented Jul 26, 2023 • edited Loading

shipilev left a comment

Choose a reason for hiding this comment

phohensee commented Jul 26, 2023

phohensee commented Jul 26, 2023 • edited Loading

shipilev commented Jul 26, 2023

phohensee commented Jul 26, 2023

phohensee commented Jul 26, 2023

openjdk bot commented Jul 26, 2023

openjdk bot commented Jul 26, 2023

dholmes-ora Jul 27, 2023

Choose a reason for hiding this comment

phohensee commented Jul 25, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Jul 25, 2023 •

edited

Loading

openjdk bot commented Jul 26, 2023 •

edited

Loading

phohensee commented Jul 26, 2023 •

edited

Loading

phohensee commented Jul 26, 2023 •

edited

Loading