Skip to content

8309627: Incorrect sorting of DirtyCardQueue buffers #1861

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

Closed
wants to merge 1 commit into from

Conversation

cost0much
Copy link
Contributor

@cost0much cost0much commented Jun 9, 2025

Clean backport. Fixes G1 DirtyCardQueue's sort from breaking on large heaps (8TB+ on default card size 512 bytes, 2TB+ for smallest card size 128 bytes). Ran on internal Amazon pipelines and passes jtreg tier1-4 + tck tests on the following platforms: linux x64, aarch64; macos x64, aarch64; windows x64. Also passes GHA.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8309627 needs maintainer approval

Issue

  • JDK-8309627: Incorrect sorting of DirtyCardQueue buffers (Bug - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/1861/head:pull/1861
$ git checkout pull/1861

Update a local copy of the PR:
$ git checkout pull/1861
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/1861/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1861

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/1861.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 9, 2025

👋 Welcome back cost0much! 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 9, 2025

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

8309627: Incorrect sorting of DirtyCardQueue buffers

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 17 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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot changed the title Backport b94b679e9a82ff2ee6daee9631ce707e9b9eaf6b 8309627: Incorrect sorting of DirtyCardQueue buffers Jun 9, 2025
@openjdk
Copy link

openjdk bot commented Jun 9, 2025

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Jun 9, 2025
@openjdk
Copy link

openjdk bot commented Jun 9, 2025

⚠️ @cost0much This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 9, 2025
@mlbridge
Copy link

mlbridge bot commented Jun 9, 2025

Webrevs

@cost0much
Copy link
Contributor Author

/approval request Fixes G1 DirtyCardQueue's sort breaking on large heaps (8TB+ on default card size 512 bytes, 2TB+ for smallest card size 128 bytes). Applies cleanly. Patched in JDK22 and no bugtail. Passes jtreg tier1-4 and tck tests on multiple platforms; see PR for list. GHA also passes. Risk is medium because hotspot change that affects G1. However, risk is mitigated by minor change and extensive testing.

@openjdk
Copy link

openjdk bot commented Jun 9, 2025

@cost0much
8309627: The approval request has been created successfully.

@openjdk openjdk bot added approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Jun 9, 2025
@cost0much
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 16, 2025
@openjdk
Copy link

openjdk bot commented Jun 16, 2025

@cost0much
Your change (at version 29d2c0c) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 16, 2025

Going to push as commit b9a6838.
Since your change was applied there have been 17 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 Jun 16, 2025
@openjdk openjdk bot closed this Jun 16, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jun 16, 2025
@openjdk
Copy link

openjdk bot commented Jun 16, 2025

@phohensee @cost0much Pushed as commit b9a6838.

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

@cost0much cost0much deleted the 8309627 branch June 16, 2025 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants