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

8221584: SIGSEGV in os::PlatformEvent::unpark() in JvmtiRawMonitor::raw_exit while posting method exit event

Browse Source 
Co-authored-by: Stefan Karlsson <stefan.karlsson@oracle.com>
Reviewed-by: dholmes, dcubed
This commit is contained in:
Robbin Ehn 2019-04-08 21:39:43 +00:00 committed by David Holmes
parent d7097cb0f4
commit 3ca21234ce
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/hotspot/share/prims/jvmtiRawMonitor.cpp
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -167,7 +167,12 @@ int JvmtiRawMonitor::SimpleExit (Thread * Self) {
RawMonitor_lock->unlock() ; RawMonitor_lock->unlock() ;
if (w != NULL) { if (w != NULL) {
guarantee (w ->TState == ObjectWaiter::TS_ENTER, "invariant") ; guarantee (w ->TState == ObjectWaiter::TS_ENTER, "invariant") ;
// Once we set TState to TS_RUN the waiting thread can complete
// SimpleEnter and 'w' is pointing into random stack space. So we have
// to ensure we extract the ParkEvent (which is in type-stable memory)
// before we set the state, and then don't access 'w'.
ParkEvent * ev = w->_event ; ParkEvent * ev = w->_event ;
OrderAccess::loadstore();
w->TState = ObjectWaiter::TS_RUN ; w->TState = ObjectWaiter::TS_RUN ;
OrderAccess::fence() ; OrderAccess::fence() ;
ev->unpark() ; ev->unpark() ;
@ -200,7 +205,7 @@ int JvmtiRawMonitor::SimpleWait (Thread * Self, jlong millis) {
// If thread still resides on the waitset then unlink it. // If thread still resides on the waitset then unlink it.
// Double-checked locking -- the usage is safe in this context // Double-checked locking -- the usage is safe in this context
// as we TState is volatile and the lock-unlock operators are // as TState is volatile and the lock-unlock operators are
// serializing (barrier-equivalent). // serializing (barrier-equivalent).
if (Node.TState == ObjectWaiter::TS_WAIT) { if (Node.TState == ObjectWaiter::TS_WAIT) {