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

8297697: RISC-V: Add support for SATP mode detection #11388

Closed
wants to merge 3 commits into from

Conversation

feilongjiang
Copy link
Member

@feilongjiang feilongjiang commented Nov 28, 2022

RISC-V gets sv57-based virtual memory support since Linux 5.18 [1]. There are some reports of the OpenJDK RISC-V port crashing on Linux 5.18+ with QEMU-system 7.10+ when sv57 was enabled [2][3] as currently RISC-V port only supports up to sv48.
As discussed in [3], given the fact that there are no existing boards or hardware even support anything more than sv48,
we decide to add detection for SATP (Supervisor Address Translation and Protection) mode at JVM startup time if possible and explicitly issue a warning and stop early when sv57 is enabled.

When sv57 is enabled, the output of java -version would be:

root@qemuriscv64:~# jdk/bin/java -version
Error occurred during initialization of VM
Unsupported satp mode: sv57

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=aa5b537b0ecc16992577b013f11112d54c7ce869
[2] https://mail.openjdk.org/pipermail/riscv-port-dev/2022-September/000639.html
[3] https://mail.openjdk.org/pipermail/riscv-port-dev/2022-November/000681.html

Testing:

  • QEMU-system with sv48/sv57-enabled Linux image -version test
  • HiFive Unmatched board (sv39) -version test

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-8297697: RISC-V: Add support for SATP mode detection

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 11388

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 28, 2022

👋 Welcome back fjiang! 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 added the rfr Pull request is ready for review label Nov 28, 2022
@openjdk
Copy link

openjdk bot commented Nov 28, 2022

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

  • hotspot

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 hotspot-dev@openjdk.org label Nov 28, 2022
@mlbridge
Copy link

mlbridge bot commented Nov 28, 2022

Webrevs

Copy link
Member

@RealFYang RealFYang left a comment

Choose a reason for hiding this comment

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

Updated change looks fine. Thanks.

@openjdk
Copy link

openjdk bot commented Nov 29, 2022

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

8297697: RISC-V: Add support for SATP mode detection

Reviewed-by: fyang, luhenry

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

  • 3b513a4: 8297802: display of @SPEC tags should mimic that of @see tags
  • 4485d4e: 8297728: Cache invocation type rather than invoker in NamedFunction
  • e9d501e: 8297519: Improve expressions and modernise code in PKCS
  • 1722f9c: 8290231: java/foreign/malloc/TestMixedMallocFree.java crashed in JDK19 ATR run
  • 1a2ff58: 8297736: test/jdk/java/foreign/TestMatrix.java is broken
  • 6bac332: 8297853: windows-x86 test build broken
  • 53dd214: 8297742: Combine vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount tests
  • 1323e98: 8297170: misc JCK tests fail with "FATAL ERROR in native method: JDWP Can't disable vthread end events, jvmtiError=JVMTI_ERROR_WRONG_PHASE(112)"
  • c685569: 8297731: Remove redundant check in MutableBigInteger.divide
  • dcf431d: 8287400: Make BitMap range parameter names consistent
  • ... and 69 more: https://git.openjdk.org/jdk/compare/85ddd8f2af51fa5ea7f63027285509afb9a5c439...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 (@RealFYang) 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 Nov 29, 2022
@feilongjiang
Copy link
Member Author

@luhenry @RealFYang -- Thanks!
/integrate

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

openjdk bot commented Dec 1, 2022

@feilongjiang
Your change (at version 297ce94) is now ready to be sponsored by a Committer.

@RealFYang
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Dec 1, 2022

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

  • 3b513a4: 8297802: display of @SPEC tags should mimic that of @see tags
  • 4485d4e: 8297728: Cache invocation type rather than invoker in NamedFunction
  • e9d501e: 8297519: Improve expressions and modernise code in PKCS
  • 1722f9c: 8290231: java/foreign/malloc/TestMixedMallocFree.java crashed in JDK19 ATR run
  • 1a2ff58: 8297736: test/jdk/java/foreign/TestMatrix.java is broken
  • 6bac332: 8297853: windows-x86 test build broken
  • 53dd214: 8297742: Combine vmTestbase/nsk/monitoring/ThreadMXBean/resetPeakThreadCount tests
  • 1323e98: 8297170: misc JCK tests fail with "FATAL ERROR in native method: JDWP Can't disable vthread end events, jvmtiError=JVMTI_ERROR_WRONG_PHASE(112)"
  • c685569: 8297731: Remove redundant check in MutableBigInteger.divide
  • dcf431d: 8287400: Make BitMap range parameter names consistent
  • ... and 69 more: https://git.openjdk.org/jdk/compare/85ddd8f2af51fa5ea7f63027285509afb9a5c439...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 1, 2022

@RealFYang @feilongjiang Pushed as commit f49acd5.

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

Successfully merging this pull request may close these issues.

3 participants