8266432: ZGC: GC allocation stalls can trigger deadlocks

Reviewed-by: pliden, ayang
openjdk · May 4, 2021 · ce1bc9d · ce1bc9d
1 parent 30ccd80
commit ce1bc9d
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/hotspot/share/gc/z/zForwarding.cpp b/src/hotspot/share/gc/z/zForwarding.cpp
@@ -132,12 +132,8 @@ void ZForwarding::release_page() {
 
 bool ZForwarding::wait_page_released() const {
   if (Atomic::load_acquire(&_ref_count) != 0) {
-    ZLocker<ZConditionLock> locker(&_ref_lock);
-    if (_ref_abort) {
-      return false;
-    }
-
     ZStatTimer timer(ZCriticalPhaseRelocationStall);
+    ZLocker<ZConditionLock> locker(&_ref_lock);
     while (Atomic::load_acquire(&_ref_count) != 0) {
       if (_ref_abort) {
         return false;