stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8252521: possible race in java_suspend_self_with_safepoint_check

Browse Source 
Reviewed-by: dholmes, rehn
This commit is contained in:
Richard Reingruber 2020-09-04 09:01:45 +02:00
parent ae5a6dde2d
commit e25f2a5715
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/hotspot/share/runtime/thread.cpp
View File

@ -2613,9 +2613,17 @@ int JavaThread::java_suspend_self() {
void JavaThread::java_suspend_self_with_safepoint_check() { void JavaThread::java_suspend_self_with_safepoint_check() {
assert(this == Thread::current(), "invariant"); assert(this == Thread::current(), "invariant");
JavaThreadState state = thread_state(); JavaThreadState state = thread_state();
set_thread_state(_thread_blocked);
java_suspend_self(); do {
set_thread_state_fence(state); set_thread_state(_thread_blocked);
java_suspend_self();
// The current thread could have been suspended again. We have to check for
// suspend after restoring the saved state. Without this the current thread
// might return to _thread_in_Java and execute bytecodes for an arbitrary
// long time.
set_thread_state_fence(state);
} while (is_external_suspend());
// Since we are not using a regular thread-state transition helper here, // Since we are not using a regular thread-state transition helper here,
// we must manually emit the instruction barrier after leaving a safe state. // we must manually emit the instruction barrier after leaving a safe state.
OrderAccess::cross_modify_fence(); OrderAccess::cross_modify_fence();