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

8346923: MetaspaceShared base calculation may cause overflow in align_up #23168

Conversation

calvinccheung
Copy link
Member

@calvinccheung calvinccheung commented Jan 17, 2025

This fix adds overflow detection in MetaspaceShared::compute_shared_base before calling align_up. It is needed in order to work with the proposed changes for JDK-8318127 which will add an assert to check for overflow.

Passed tiers 1 - 4 testing.


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-8346923: MetaspaceShared base calculation may cause overflow in align_up (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23168

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@calvinccheung calvinccheung marked this pull request as ready for review January 17, 2025 00:48
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 17, 2025

👋 Welcome back ccheung! 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

openjdk bot commented Jan 17, 2025

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

8346923: MetaspaceShared base calculation may cause overflow in align_up

Reviewed-by: iklam, matsaave

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

  • 21feef3: 8348239: SA does not know about DeoptimizeObjectsALotThread
  • 8cc1304: 8287788: Implement a better allocator for downcalls
  • 039e73f: 8346736: Java Security Standard Algorithm Names spec should include key algorithm names
  • aba60a9: 8189441: Define algorithm names for keys derived from KeyAgreement
  • 03106eb: 8344119: CUPSPrinter does not respect PostScript printer definition specification in case of reading ImageableArea values from PPD files
  • ad01dfb: 8346920: Serial: Support allocation in old generation when heap is almost full
  • 1d8ccb8: 8342465: Improve API documentation for java.lang.classfile
  • 7d6055a: 8348429: Update cross-compilation devkits to Fedora 41/gcc 13.2
  • f1e0797: 8348586: Optionally silence make warnings about non-control variables
  • ffeb9b5: 8342807: Update links in java.base to use https://
  • ... and 228 more: https://git.openjdk.org/jdk/compare/46ba515c4989de7545d409570315274e0ea1c5ac...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 rfr Pull request is ready for review label Jan 17, 2025
@openjdk
Copy link

openjdk bot commented Jan 17, 2025

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

@mlbridge
Copy link

mlbridge bot commented Jan 17, 2025

Webrevs

Copy link
Member

@iklam iklam left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 21, 2025
Copy link
Contributor

@matias9927 matias9927 left a comment

Choose a reason for hiding this comment

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

LGTM!

@calvinccheung
Copy link
Member Author

Thanks @iklam and @matias9927 for the review.

/integrate

@openjdk
Copy link

openjdk bot commented Jan 27, 2025

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

  • 21feef3: 8348239: SA does not know about DeoptimizeObjectsALotThread
  • 8cc1304: 8287788: Implement a better allocator for downcalls
  • 039e73f: 8346736: Java Security Standard Algorithm Names spec should include key algorithm names
  • aba60a9: 8189441: Define algorithm names for keys derived from KeyAgreement
  • 03106eb: 8344119: CUPSPrinter does not respect PostScript printer definition specification in case of reading ImageableArea values from PPD files
  • ad01dfb: 8346920: Serial: Support allocation in old generation when heap is almost full
  • 1d8ccb8: 8342465: Improve API documentation for java.lang.classfile
  • 7d6055a: 8348429: Update cross-compilation devkits to Fedora 41/gcc 13.2
  • f1e0797: 8348586: Optionally silence make warnings about non-control variables
  • ffeb9b5: 8342807: Update links in java.base to use https://
  • ... and 228 more: https://git.openjdk.org/jdk/compare/46ba515c4989de7545d409570315274e0ea1c5ac...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 27, 2025

@calvinccheung Pushed as commit 1916a77.

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

@calvinccheung calvinccheung deleted the 8346923-MetaspaceShared-base-calc branch January 27, 2025 23:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants