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

8276545: Fix handling of trap count overflow in Parse::Parse() #10187

Closed
wants to merge 3 commits into from

Conversation

dhanalla
Copy link
Contributor

@dhanalla dhanalla commented Sep 6, 2022

The API trap_count(reason) returns (uint)-1 == 0xFFFFFFFF in case of trap count overflow,
trap_count_limit()) returns (jubyte)-1 == 0xFF which leads to the failure of overflow check
if (md_count == md->trap_count_limit()) (which is 0xFFFFFFFF == 0xFF).

     uint md_count = md->trap_count(reason);
     if (md_count != 0) {
               **if (md_count == md->trap_count_limit())**  // Trap count is overflown 

Trap count value is computed as 0xFFFFFFFF + overflowcount (diff after 0xFF) which is wrong.
md_count += md->overflow_trap_count();

Fix:

Overflow check should be either of below
if (md_count >= md->trap_count_limit()) or if (md_count == (uint)-1)

Total trap count as
md_count = md->trap_count_limit() + md->overflow_trap_count();

Test: local JTReg test for hotspot_all group.


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-8276545: Fix handling of trap count overflow in Parse::Parse()

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10187

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

Using diff file

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

@bridgekeeper bridgekeeper bot added the oca Needs verification of OCA signatory status label Sep 6, 2022
@bridgekeeper
Copy link

bridgekeeper bot commented Sep 6, 2022

Hi @dhanalla, welcome to this OpenJDK project and thanks for contributing!

We do not recognize you as Contributor and need to ensure you have signed the Oracle Contributor Agreement (OCA). If you have not signed the OCA, please follow the instructions. Please fill in your GitHub username in the "Username" field of the application. Once you have signed the OCA, please let us know by writing /signed in a comment in this pull request.

If you already are an OpenJDK Author, Committer or Reviewer, please click here to open a new issue so that we can record that fact. Please use "Add GitHub user dhanalla" as summary for the issue.

If you are contributing this work on behalf of your employer and your employer has signed the OCA, please let us know by writing /covered in a comment in this pull request.

@openjdk
Copy link

openjdk bot commented Sep 6, 2022

@dhanalla The following label will be automatically applied to this pull request:

  • hotspot-compiler

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-compiler hotspot-compiler-dev@openjdk.org label Sep 6, 2022
@dhanalla
Copy link
Contributor Author

/covered

@bridgekeeper bridgekeeper bot added the oca-verify Needs verification of OCA signatory status label Sep 12, 2022
@bridgekeeper
Copy link

bridgekeeper bot commented Sep 12, 2022

Thank you! Please allow for a few business days to verify that your employer has signed the OCA. Also, please note that pull requests that are pending an OCA check will not usually be evaluated, so your patience is appreciated!

@bridgekeeper bridgekeeper bot removed oca Needs verification of OCA signatory status oca-verify Needs verification of OCA signatory status labels Sep 13, 2022
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 13, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 13, 2022

Webrevs

Copy link
Member

@TobiHartmann TobiHartmann 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
Copy link

openjdk bot commented Sep 22, 2022

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

8276545: Fix handling of trap count overflow in Parse::Parse()

Reviewed-by: thartmann, kvn

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

  • 739fdec: 8289162: runtime/NMT/ThreadedMallocTestType.java should print out memory allocations to help debug
  • a11477c: 8289797: tools/launcher/I18NArgTest.java fails on Japanese Windows environment
  • 7151128: 8294317: Insufficient build rules for tzdb.dat
  • fb4979c: 8290401: Support dump all phases and print nodes in ascending order of index
  • 112ca2b: 8293964: Unused check_for_duplicates parameter in ClassLoaderExt::process_jar_manifest
  • 99017b0: 8293064: Remove unused NET_xxx functions
  • 3419363: 8294361: Cleanup usages of StringBuffer in SQLOutputImpl
  • 1abf971: 8249627: Degrade Thread.suspend and Thread.resume
  • bc12e95: 8292969: Bad Thread Utilization in ForkJoinPool
  • dd51f7e: 8293996: C2: fix and simplify IdealLoopTree::do_remove_empty_loop
  • ... and 319 more: https://git.openjdk.org/jdk/compare/1cf245d77c0948b6f03025e80faa4517a6f79f3f...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@TobiHartmann, @vnkozlov) but any other Committer may sponsor as well.

➡️ 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 added the ready Pull request is ready to be integrated label Sep 22, 2022
@vnkozlov
Copy link
Contributor

Also configure GitHub Action testing on your branch.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Just small correction otherwise it is good.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Good.

Copy link
Member

@TobiHartmann TobiHartmann left a comment

Choose a reason for hiding this comment

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

Still looks good to me.

@dhanalla
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Sep 27, 2022
@openjdk
Copy link

openjdk bot commented Sep 27, 2022

@dhanalla
Your change (at version dc9d713) is now ready to be sponsored by a Committer.

@vnkozlov
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 30, 2022

Going to push as commit da4e96d.
Since your change was applied there have been 382 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 Sep 30, 2022
@openjdk openjdk bot closed this Sep 30, 2022
@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 Sep 30, 2022
@openjdk
Copy link

openjdk bot commented Sep 30, 2022

@vnkozlov @dhanalla Pushed as commit da4e96d.

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