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

8272791: java -XX:BlockZeroingLowLimit=1 crashes after 8270947 #8756

Closed
wants to merge 3 commits into from

Conversation

theRealAph
Copy link
Contributor

@theRealAph theRealAph commented May 17, 2022

This is an assertion failure caused by setting BlockZeroingLowLimit < wordSize.

I believe there was some confusion when writing this code about whether BlockZeroingLowLimit should be in words or bytes, and it makes no sense for it to be less than a single word. If anyone ever tried to use a parameter < 8, it triggers an assertion.

This patch does two things. Firstly, it corrects a guarantee which erroneously used zero_words_block_size rather than wordSize. The value of both of these is 8, so it doesn't change anything in the generated code. Secondly, it clips the BlockZeroingLowLimit so that it doesn't trigger the assertion.

Perhaps it would be better to change the lower limit to 8 instead of this silent correction. There is no backward compatibility issue here, because any attempt to set BlockZeroingLowLimit < 8 in the past would have exited the VM with an error, so I don't believe a CSR is warranted if we do change the allowable range.

So, which should it be? Change the lower limit of the range of the BlockZeroingLowLimit system flag, or allow 1 still to be used and silently fix it? Opinions welcome.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed (1 review required, with at least 1 reviewer)

Issue

  • JDK-8272791: java -XX:BlockZeroingLowLimit=1 crashes after 8270947

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8756

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 17, 2022

👋 Welcome back aph! 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 May 17, 2022
@openjdk
Copy link

openjdk bot commented May 17, 2022

@theRealAph 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 May 17, 2022
@mlbridge
Copy link

mlbridge bot commented May 17, 2022

Webrevs

@vnkozlov
Copy link
Contributor

Change the lower limit of the range of the BlockZeroingLowLimit system flag.
Seems RISCV code has the same issue.

@theRealAph theRealAph marked this pull request as draft May 17, 2022 18:37
@theRealAph
Copy link
Contributor Author

Change the lower limit of the range of the BlockZeroingLowLimit system flag. Seems RISCV code has the same issue.

OK.

@openjdk openjdk bot removed the rfr Pull request is ready for review label May 17, 2022
@shipilev
Copy link
Member

Why not just do:

diff --git a/src/hotspot/cpu/aarch64/globals_aarch64.hpp b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
index 56fc873267d..b6310127a4d 100644
--- a/src/hotspot/cpu/aarch64/globals_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/globals_aarch64.hpp
@@ -105,7 +105,7 @@ define_pd_global(intx, InlineSmallCode,          1000);
           "Use DC ZVA for block zeroing")                               \
   product(intx, BlockZeroingLowLimit, 256,                              \
           "Minimum size in bytes when block zeroing will be used")      \
-          range(1, max_jint)                                            \
+          range(wordSize, max_jint)                                     \
   product(bool, TraceTraps, false, "Trace all traps the signal handler")\
   product(int, SoftwarePrefetchHintDistance, -1,                        \
           "Use prfm hint with specified distance in compiled code."     \

?

@@ -4855,7 +4855,7 @@ address MacroAssembler::zero_words(Register ptr, Register cnt)
// r10, r11, rscratch1, and rscratch2 are clobbered.
address MacroAssembler::zero_words(Register base, uint64_t cnt)
{
guarantee(zero_words_block_size < BlockZeroingLowLimit,
guarantee(wordSize <= BlockZeroingLowLimit,
Copy link
Member

Choose a reason for hiding this comment

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

Surely, this guarantee would now never fire? Maybe we should demote it to assert to protect from accidental range error. There is no need to pay the price in release bits, I think.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

True.

@openjdk
Copy link

openjdk bot commented May 19, 2022

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

8272791: java -XX:BlockZeroingLowLimit=1 crashes after 8270947

Reviewed-by: shade, kvn

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

  • f7a37f5: 8287202: GHA: Add macOS aarch64 to the list of default platforms for workflow_dispatch event
  • d889319: 8287254: Clean up Xcode sysroot logic
  • 593d2b7: 8287091: aarch64 : guarantee(val < (1ULL << nbits)) failed: Field too big for insn
  • 6585043: 8287181: Avoid redundant HashMap.containsKey calls in InternalLocaleBuilder.setExtension
  • a0cccb5: 8286490: JvmtiEventControllerPrivate::set_event_callbacks CLEARING_MASK computation is incorrect
  • 742644e: 8287263: java/nio/channels/FileChannel/LargeMapTest.java times out on Windows
  • d792cbc: 8286211: Update PCSC-Lite for Suse Linux to 1.9.5
  • 9b7e42c: 8284209: Replace remaining usages of 'a the' in source code
  • 6cc4bb1: 6725221: Standardize obtaining boolean properties with defaults
  • 194bc08: 8287249: Zero: Missing BarrierSetNMethod::arm() method
  • ... and 118 more: https://git.openjdk.java.net/jdk/compare/c0d51d42d9715b44df995328bba978ba61dec3af...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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 19, 2022
Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Good.

@theRealAph theRealAph marked this pull request as ready for review May 25, 2022 08:30
@openjdk openjdk bot added the rfr Pull request is ready for review label May 25, 2022
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Still good.

@theRealAph
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented May 25, 2022

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

  • f7a37f5: 8287202: GHA: Add macOS aarch64 to the list of default platforms for workflow_dispatch event
  • d889319: 8287254: Clean up Xcode sysroot logic
  • 593d2b7: 8287091: aarch64 : guarantee(val < (1ULL << nbits)) failed: Field too big for insn
  • 6585043: 8287181: Avoid redundant HashMap.containsKey calls in InternalLocaleBuilder.setExtension
  • a0cccb5: 8286490: JvmtiEventControllerPrivate::set_event_callbacks CLEARING_MASK computation is incorrect
  • 742644e: 8287263: java/nio/channels/FileChannel/LargeMapTest.java times out on Windows
  • d792cbc: 8286211: Update PCSC-Lite for Suse Linux to 1.9.5
  • 9b7e42c: 8284209: Replace remaining usages of 'a the' in source code
  • 6cc4bb1: 6725221: Standardize obtaining boolean properties with defaults
  • 194bc08: 8287249: Zero: Missing BarrierSetNMethod::arm() method
  • ... and 118 more: https://git.openjdk.java.net/jdk/compare/c0d51d42d9715b44df995328bba978ba61dec3af...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 25, 2022
@openjdk openjdk bot closed this May 25, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels May 25, 2022
@openjdk
Copy link

openjdk bot commented May 25, 2022

@theRealAph Pushed as commit e17118a.

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

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
3 participants