Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC
Commits:
a1de535f by Luite Stegeman at 2025-09-30T18:40:28-04:00
rts: Fix lost wakeups in threadPaused for threads blocked on black holes
The lazy blackholing code in threadPaused could overwrite closures
that were already eagerly blackholed, and as such wouldn't have a
marked update frame. If the black hole was overwritten by its
original owner, this would lead to an undetected collision, and
the contents of any existing blocking queue being lost.
This adds a check for eagerly blackholed closures and avoids
overwriting their contents.
Fixes #26324
- - - - -
b7e21e49 by Luite Stegeman at 2025-09-30T18:40:28-04:00
rts: push the correct update frame in stg_AP_STACK
The frame contains an eager black hole (__stg_EAGER_BLACKHOLE_info) so
we should push an stg_bh_upd_frame_info instead of an stg_upd_frame_info.
- - - - -
3 changed files:
- compiler/GHC/Cmm/Parser.y
- rts/Apply.cmm
- rts/ThreadPaused.c
Changes:
=====================================
compiler/GHC/Cmm/Parser.y
=====================================
@@ -1321,6 +1321,7 @@ stmtMacros = listToUFM [
( fsLit "PROF_HEADER_CREATE", \[e] -> profHeaderCreate e ),
( fsLit "PUSH_UPD_FRAME", \[sp,e] -> emitPushUpdateFrame sp e ),
+ ( fsLit "PUSH_BH_UPD_FRAME", \[sp,e] -> emitPushBHUpdateFrame sp e ),
( fsLit "SET_HDR", \[ptr,info,ccs] ->
emitSetDynHdr ptr info ccs ),
( fsLit "TICK_ALLOC_PRIM", \[hdr,goods,slop] ->
@@ -1336,6 +1337,10 @@ emitPushUpdateFrame :: CmmExpr -> CmmExpr -> FCode ()
emitPushUpdateFrame sp e = do
emitUpdateFrame sp mkUpdInfoLabel e
+emitPushBHUpdateFrame :: CmmExpr -> CmmExpr -> FCode ()
+emitPushBHUpdateFrame sp e = do
+ emitUpdateFrame sp mkBHUpdInfoLabel e
+
pushStackFrame :: [CmmParse CmmExpr] -> CmmParse () -> CmmParse ()
pushStackFrame fields body = do
profile <- getProfile
=====================================
rts/Apply.cmm
=====================================
@@ -699,7 +699,7 @@ INFO_TABLE(stg_AP_STACK,/*special layout*/0,0,AP_STACK,"AP_STACK","AP_STACK")
/* ensure there is at least AP_STACK_SPLIM words of headroom available
* after unpacking the AP_STACK. See bug #1466 */
- PUSH_UPD_FRAME(Sp - SIZEOF_StgUpdateFrame, R1);
+ PUSH_BH_UPD_FRAME(Sp - SIZEOF_StgUpdateFrame, R1);
Sp = Sp - SIZEOF_StgUpdateFrame - WDS(Words);
TICK_ENT_AP();
=====================================
rts/ThreadPaused.c
=====================================
@@ -15,6 +15,7 @@
#include "RaiseAsync.h"
#include "Trace.h"
#include "Threads.h"
+#include "Messages.h"
#include "sm/NonMovingMark.h"
#include // for memmove()
@@ -314,52 +315,66 @@ threadPaused(Capability *cap, StgTSO *tso)
continue;
}
- // an EAGER_BLACKHOLE or CAF_BLACKHOLE gets turned into a
- // BLACKHOLE here.
+ // If we have a frame that is already eagerly blackholed, we
+ // shouldn't overwrite its payload: There may already be a blocking
+ // queue (see #26324).
+ if(frame_info == &stg_bh_upd_frame_info) {
+ // eager black hole: we do nothing
+
+ // it should be a black hole that we own
+ ASSERT(bh_info == &stg_BLACKHOLE_info ||
+ bh_info == &__stg_EAGER_BLACKHOLE_info ||
+ bh_info == &stg_CAF_BLACKHOLE_info);
+ ASSERT(blackHoleOwner(bh) == tso || blackHoleOwner(bh) == NULL);
+ } else {
+ // lazy black hole
+
#if defined(THREADED_RTS)
- // first we turn it into a WHITEHOLE to claim it, and if
- // successful we write our TSO and then the BLACKHOLE info pointer.
- cur_bh_info = (const StgInfoTable *)
- cas((StgVolatilePtr)&bh->header.info,
- (StgWord)bh_info,
- (StgWord)&stg_WHITEHOLE_info);
-
- if (cur_bh_info != bh_info) {
- bh_info = cur_bh_info;
+ // first we turn it into a WHITEHOLE to claim it, and if
+ // successful we write our TSO and then the BLACKHOLE info pointer.
+ cur_bh_info = (const StgInfoTable *)
+ cas((StgVolatilePtr)&bh->header.info,
+ (StgWord)bh_info,
+ (StgWord)&stg_WHITEHOLE_info);
+
+ if (cur_bh_info != bh_info) {
+ bh_info = cur_bh_info;
#if defined(PROF_SPIN)
- NONATOMIC_ADD(&whitehole_threadPaused_spin, 1);
+ NONATOMIC_ADD(&whitehole_threadPaused_spin, 1);
#endif
- busy_wait_nop();
- goto retry;
- }
+ busy_wait_nop();
+ goto retry;
+ }
#endif
-
- IF_NONMOVING_WRITE_BARRIER_ENABLED {
- if (ip_THUNK(INFO_PTR_TO_STRUCT(bh_info))) {
- // We are about to replace a thunk with a blackhole.
- // Add the free variables of the closure we are about to
- // overwrite to the update remembered set.
- // N.B. We caught the WHITEHOLE case above.
- updateRemembSetPushThunkEager(cap,
- THUNK_INFO_PTR_TO_STRUCT(bh_info),
- (StgThunk *) bh);
+ ASSERT(bh_info != &stg_WHITEHOLE_info);
+
+ IF_NONMOVING_WRITE_BARRIER_ENABLED {
+ if (ip_THUNK(INFO_PTR_TO_STRUCT(bh_info))) {
+ // We are about to replace a thunk with a blackhole.
+ // Add the free variables of the closure we are about to
+ // overwrite to the update remembered set.
+ // N.B. We caught the WHITEHOLE case above.
+ updateRemembSetPushThunkEager(cap,
+ THUNK_INFO_PTR_TO_STRUCT(bh_info),
+ (StgThunk *) bh);
+ }
}
- }
- // zero out the slop so that the sanity checker can tell
- // where the next closure is. N.B. We mustn't do this until we have
- // pushed the free variables to the update remembered set above.
- OVERWRITING_CLOSURE_SIZE(bh, closure_sizeW_(bh, INFO_PTR_TO_STRUCT(bh_info)));
+ // zero out the slop so that the sanity checker can tell
+ // where the next closure is. N.B. We mustn't do this until we have
+ // pushed the free variables to the update remembered set above.
+ OVERWRITING_CLOSURE_SIZE(bh, closure_sizeW_(bh, INFO_PTR_TO_STRUCT(bh_info)));
- // The payload of the BLACKHOLE points to the TSO
- RELEASE_STORE(&((StgInd *)bh)->indirectee, (StgClosure *)tso);
- SET_INFO_RELEASE(bh,&stg_BLACKHOLE_info);
+ // The payload of the BLACKHOLE points to the TSO
+ RELEASE_STORE(&((StgInd *)bh)->indirectee, (StgClosure *)tso);
+ SET_INFO_RELEASE(bh,&stg_BLACKHOLE_info);
- // .. and we need a write barrier, since we just mutated the closure:
- recordClosureMutated(cap,bh);
+ // .. and we need a write barrier, since we just mutated the closure:
+ recordClosureMutated(cap,bh);
- // We pretend that bh has just been created.
- LDV_RECORD_CREATE(bh);
+ // We pretend that bh has just been created.
+ LDV_RECORD_CREATE(bh);
+ }
frame = (StgClosure *) ((StgUpdateFrame *)frame + 1);
if (prev_was_update_frame) {
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9c304ec00750b69acb854cd47e50bda...
--
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/9c304ec00750b69acb854cd47e50bda...
You're receiving this email because of your account on gitlab.haskell.org.
