Skip to content

8296158: Refactor the verification of CDS region checksum #12424

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

Conversation

iklam
Copy link
Member

@iklam iklam commented Feb 4, 2023

Consolidate the two old functions

  • FileMapInfo::region_crc_check(char* buf, size_t size, int expected_crc)
  • FileMapInfo::verify_region_checksum(int i)

Into a single function FileMapRegion::check_region_crc().

Also performed some minor renaming and removed a useless API.


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-8296158: Refactor the verification of CDS region checksum

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12424

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 4, 2023

👋 Welcome back iklam! 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 Feb 4, 2023

@iklam 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 Feb 4, 2023
@iklam iklam marked this pull request as ready for review February 4, 2023 01:36
@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 4, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 4, 2023

Webrevs

Copy link
Member

@calvinccheung calvinccheung left a comment

Choose a reason for hiding this comment

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

Code refactoring looks good.

@openjdk
Copy link

openjdk bot commented Feb 4, 2023

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

8296158: Refactor the verification of CDS region checksum

Reviewed-by: ccheung, 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 4 new commits pushed to the master branch:

  • 655a712: 8301444: Port fdlibm hyperbolic transcendental functions to Java
  • b242eef: 8280419: Remove dead code related to VerifyThread and verify_thread()
  • 4ce493f: 8302225: SunJCE Provider doesn't validate key sizes when using 'constrained' transforms for AES/KW and AES/KWP
  • a39cf2e: 8301753: AppendFile/WriteFile has differences between make 3.81 and 4+

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 ready Pull request is ready to be integrated label Feb 4, 2023
// This function should be called after the region has been properly
// loaded into memory via FileMapInfo::map_region() or FileMapInfo::read_region().
// I.e., this->mapped_base() must be valid.
if (!VerifySharedSpaces) {
Copy link
Contributor

Choose a reason for hiding this comment

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

While I think this is a nice shortcut to avoid checking VerifySharedSpaces, I think it occludes the fact it is a necessary condition in the if statements below. Just my 2 cents but I think it is more intuitive to keep if (VerifySharesSpaces && !check_region_crc()) and keep an assert inside this method.

Either way does work, so go with what you think makes the most sense. Other than that, LGTM!

Copy link
Member Author

Choose a reason for hiding this comment

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

Thanks for the comment. I fixed the code as you suggested.

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!

@iklam
Copy link
Member Author

iklam commented Feb 17, 2023

Thanks @matias9927 and @calvinccheung for the review
/integrate

@openjdk
Copy link

openjdk bot commented Feb 17, 2023

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

  • 655a712: 8301444: Port fdlibm hyperbolic transcendental functions to Java
  • b242eef: 8280419: Remove dead code related to VerifyThread and verify_thread()
  • 4ce493f: 8302225: SunJCE Provider doesn't validate key sizes when using 'constrained' transforms for AES/KW and AES/KWP
  • a39cf2e: 8301753: AppendFile/WriteFile has differences between make 3.81 and 4+

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Feb 17, 2023

@iklam Pushed as commit 49eb68b.

💡 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
Development

Successfully merging this pull request may close these issues.

3 participants