Skip to content

8253926: Use extra_size correctly in anon_mmap_aligned #479

Closed
kstefanj wants to merge 1 commit intoopenjdk:masterfrom
kstefanj:8253926
Closed

8253926: Use extra_size correctly in anon_mmap_aligned #479
kstefanj wants to merge 1 commit intoopenjdk:masterfrom
kstefanj:8253926

Conversation

@kstefanj
Copy link
Copy Markdown
Contributor

@kstefanj kstefanj commented Oct 2, 2020

A recent cleanup (8253638: Cleanup os::reserve_memory and remove MAP_FIXED) got a size mixed up in anon_mmap_aligned(). Instead of passing down the calculated extra_size to anon_mmap() it uses the original size bytes.

This resulted in an early crash when using large pages and with this fix the crash goes away.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8253926: Use extra_size correctly in anon_mmap_aligned

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk pull/479/head:pull/479
$ git checkout pull/479

@bridgekeeper
Copy link
Copy Markdown

bridgekeeper bot commented Oct 2, 2020

👋 Welcome back sjohanss! 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
Copy link
Copy Markdown

openjdk bot commented Oct 2, 2020

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

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Oct 2, 2020
@kstefanj kstefanj marked this pull request as ready for review October 2, 2020 10:15
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 2, 2020
@mlbridge
Copy link
Copy Markdown

mlbridge bot commented Oct 2, 2020

Webrevs

Copy link
Copy Markdown
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.

Looks fine. I read the original changeset, and there seem to be no other instances of this error.

@openjdk
Copy link
Copy Markdown

openjdk bot commented Oct 2, 2020

@kstefanj 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 more details.

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

8253926: Use extra_size correctly in anon_mmap_aligned

Reviewed-by: shade, kbarrett, tschatzl, stefank

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

  • b8966e1: 8253928: G1: Remove G1ConcurrentMarkThread::set_in_progress declaration
  • 4185ed3: 5078989: Null Pointer exception in SpinnerListMode
  • 6f40a41: 8253891: Debug x86_32 builds fail after JDK-8239090
  • b9505df: 8253118: Avoid unnecessary deopts when OSR nmethods of the same level are present.
  • 3c4e824: 8249783: Simplify DerValue and DerInputStream
  • 9230c2a: 8253747: tools/jpackage/share/AppImagePackageTest.java fails with InstalledPackageSize: 0
  • cfd41c0: 8232840: java/math/BigInteger/largeMemory/SymmetricRangeTests.java fails due to "OutOfMemoryError: Requested array size exceeds VM limit"
  • 8fda5b8: 8253904: Revert Tokenizer improvements JDK-8224225
  • 60ec2a5: 8253824: Revert JDK-8253089 since VS warning C4307 has been disabled
  • 90c131f: 8224225: Tokenizer improvements
  • ... and 44 more: https://git.openjdk.java.net/jdk/compare/2fe0a5d75ee9434017b3df5cfa713ef895a19866...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 Oct 2, 2020
@kstefanj
Copy link
Copy Markdown
Contributor Author

kstefanj commented Oct 2, 2020

Thanks @shipilev and @kimbarrett for reviewing.

@kstefanj
Copy link
Copy Markdown
Contributor Author

kstefanj commented Oct 2, 2020

Thanks @tschatzl and @stefank, I will integrate this now.

@kstefanj
Copy link
Copy Markdown
Contributor Author

kstefanj commented Oct 2, 2020

/integrate

@openjdk openjdk bot closed this Oct 2, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 2, 2020
@openjdk
Copy link
Copy Markdown

openjdk bot commented Oct 2, 2020

@kstefanj Since your change was applied there have been 54 commits pushed to the master branch:

  • b8966e1: 8253928: G1: Remove G1ConcurrentMarkThread::set_in_progress declaration
  • 4185ed3: 5078989: Null Pointer exception in SpinnerListMode
  • 6f40a41: 8253891: Debug x86_32 builds fail after JDK-8239090
  • b9505df: 8253118: Avoid unnecessary deopts when OSR nmethods of the same level are present.
  • 3c4e824: 8249783: Simplify DerValue and DerInputStream
  • 9230c2a: 8253747: tools/jpackage/share/AppImagePackageTest.java fails with InstalledPackageSize: 0
  • cfd41c0: 8232840: java/math/BigInteger/largeMemory/SymmetricRangeTests.java fails due to "OutOfMemoryError: Requested array size exceeds VM limit"
  • 8fda5b8: 8253904: Revert Tokenizer improvements JDK-8224225
  • 60ec2a5: 8253824: Revert JDK-8253089 since VS warning C4307 has been disabled
  • 90c131f: 8224225: Tokenizer improvements
  • ... and 44 more: https://git.openjdk.java.net/jdk/compare/2fe0a5d75ee9434017b3df5cfa713ef895a19866...master

Your commit was automatically rebased without conflicts.

Pushed as commit f686a38.

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

@kstefanj kstefanj deleted the 8253926 branch May 18, 2021 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

5 participants