-
Notifications
You must be signed in to change notification settings - Fork 5.8k
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
Conversation
… 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.
👋 Welcome back yftsai! A progress list of the required criteria for merging this PR into |
Webrevs
|
src/hotspot/os/linux/os_linux.cpp
Outdated
@@ -4004,7 +4004,7 @@ bool os::can_commit_large_page_memory() { | |||
} | |||
|
|||
bool os::can_execute_large_page_memory() { | |||
return UseTransparentHugePages; | |||
return UseLargePages; |
There was a problem hiding this comment.
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
I tested my PR #16582 with the fixed test. The test passed as expected. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
There was a problem hiding this 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
@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:
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
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 |
/sponsor |
Going to push as commit 86b27b7.
Your commit was automatically rebased without conflicts. |
@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. |
Test CheckLargePages was broken by the previous changes:
JDK-8310233 changes the pagesize logs from
to
JDK-8261894 removes
UseHugeTLBFS
. It was also removed fromos::can_execute_large_page_memory
, andCodeCache::page_size
cannot use huge pages anymore.This change includes:
Progress
Issue
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