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

8317831: compiler/codecache/CheckLargePages.java fails on OL 8.8 with unexpected memory string #16962

Closed
wants to merge 4 commits into from

Conversation

yftsai
Copy link
Contributor

@yftsai yftsai commented Dec 5, 2023

Test CheckLargePages was broken by the previous changes:

JDK-8310233 changes the pagesize logs from

Usable page sizes: 4k, 1G

to

Large page support enabled. Usable page sizes: 4k, 1G. Default large page size: 1G.

JDK-8261894 removes UseHugeTLBFS. It was also removed from os::can_execute_large_page_memory, and CodeCache::page_size cannot use huge pages anymore.

This change includes:

  • The regular expression in CheckLargePages is updated to capture only the page sizes.
  • The static huge page will be fixed by JDK-8319795.

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-8317831: compiler/codecache/CheckLargePages.java fails on OL 8.8 with unexpected memory string (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16962

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

Using diff file

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

Webrev

Link to Webrev Comment

Yi-Fan Tsai added 3 commits November 8, 2023 18:59
… unexpected memory string

Test CheckLargePages was broken by the previous changes:

JDK-8261894 removes UseHugeTLBFS and prevents pre-allocates large pages
up-front. (UseHugeTLBFS was removed from
os::can_execute_large_page_memory.)

JDK-8310233 changes the pagesize logs from
```
Usable page sizes: 4k, 1G
```
to
```
Large page support enabled. Usable page sizes: 4k, 1G. Default large page size: 1G.
```

This change adds UseTransparentHugePages to the test and pre-allocates
large pages for code cache.
ReservedCodeCacheSize and InitialCodeCacheSize are reduced to smaller
than 2M * 8 to trigger reducing the page sizes.
The regular expression is updated to capture only page sizes.
… unexpected memory string

Test CheckLargePages was broken by the previous changes:

JDK-8261894 removes UseHugeTLBFS. It is also removed from
`os::can_execute_large_page_memory`, and  `CodeCache::page_size` cannot
longer use hughe pages.

JDK-8310233 changes the pagesize logs from
```
Usable page sizes: 4k, 1G
```
to
```
Large page support enabled. Usable page sizes: 4k, 1G. Default large page size: 1G.
```

This change adds UseLargePages back to where UseHugeTLBFS is in
`os::can_execute_large_page_memory`.
The regular expression is updated to capture only page sizes.
@bridgekeeper
Copy link

bridgekeeper bot commented Dec 5, 2023

👋 Welcome back yftsai! 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 Pull request is ready for review label Dec 5, 2023
@openjdk
Copy link

openjdk bot commented Dec 5, 2023

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

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Dec 5, 2023
@mlbridge
Copy link

mlbridge bot commented Dec 5, 2023

Webrevs

@@ -4004,7 +4004,7 @@ bool os::can_commit_large_page_memory() {
}

bool os::can_execute_large_page_memory() {
return UseTransparentHugePages;
return UseLargePages;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please exclude this change from the PR? The function will be removed by my PR.

In test/hotspot/jtreg/ProblemList.txt could you please change

compiler/codecache/CheckLargePages.java 8317831 linux-x64

to

compiler/codecache/CheckLargePages.java 8319795 linux-x64

@eastig
Copy link
Member

eastig commented Dec 5, 2023

I tested my PR #16582 with the fixed test. The test passed as expected.

@eastig
Copy link
Member

eastig commented Dec 5, 2023

Hi @tstuefe,
Could you please have a look? I'd like this to go before my #16582 because I'll be adding new test cases to CheckLargePages.java.
I'll update test/hotspot/jtreg/ProblemList.txt in my #16582.

Copy link
Member

@eastig eastig left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm going to approve this test fix as the change to the regex itself seems reasonable, even though because the test remains excluded by JDK-8319795 we won't actually be testing it. If any issues arise when the test is removed from the ProblemList it is expected that JDK-8319795 will deal with that.

Thanks

@openjdk
Copy link

openjdk bot commented Dec 6, 2023

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

8317831: compiler/codecache/CheckLargePages.java fails on OL 8.8 with unexpected memory string

Reviewed-by: eastigeevich, dholmes

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

  • 3cd65ce: 8321325: Remove unused Java_java_awt_MenuComponent_initIDs function
  • 905137d: 8321219: runtime/jni/FastGetField: assert(is_interpreted_frame()) failed: interpreted frame expected
  • 430564c: 8308715: Create a mechanism for Implicitly Declared Class javadoc
  • c8fa758: 8320860: add-opens/add-exports require '=' in JAVA_TOOL_OPTIONS
  • 9e57010: 8315149: Add hsperf counters for CPU time of internal GC threads
  • b0d1450: 8321053: Use ByteArrayInputStream.buf directly when parameter of transferTo() is trusted
  • acaf2c8: 8318590: JButton ignores margin when painting HTML text
  • d3df3eb: 8294699: Launcher causes lingering busy cursor
  • fddc02e: 8321225: [JVMCI] HotSpotResolvedObjectTypeImpl.isLeafClass shouldn't create strong references
  • 640d7f3: 8314327: Issues with JShell when using "local" execution engine
  • ... and 372 more: https://git.openjdk.org/jdk/compare/806529aa77e1977360cd3885b595797bea98e920...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@eastig, @dholmes-ora) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Dec 6, 2023
@yftsai
Copy link
Contributor Author

yftsai commented Dec 6, 2023

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Dec 6, 2023
@openjdk
Copy link

openjdk bot commented Dec 6, 2023

@yftsai
Your change (at version 54c763e) is now ready to be sponsored by a Committer.

@dholmes-ora
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 6, 2023

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

  • 3cd65ce: 8321325: Remove unused Java_java_awt_MenuComponent_initIDs function
  • 905137d: 8321219: runtime/jni/FastGetField: assert(is_interpreted_frame()) failed: interpreted frame expected
  • 430564c: 8308715: Create a mechanism for Implicitly Declared Class javadoc
  • c8fa758: 8320860: add-opens/add-exports require '=' in JAVA_TOOL_OPTIONS
  • 9e57010: 8315149: Add hsperf counters for CPU time of internal GC threads
  • b0d1450: 8321053: Use ByteArrayInputStream.buf directly when parameter of transferTo() is trusted
  • acaf2c8: 8318590: JButton ignores margin when painting HTML text
  • d3df3eb: 8294699: Launcher causes lingering busy cursor
  • fddc02e: 8321225: [JVMCI] HotSpotResolvedObjectTypeImpl.isLeafClass shouldn't create strong references
  • 640d7f3: 8314327: Issues with JShell when using "local" execution engine
  • ... and 372 more: https://git.openjdk.org/jdk/compare/806529aa77e1977360cd3885b595797bea98e920...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Dec 6, 2023
@openjdk openjdk bot closed this Dec 6, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Dec 6, 2023
@openjdk
Copy link

openjdk bot commented Dec 6, 2023

@dholmes-ora @yftsai Pushed as commit 86b27b7.

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

@yftsai yftsai deleted the JDK-8317831 branch December 6, 2023 19:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants