Skip to content

Conversation

afshin-zafari
Copy link
Contributor

@afshin-zafari afshin-zafari commented Jun 24, 2025

The canary header test failed since there were concurrent remove and free() from the tree. The remove operations are synch'ed with corresponding NMT lock. The ReserveMemory::reserve() uses the same lock internally and is not included in the locked code block.

Tests: tier5 {macosx-aarch64, linux-x64, windows-x64} x {debug, release}


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-8360048: NMT crash in gtest/NMTGtests.java: fatal error: NMT corruption: Block at 0x0000017748307120: header canary broken (Bug - P2)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25950

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

Using diff file

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

Using Webrev

Link to Webrev Comment

…on: Block at 0x0000017748307120: header canary broken
@bridgekeeper
Copy link

bridgekeeper bot commented Jun 24, 2025

👋 Welcome back azafari! 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 Jun 24, 2025

@afshin-zafari 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:

8360048: NMT crash in gtest/NMTGtests.java: fatal error: NMT corruption: Block at 0x0000017748307120: header canary broken

Reviewed-by: jsjolen, gziemski

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

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 Jun 24, 2025
@openjdk
Copy link

openjdk bot commented Jun 24, 2025

@afshin-zafari 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 Jun 24, 2025

Webrevs

Copy link
Contributor

@jdksjolen jdksjolen left a comment

Choose a reason for hiding this comment

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

It would be good if we could remove the dependency on the global instance in the source code and create new VMT's for each test. That would make the tests less brittle.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 24, 2025
Comment on lines 451 to 452
rtree = VirtualMemoryTracker::Instance::tree();
rtree->tree().remove_all();

Choose a reason for hiding this comment

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

I think I asked about this before - can we do remove_all in the constructor to avoid this 2 line repeating pattern?

Otherwise looks good, can you please check the GHA test failures on Windows?

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think that's the right way to go. I think it's better if we can avoid using the global instance, and not change the code of the VMT in order to appease the tests.

Choose a reason for hiding this comment

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

Sure, I suggested the easiest fix I could think of, but doing it this way is even better!

@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Jun 24, 2025
Copy link
Contributor

@jdksjolen jdksjolen left a comment

Choose a reason for hiding this comment

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

Nice!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 26, 2025
Copy link

@gerard-ziemski gerard-ziemski left a comment

Choose a reason for hiding this comment

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

LGTM

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 24, 2025

@afshin-zafari 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 issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@afshin-zafari
Copy link
Contributor Author

keep it open, bot!

@openjdk
Copy link

openjdk bot commented Aug 6, 2025

@afshin-zafari this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout _8360048_corrupted_canary_header
git fetch https://git.openjdk.org/jdk.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch and removed ready Pull request is ready to be integrated labels Aug 6, 2025
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Aug 7, 2025
@afshin-zafari
Copy link
Contributor Author

Thanks for your reviews @jdksjolen and @gerard-ziemski.
/integrate

@openjdk
Copy link

openjdk bot commented Aug 8, 2025

@afshin-zafari This pull request has not yet been marked as ready for integration.

Copy link
Contributor

@jdksjolen jdksjolen left a comment

Choose a reason for hiding this comment

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

Re-approved

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Aug 8, 2025
@afshin-zafari
Copy link
Contributor Author

Thank you @jdksjolen.
/integrate

@openjdk
Copy link

openjdk bot commented Aug 8, 2025

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 8, 2025

@afshin-zafari Pushed as commit 1b3e231.

💡 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 [email protected] integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants