infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-20 04:43:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

8234613: JavaThread can escape back to Java from an ongoing handshake

Browse Source 
Check again if we have a pending/in-progress handshake operation after executing ~ThreadInVMForHandshake()

Reviewed-by: coleenp, dcubed, dholmes, rehn
This commit is contained in:
Patricio Chilano Mateo 2019-11-26 15:21:37 +00:00
parent 476973c47b
commit 71ec3b6947
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/hotspot/share/runtime/handshake.cpp
View File

@ -289,20 +289,24 @@ void HandshakeState::clear_handshake(JavaThread* target) {
void HandshakeState::process_self_inner(JavaThread* thread) {
assert(Thread::current() == thread, "should call from thread");
assert(!thread->is_terminated(), "should not be a terminated thread");
assert(thread->thread_state() != _thread_blocked, "should not be in a blocked state");
assert(thread->thread_state() != _thread_in_native, "should not be in native");
ThreadInVMForHandshake tivm(thread);
if (!_semaphore.trywait()) {
_semaphore.wait_with_safepoint_check(thread);
}
HandshakeOperation* op = Atomic::load_acquire(&_operation);
if (op != NULL) {
HandleMark hm(thread);
CautiouslyPreserveExceptionMark pem(thread);
// Disarm before execute the operation
clear_handshake(thread);
op->do_handshake(thread);
}
_semaphore.signal();
do {
ThreadInVMForHandshake tivm(thread);
if (!_semaphore.trywait()) {
_semaphore.wait_with_safepoint_check(thread);
}
HandshakeOperation* op = Atomic::load_acquire(&_operation);
if (op != NULL) {
HandleMark hm(thread);
CautiouslyPreserveExceptionMark pem(thread);
// Disarm before execute the operation
clear_handshake(thread);
op->do_handshake(thread);
}
_semaphore.signal();
} while (has_operation());
}
bool HandshakeState::vmthread_can_process_handshake(JavaThread* target) {