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

JDK-8318089: Class space not marked as such with NMT when CDS is off #16184

Conversation

tstuefe
Copy link
Member

@tstuefe tstuefe commented Oct 13, 2023

If Xshare is off, we don't correctly register class space with NMT. We should do that.


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-8318089: Class space not marked as such with NMT when CDS is off (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16184

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 13, 2023

👋 Welcome back stuefe! 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 Oct 13, 2023

@tstuefe 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 13, 2023
@tstuefe tstuefe marked this pull request as ready for review October 13, 2023 18:10
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 13, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 13, 2023

Webrevs

Copy link

@Hamlin-Li Hamlin-Li left a comment

Choose a reason for hiding this comment

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

LGTM.

@openjdk
Copy link

openjdk bot commented Oct 14, 2023

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

8318089: Class space not marked as such with NMT when CDS is off

Reviewed-by: mli, dholmes

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

  • 24bc5bd: 8318104: macOS 10.13 check in TabButtonAccessibility.m can be removed
  • e25a49a: 8318471: ProblemList compiler/sharedstubs/SharedTrampolineTest.java
  • ce8ebeb: 8317979: Use TZ database style abbreviations in the CLDR locale provider
  • ab13568: 8318029: Minor improvement to logging output in container at-requires
  • 278de7a: 8318458: Update javac and java manpages with restricted method options
  • 6fc3514: 8318363: Foreign benchmarks fail to build on some platforms
  • 31ef400: 8318183: C2: VM may crash after hitting node limit
  • 4e77b3c: 8315974: Make fields final in 'com.sun.crypto.provider' package
  • 8dd8096: 8317886: Add @sealedGraph to ByteBuffer
  • 9843c97: 8318365: Test runtime/cds/appcds/sharedStrings/InternSharedString.java fails after JDK-8311538
  • ... and 66 more: https://git.openjdk.org/jdk/compare/7d31146f4d4ec81728c591d839ee2bb942e5e5fa...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 14, 2023
// This does currently not work because rs may be the result of a split
// operation and NMT seems not to be able to handle splits.
// Will be fixed with JDK-8243535.
// MemTracker::record_virtual_memory_type((address)rs.base(), mtClass);
Copy link
Member

Choose a reason for hiding this comment

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

So why not just uncomment this line, instead of moving this to the caller?

Copy link
Member Author

@tstuefe tstuefe Oct 18, 2023

Choose a reason for hiding this comment

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

There are two initialization paths: one is used when running with CDS, and metaspace is initialized together with it, and one is when running without CDS. This function is used for both. The CDS path is already covered, though, I only need to do the NMT registration for the non-CDS case. Otherwise, we register things doubly.

Copy link
Member Author

Choose a reason for hiding this comment

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

Should have written that in the PR description, sorry.

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

Thanks for the explanation.

Looks good.

@tstuefe
Copy link
Member Author

tstuefe commented Oct 19, 2023

Thanks @dholmes-ora !

/integrate

@openjdk
Copy link

openjdk bot commented Oct 19, 2023

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

  • 24bc5bd: 8318104: macOS 10.13 check in TabButtonAccessibility.m can be removed
  • e25a49a: 8318471: ProblemList compiler/sharedstubs/SharedTrampolineTest.java
  • ce8ebeb: 8317979: Use TZ database style abbreviations in the CLDR locale provider
  • ab13568: 8318029: Minor improvement to logging output in container at-requires
  • 278de7a: 8318458: Update javac and java manpages with restricted method options
  • 6fc3514: 8318363: Foreign benchmarks fail to build on some platforms
  • 31ef400: 8318183: C2: VM may crash after hitting node limit
  • 4e77b3c: 8315974: Make fields final in 'com.sun.crypto.provider' package
  • 8dd8096: 8317886: Add @sealedGraph to ByteBuffer
  • 9843c97: 8318365: Test runtime/cds/appcds/sharedStrings/InternSharedString.java fails after JDK-8311538
  • ... and 66 more: https://git.openjdk.org/jdk/compare/7d31146f4d4ec81728c591d839ee2bb942e5e5fa...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 19, 2023

@tstuefe Pushed as commit c0e154c.

💡 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-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
3 participants