8067941: [TESTBUG] Fix tests for OS with 64K page size. #71

dongbohe · 2022-06-01T12:01:31Z

Hi,

I would like to backport this patch to fix tests for OS with 64K page size.
Patch does not apply cleanly:
JDK-8062854[1] move StackOverflowBug.java and Test8009761.java to corresponding subfolders.
Test8009761.java context is different because JDK-8021775[2] and JDK-8011397[3] doesn't in jdk8u.
Change to TestGCLogMessages.java is excluded because it was added in JDK-8027962[4].
Chnage to WBStackSize.java is excluded because JDK-8032970[5] does not exist in 8.

I changed Xss in StackOverflowBug.java, Test8009761.java, TestRecursiveReplacedException.java,
StackOverflowGuardPagesOff.java, TestStackBangMonitorOwned.java and TestStackBangRbp.java from
392k to 512k according to JDK-8159335[6], because JDK-8173339[7] changed StackShadowPages to 20, xss needs at least 456k.

Testing: Performed full jtreg test aarch64-linux-gnu platforms with 64k page size.
Checked that StackOverflowBug.java, Test8009761.java, TestRecursiveReplacedException.java,
StackOverflowGuardPagesOff.java, TestStackBangMonitorOwned.java, TestStackBangRbp.java,
TestHumongousAllocInitialMark.java, TestCMSHeapSizeFlags.java, TestG1HeapSizeFlags.java,
TestParallelHeapSizeFlags.java, TestSerialHeapSizeFlags.java fails without the patch
and passes with the patch on Aarch64 with 64K page size.

[1] https://bugs.openjdk.java.net/browse/JDK-8062854
[2] https://bugs.openjdk.java.net/browse/JDK-8021775
[3] https://bugs.openjdk.java.net/browse/JDK-8011397
[4] https://bugs.openjdk.java.net/browse/JDK-8027962
[5] https://bugs.openjdk.java.net/browse/JDK-8032970
[6] https://bugs.openjdk.java.net/browse/JDK-8159335
[7] https://bugs.openjdk.java.net/browse/JDK-8173339

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-8067941: [TESTBUG] Fix tests for OS with 64K page size.

Reviewers

Andrew John Hughes (@gnu-andrew - Reviewer) ⚠️ Review applies to 565302ee

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk8u-dev pull/71/head:pull/71
$ git checkout pull/71

Update a local copy of the PR:
$ git checkout pull/71
$ git pull https://git.openjdk.org/jdk8u-dev pull/71/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 71

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk8u-dev/pull/71.diff

bridgekeeper · 2022-06-01T12:01:59Z

👋 Welcome back dongbohe! A progress list of the required criteria for merging this PR into pr/66 will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2022-06-01T12:02:45Z

This backport pull request has now been updated with issue from the original commit.

mlbridge · 2022-06-01T12:08:16Z

Webrevs

bridgekeeper · 2022-06-29T15:02:06Z

@dongbohe This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

openjdk · 2022-06-30T03:33:01Z

⚠️ @dongbohe This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

bridgekeeper · 2022-07-28T05:13:52Z

@dongbohe This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

openjdk-notifier · 2022-07-28T05:23:44Z

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout 8067941
git fetch https://git.openjdk.org/jdk8u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

bridgekeeper · 2022-08-25T07:40:45Z

@dongbohe This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

gnu-andrew · 2022-08-26T14:19:23Z

SKARA seems to be confused by the closure of #66 due to timeout, not integration. Please re-open that one so we can correctly integrate it as a dependency for this one.

gnu-andrew · 2022-08-26T15:08:23Z

Filed https://bugs.openjdk.org/browse/SKARA-1568 for the issue with SKARA treating a timed-out PR as an integrated PR

gnu-andrew

Changes make sense to me, given the bump to AArch64 stack sizes in JDK-8173339

I assume this doesn't affect other architectures, as we don't have JDK-8159335 which bumped the stack sizes on ppc64?

8u now:

