-
Notifications
You must be signed in to change notification settings - Fork 6.2k
JDK-8284068: riscv: should call Atomic::release_store in JavaThread::set_thread_state #8055
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
Conversation
|
👋 Welcome back fyang! A progress list of the required criteria for merging this PR into |
|
@RealFYang The following label will be automatically applied to this pull request:
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. |
shipilev
left a comment
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 fine and trivial.
|
@RealFYang 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 17 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. ➡️ To integrate this PR with the above commit message to the |
Thank you. Since this will only affect riscv, I think it's safe for integration. |
|
Going to push as commit e5e1aab.
Your commit was automatically rebased without conflicts. |
|
@RealFYang Pushed as commit e5e1aab. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
For RISCV, we use membars when accessing volatile _thread_state through Atomic::load_acquire in JavaThread::thread_state.
Accordingly, we should use Atomic::release_store to access volatile _thread_state in JavaThread::set_thread_state.
This is correct for our internal JDK 11 distribution: both functions are guarded by a single-line macro check for architectures [1].
The code is refactored in JDK mainline: each function has their own architecture macro check.
But looks like we only kept the macro check for RISCV64 in JavaThread::thread_state when porting from JDK 11.
The same check is missing for JavaThread::set_thread_state. We should add it back.
Tested with hotspot tier1 & jdk tier1 on Linux-riscv64 board. No new errors witnessed.
Note that this will only affect the RISCV architecture.
[1] https://gitee.com/openeuler/bishengjdk-11/blob/risc-v/src/hotspot/share/runtime/thread.inline.hpp#L123
Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8055/head:pull/8055$ git checkout pull/8055Update a local copy of the PR:
$ git checkout pull/8055$ git pull https://git.openjdk.java.net/jdk pull/8055/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 8055View PR using the GUI difftool:
$ git pr show -t 8055Using diff file
Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8055.diff