-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
8321972: test runtime/Unsafe/InternalErrorTest.java timeout on linux-riscv64 platform #17103
Conversation
👋 Welcome back gcao! A progress list of the required criteria for merging this PR into |
/contributor add @RealFYang |
@zifeihan |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks reasonable to me. I find that the native GNU compiler toolchain on both my unmatched and licheepi-4a boards are compiling with RVC by default, which means native JDK builds on those hardware platforms will also have compressed instructions.
@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:
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 74 new commits pushed to the
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 |
@RealFYang : Thanks for taking a look. If there is no other comment, I will proceed to integrate. |
/integrate |
/sponsor |
Going to push as commit e8768ae.
Your commit was automatically rebased without conflicts. |
@RealFYang @zifeihan Pushed as commit e8768ae. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
/backport jdk21u-dev |
@zifeihan the backport was successfully created on the branch backport-zifeihan-e8768ae0 in my personal fork of openjdk/jdk21u-dev. To create a pull request with this backport targeting openjdk/jdk21u-dev:master, just click the following link: The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:
If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u-dev:
|
As described on the JBS issue, JDK-8320886 extended InternalErrorTest.java adding extra test for Unsafe_SetMemory0 trying to access next page after truncation. This triggers SIGBUS error and control flow is transfered to JVM signal handler [1]. But the current logic doesn't consider 16-bit compressed instructions when calculating next_pc. It always add NativeCall::instruction_size which is 4 to pc and use the result as next_pc. This is not correct as the memset invoked in this case contains compressed instructions and it is those instructions that are triggering the SIGBUS error.
The proposed fix is similar with other platform with variable-length instruction encoding like x86.
The encoding of the instruction triggering the SIGBUS error is checked to see if it is a compressed instruction and then calculate next_pc based on that. The test case can now pass normally with this fix.
[1] https://github.com/openjdk/jdk/blob/master/src/hotspot/os_cpu/linux_riscv/os_linux_riscv.cpp#L274
Testing:
Progress
Issue
Reviewers
Contributors
<fyang@openjdk.org>
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/17103/head:pull/17103
$ git checkout pull/17103
Update a local copy of the PR:
$ git checkout pull/17103
$ git pull https://git.openjdk.org/jdk.git pull/17103/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 17103
View PR using the GUI difftool:
$ git pr show -t 17103
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/17103.diff
Webrev
Link to Webrev Comment