$ grep -r 'StackShadowPages' hotspot/|grep pd_global
hotspot/src/cpu/aarch64/vm/globals_aarch64.hpp:define_pd_global(intx, StackShadowPages, 20 DEBUG_ONLY(+5));
hotspot/src/cpu/sparc/vm/globals_sparc.hpp:define_pd_global(intx, StackShadowPages, 10 DEBUG_ONLY(+1));
hotspot/src/cpu/sparc/vm/globals_sparc.hpp:define_pd_global(intx, StackShadowPages, 3 DEBUG_ONLY(+1));
hotspot/src/cpu/x86/vm/globals_x86.hpp:define_pd_global(intx, StackShadowPages, NOT_WIN64(20) WIN64_ONLY(6) DEBUG_ONLY(+2));
hotspot/src/cpu/x86/vm/globals_x86.hpp:define_pd_global(intx, StackShadowPages, 4 DEBUG_ONLY(+5));
hotspot/src/cpu/zero/vm/globals_zero.hpp:define_pd_global(intx,  StackShadowPages,     5 LP64_ONLY(+1) DEBUG_ONLY(+3));
hotspot/src/os_cpu/aix_ppc/vm/globals_aix_ppc.hpp:define_pd_global(intx, StackShadowPages,         6 DEBUG_ONLY(+2));
hotspot/src/os_cpu/linux_ppc/vm/globals_linux_ppc.hpp:define_pd_global(intx, StackShadowPages,         6 DEBUG_ONLY(+2));

11u now:

$ grep -r 'define DEFAULT_STACK_SHADOW_PAGES' ../jdk11u-dev/src/hotspot
../jdk11u-dev/src/hotspot/cpu/x86/globals_x86.hpp:#define DEFAULT_STACK_SHADOW_PAGES (NOT_WIN64(20) WIN64_ONLY(7) DEBUG_ONLY(+2))
../jdk11u-dev/src/hotspot/cpu/x86/globals_x86.hpp:#define DEFAULT_STACK_SHADOW_PAGES (4 DEBUG_ONLY(+5))
../jdk11u-dev/src/hotspot/cpu/aarch64/globals_aarch64.hpp:#define DEFAULT_STACK_SHADOW_PAGES (20 DEBUG_ONLY(+5))
../jdk11u-dev/src/hotspot/cpu/arm/globals_arm.hpp:#define DEFAULT_STACK_SHADOW_PAGES (5 DEBUG_ONLY(+1))
../jdk11u-dev/src/hotspot/cpu/ppc/globals_ppc.hpp:#define DEFAULT_STACK_SHADOW_PAGES (20 DEBUG_ONLY(+2))
../jdk11u-dev/src/hotspot/cpu/s390/globals_s390.hpp:#define DEFAULT_STACK_SHADOW_PAGES   (20 DEBUG_ONLY(+4))
../jdk11u-dev/src/hotspot/cpu/sparc/globals_sparc.hpp:#define DEFAULT_STACK_SHADOW_PAGES (20 DEBUG_ONLY(+2))
../jdk11u-dev/src/hotspot/cpu/zero/globals_zero.hpp:#define DEFAULT_STACK_SHADOW_PAGES (5 LP64_ONLY(+1) DEBUG_ONLY(+3))

openjdk · 2022-08-26T15:22:14Z

@dongbohe This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8067941: [TESTBUG] Fix tests for OS with 64K page size.

Reviewed-by: andrew

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 (@gnu-andrew) 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).

dongbohe · 2022-08-29T01:02:47Z

Yes, theoretically this does not affect other architectures.

dongbohe · 2022-08-29T01:23:54Z

But we need to explain the impact of JDK-8173339 in the jdk8u release. The minimum value of xss on Aarch64 is changed from 164k to 228k on 4k page size(328k->456k on 64k page size). If the user-specified xss is smaller than the current minimum value, the value of xss needs to be adjusted to be larger than the minimum required value to prevent JVM startup failure.

dongbohe · 2022-08-29T01:45:10Z

/integrate

openjdk · 2022-08-29T01:46:10Z

@dongbohe
Your change (at version 5261d71) is now ready to be sponsored by a Committer.

gnu-andrew · 2022-08-31T02:30:52Z

8u-dev is currently closed for rampdown.
I'll sponsor this once it reopens.

gnu-andrew · 2022-09-01T01:21:40Z

/sponsor

openjdk · 2022-09-01T01:23:28Z

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

