Skip to content

Conversation

@RealFYang
Copy link
Member

@RealFYang RealFYang commented Mar 31, 2022

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

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8284068: riscv: should call Atomic::release_store in JavaThread::set_thread_state

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/8055/head:pull/8055
$ git checkout pull/8055

Update a local copy of the PR:
$ git checkout pull/8055
$ git pull https://git.openjdk.java.net/jdk pull/8055/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8055

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/8055.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 31, 2022

👋 Welcome back fyang! 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 Mar 31, 2022
@openjdk
Copy link

openjdk bot commented Mar 31, 2022

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

  • hotspot-runtime

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

mlbridge bot commented Mar 31, 2022

Webrevs

Copy link
Member

@shipilev shipilev left a 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.

@openjdk
Copy link

openjdk bot commented Apr 1, 2022

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

8284068: riscv: should call Atomic::release_store in JavaThread::set_thread_state

Reviewed-by: shade

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 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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Apr 1, 2022
@RealFYang
Copy link
Member Author

Looks fine and trivial.

Thank you. Since this will only affect riscv, I think it's safe for integration.
/integrate

@openjdk
Copy link

openjdk bot commented Apr 2, 2022

Going to push as commit e5e1aab.
Since your change was applied there have been 27 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 Apr 2, 2022
@openjdk openjdk bot closed this Apr 2, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 2, 2022
@openjdk
Copy link

openjdk bot commented Apr 2, 2022

@RealFYang Pushed as commit e5e1aab.

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

@RealFYang RealFYang deleted the JDK-8284068 branch April 2, 2022 02:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants