8287741: Fix of JDK-8287107 (unused cgv1 freezer controller) was incomplete

[jerboaa]

Please review this hotspot fix follow-up of JDK-8287107. The test which exercised this code was already added with JDK-8287107. I've now added an assert ensuring that we don't set the cgroup path multiple times. The fix is essentially the same as on the JDK side, skip setting the cgroup path when the hierarchy is non-zero which is equivalent to the empty string match that was done in the Java code.

Testing:

• test/hotspot/jtreg/containers/cgroup/CgroupSubsystemFactory.java with fastdebug on x86_64. Asserts before the code fix, passes after.
• GHA

---

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-8287741: Fix of JDK-8287107 (unused cgv1 freezer controller) was incomplete

Reviewers

• Ioi Lam (@iklam - Reviewer) ⚠️ Review applies to 5c4cdc27

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9001

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

Using diff file

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

[bridgekeeper]

👋 Welcome back sgehwolf! 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.

[jerboaa]

/cc @iklam

[openjdk]

@jerboaa
The label @iklam is not a valid label.
These labels are valid:

• serviceability
• hotspot
• hotspot-compiler
• ide-support
• kulla
• i18n
• shenandoah
• jdk
• javadoc
• security
• hotspot-runtime
• jmx
• build
• nio
• client
• core-libs
• compiler
• net
• hotspot-gc
• hotspot-jfr

[openjdk]

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

[mlbridge]

Webrevs

• 01: Full - Incremental (535f37b9)
• 00: Full (5c4cdc27)

[iklam]

LGTM!

[openjdk]

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

8287741: Fix of JDK-8287107 (unused cgv1 freezer controller) was incomplete

Reviewed-by: iklam

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

• f1dd559: 8287896: PropertiesTest.sh fail on msys2
• 4fe0ca9: 8287860: Revise usage of volatile in j.u.Locale
• bde7a7a: 8287236: Reorganize AST related to pattern matching for switch
• 2d8c649: 8287663: Add a regression test for JDK-8287073
• b647a12: 8286940: [IR Framework] Allow IR tests to build and use Whitebox without -DSkipWhiteBoxInstall=true
• dbf0905: 8286967: Unproblemlist compiler/c2/irTests/TestSkeletonPredicates.java and add additional test for JDK-8286638
• 39fa52b: 8283667: [vectorapi] Vectorization for masked load with IOOBE with predicate feature
• 42261d7: 8287785: Reduce runtime of java.lang.invoke microbenchmarks
• b6c6cc5: 8286360: ARM32: Fix crashes after JDK-8284161 (Virtual Threads)
• 778ed1a: 8287810: Reduce runtime of java.lang microbenchmarks
• ... and 59 more: https://git.openjdk.java.net/jdk/compare/e51ca1dee33d69c74f7f1dc2292db2f04c4ccf4c...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.

[jerboaa]

LGTM!

Thanks for the review, @iklam

[openjdk-notifier]

@jerboaa Please do not rebase or force-push to an active PR as it invalidates existing review comments. All changes will be squashed into a single commit automatically when integrating. See OpenJDK Developers’ Guide for more information.

[jerboaa]

It doesn't look like tier1 failures in GHA on x86 (32 bit) Linux are related to this patch.

[jerboaa]

/integrate

[openjdk]

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

• f1dd559: 8287896: PropertiesTest.sh fail on msys2
• 4fe0ca9: 8287860: Revise usage of volatile in j.u.Locale
• bde7a7a: 8287236: Reorganize AST related to pattern matching for switch
• 2d8c649: 8287663: Add a regression test for JDK-8287073
• b647a12: 8286940: [IR Framework] Allow IR tests to build and use Whitebox without -DSkipWhiteBoxInstall=true
• dbf0905: 8286967: Unproblemlist compiler/c2/irTests/TestSkeletonPredicates.java and add additional test for JDK-8286638
• 39fa52b: 8283667: [vectorapi] Vectorization for masked load with IOOBE with predicate feature
• 42261d7: 8287785: Reduce runtime of java.lang.invoke microbenchmarks
• b6c6cc5: 8286360: ARM32: Fix crashes after JDK-8284161 (Virtual Threads)
• 778ed1a: 8287810: Reduce runtime of java.lang microbenchmarks
• ... and 59 more: https://git.openjdk.java.net/jdk/compare/e51ca1dee33d69c74f7f1dc2292db2f04c4ccf4c...master

Your commit was automatically rebased without conflicts.

[openjdk]

@jerboaa Pushed as commit 8d28734.

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