9f037b0: 8283903: GetContainerCpuLoad does not return the correct result in share mode
65b1748: 8273176: handle latest VS2019 in abstract_vm_version
daccfee: 8293181: Bump update version of OpenJDK: 8u362
2be37c3: 8292762: Remove .jcheck directories from jdk8u subcomponents
bd946fa: 8274840: Update OS detection code to recognize Windows 11
266918d: 8071530: Update OS detection code to reflect Windows 10 version change

Your commit was automatically rebased without conflicts.

openjdk · 2022-09-01T01:23:45Z

@gnu-andrew @dongbohe Pushed as commit fa340ab.

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

dongbohe added 2 commits May 30, 2022 10:40

Backport 540ec375c30e973ceb1a944d5cc60cc8532e88ec

81b2f75

Backport 8e2df5f543522866e7c27ff95ea6fb6458393682

b271768

openjdk bot changed the title ~~Backport 8e2df5f543522866e7c27ff95ea6fb6458393682~~ 8067941: [TESTBUG] Fix tests for OS with 64K page size. Jun 1, 2022

openjdk bot added backport rfr Pull request is ready for review labels Jun 1, 2022

dongbohe mentioned this pull request Jun 1, 2022

8173339: AArch64: Fix minimum stack size computations #66

Closed

3 tasks

dongbohe added 2 commits June 30, 2022 11:29

Merge branch 'master' into 8173339

881b06f

Merge branch '8173339' into 8067941

565302e

openjdk-notifier bot changed the base branch from pr/66 to master July 28, 2022 05:23

gnu-andrew approved these changes Aug 26, 2022

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Aug 26, 2022

Merge branch 'master' into 8067941

5261d71

openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 29, 2022

openjdk bot added the integrated Pull request has been integrated label Sep 1, 2022

openjdk bot closed this Sep 1, 2022

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 Sep 1, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8067941: [TESTBUG] Fix tests for OS with 64K page size. #71

8067941: [TESTBUG] Fix tests for OS with 64K page size. #71

dongbohe commented Jun 1, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Jun 1, 2022

openjdk bot commented Jun 1, 2022

mlbridge bot commented Jun 1, 2022 •

edited

Loading

bridgekeeper bot commented Jun 29, 2022

openjdk bot commented Jun 30, 2022

bridgekeeper bot commented Jul 28, 2022

openjdk-notifier bot commented Jul 28, 2022

bridgekeeper bot commented Aug 25, 2022

gnu-andrew commented Aug 26, 2022

gnu-andrew commented Aug 26, 2022

gnu-andrew left a comment

openjdk bot commented Aug 26, 2022 •

edited

Loading

dongbohe commented Aug 29, 2022

dongbohe commented Aug 29, 2022

dongbohe commented Aug 29, 2022

openjdk bot commented Aug 29, 2022

gnu-andrew commented Aug 31, 2022

gnu-andrew commented Sep 1, 2022

openjdk bot commented Sep 1, 2022

openjdk bot commented Sep 1, 2022

8067941: [TESTBUG] Fix tests for OS with 64K page size. #71

8067941: [TESTBUG] Fix tests for OS with 64K page size. #71

Conversation

dongbohe commented Jun 1, 2022 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Jun 1, 2022

openjdk bot commented Jun 1, 2022

mlbridge bot commented Jun 1, 2022 • edited Loading

Webrevs

bridgekeeper bot commented Jun 29, 2022

openjdk bot commented Jun 30, 2022

bridgekeeper bot commented Jul 28, 2022

openjdk-notifier bot commented Jul 28, 2022

bridgekeeper bot commented Aug 25, 2022

gnu-andrew commented Aug 26, 2022

gnu-andrew commented Aug 26, 2022

gnu-andrew left a comment

Choose a reason for hiding this comment

openjdk bot commented Aug 26, 2022 • edited Loading

dongbohe commented Aug 29, 2022

dongbohe commented Aug 29, 2022

dongbohe commented Aug 29, 2022

openjdk bot commented Aug 29, 2022

gnu-andrew commented Aug 31, 2022

gnu-andrew commented Sep 1, 2022

openjdk bot commented Sep 1, 2022

openjdk bot commented Sep 1, 2022

dongbohe commented Jun 1, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Jun 1, 2022 •

edited

Loading

openjdk bot commented Aug 26, 2022 •

edited

Loading