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

8324280: RISC-V: Incorrect implementation in VM_Version::parse_satp_mode #2178

Closed

Conversation

zifeihan
Copy link
Member

@zifeihan zifeihan commented Jan 26, 2024

Hi, The same issue also exists in the JDK17U: I can reproduce it locally and use this clean patch can fix that issue, So I would like to backport this to JDK17U. The parse_satp_mode function is used to parse SATP. Use SATP (Supervised Address Translation and Protection) mode at JVM startup and explicitly warn and stop early when sv57 is enabled [1]. Tier1 tested with fastdebug build using qemu systems. This is a risc-v specific change. Backport is clean, risk is low.

[1] openjdk/jdk#11388


Progress

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

Issue

  • JDK-8324280: RISC-V: Incorrect implementation in VM_Version::parse_satp_mode (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2178

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 26, 2024

👋 Welcome back gcao! 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 openjdk bot changed the title Backport e7fdac9d5ce56d2f589df59a7fd2869e35ba2991 8324280: RISC-V: Incorrect implementation in VM_Version::parse_satp_mode Jan 26, 2024
@openjdk
Copy link

openjdk bot commented Jan 26, 2024

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

@openjdk
Copy link

openjdk bot commented Jan 26, 2024

⚠️ @zifeihan 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 rfr Pull request is ready for review approval labels Jan 26, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 26, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jan 26, 2024

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

8324280: RISC-V: Incorrect implementation in VM_Version::parse_satp_mode

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

  • 184fac8: 8316304: (fs) Add support for BasicFileAttributes.creationTime() for Linux
  • 9926d7c: 8324659: GHA: Generic jtreg errors are not reported
  • 6d8febb: 8309870: Using -proc:full should be considered requesting explicit annotation processing
  • 8fffc07: 8315761: Open source few swing JList and JMenuBar tests
  • f248ea8: 8318608: Enable parallelism in vmTestbase/nsk/stress/threads tests
  • 86df8c2: 8296631: NSS tests failing on OL9 linux-aarch64 hosts

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.

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 added ready Pull request is ready to be integrated and removed approval labels Jan 26, 2024
@zifeihan
Copy link
Member Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jan 29, 2024
@openjdk
Copy link

openjdk bot commented Jan 29, 2024

@zifeihan
Your change (at version 2f823f4) is now ready to be sponsored by a Committer.

@RealFYang
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jan 29, 2024

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

  • 184fac8: 8316304: (fs) Add support for BasicFileAttributes.creationTime() for Linux
  • 9926d7c: 8324659: GHA: Generic jtreg errors are not reported
  • 6d8febb: 8309870: Using -proc:full should be considered requesting explicit annotation processing
  • 8fffc07: 8315761: Open source few swing JList and JMenuBar tests
  • f248ea8: 8318608: Enable parallelism in vmTestbase/nsk/stress/threads tests
  • 86df8c2: 8296631: NSS tests failing on OL9 linux-aarch64 hosts

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 29, 2024
@openjdk openjdk bot closed this Jan 29, 2024
@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 Jan 29, 2024
@openjdk
Copy link

openjdk bot commented Jan 29, 2024

@RealFYang @zifeihan Pushed as commit 3432698.

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

@zifeihan zifeihan deleted the backport-zifeihan-e7fdac9d branch January 30, 2024 02:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
2 participants