Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 45efaf71 by Teo Camarasu at 2025-07-15T05:47:13-04:00 rts/nonmovingGC: remove n_free We remove the nonmovingHeap.n_free variable. We wanted this to track the length of nonmovingHeap.free. But this isn't possible to do atomically. When this isn't accurate we can get a segfault by going past the end of the list. Instead, we just count the length of the list when we grab it in nonmovingPruneFreeSegment. Resolves #26186 - - - - - 4 changed files: - rts/sm/NonMoving.c - rts/sm/NonMoving.h - rts/sm/NonMovingAllocate.c - rts/sm/Sanity.c Changes: ===================================== rts/sm/NonMoving.c ===================================== @@ -603,7 +603,6 @@ void nonmovingPushFreeSegment(struct NonmovingSegment *seg) if (cas((StgVolatilePtr) &nonmovingHeap.free, (StgWord) old, (StgWord) seg) == (StgWord) old) break; } - __sync_add_and_fetch(&nonmovingHeap.n_free, 1); } static int @@ -621,20 +620,26 @@ cmp_segment_ptr (const void *x, const void *y) void nonmovingPruneFreeSegmentList(void) { trace(TRACE_nonmoving_gc, "Pruning free segment list."); + // Atomically grab the entire free list. struct NonmovingSegment *free; - size_t length; while (true) { free = ACQUIRE_LOAD(&nonmovingHeap.free); - length = ACQUIRE_LOAD(&nonmovingHeap.n_free); if (cas((StgVolatilePtr) &nonmovingHeap.free, (StgWord) free, (StgWord) NULL) == (StgWord) free) { - atomic_dec((StgVolatilePtr) &nonmovingHeap.n_free, length); break; } - // Save the current free list so the sanity checker can see these segments. - nonmovingHeap.saved_free = free; + } + // Save the current free list so the sanity checker can see these segments. + nonmovingHeap.saved_free = free; + + // Calculate the length of the list we've taken + size_t length = 0; + struct NonmovingSegment *free1 = free; + while (free1) { + length++; + free1 = free1->link; } // Sort the free list by address. @@ -692,7 +697,6 @@ void nonmovingPruneFreeSegmentList(void) if (cas((StgVolatilePtr) &nonmovingHeap.free, (StgWord) rest, (StgWord) free) == (StgWord) rest) { - __sync_add_and_fetch(&nonmovingHeap.n_free, new_length); break; } } ===================================== rts/sm/NonMoving.h ===================================== @@ -134,8 +134,6 @@ struct NonmovingHeap { // saved free segment list, so the sanity checker can // see the segments while the free list is being pruned. struct NonmovingSegment *saved_free; - // how many segments in free segment list? accessed atomically. - unsigned int n_free; // records the current length of the nonmovingAllocator.current arrays unsigned int n_caps; ===================================== rts/sm/NonMovingAllocate.c ===================================== @@ -183,7 +183,6 @@ static struct NonmovingSegment *nonmovingPopFreeSegment(void) if (cas((StgVolatilePtr) &nonmovingHeap.free, (StgWord) seg, (StgWord) seg->link) == (StgWord) seg) { - __sync_sub_and_fetch(&nonmovingHeap.n_free, 1); return seg; } } ===================================== rts/sm/Sanity.c ===================================== @@ -990,7 +990,6 @@ static void checkGeneration (generation *gen, #endif if (isNonmovingGen(gen)) { - ASSERT(countNonMovingSegments(nonmovingHeap.free) == (W_) nonmovingHeap.n_free * NONMOVING_SEGMENT_BLOCKS); ASSERT(countBlocks(nonmoving_large_objects) == n_nonmoving_large_blocks); ASSERT(countBlocks(nonmoving_marked_large_objects) == n_nonmoving_marked_large_blocks); View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/45efaf71d97355f76fe0db5af2fc5b4b... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/45efaf71d97355f76fe0db5af2fc5b4b... You're receiving this email because of your account on gitlab.haskell.org.