gh-148613: Fix race in gc_set_threshold and gc_get_threshold (#150356)

LindaSummer · web-flow · commit 41eb8ee2bb8c · 2026-06-03T16:58:26.000+05:30
diff --git a/Lib/test/test_free_threading/test_gc.py b/Lib/test/test_free_threading/test_gc.py
@@ -94,6 +94,36 @@ def evil():
         thread.start()
         thread.join()
 
+    def test_set_threshold(self):
+        # GH-148613: Setting the GC threshold from another thread could cause a
+        # race between the `gc_should_collect` and `gc_set_threshold` functions.
+        NUM_THREADS = 8
+        NUM_ITERS = 100_000
+        barrier = threading.Barrier(NUM_THREADS)
+
+        class CyclicReference:
+            def __init__(self):
+                self.r = self
+
+        def allocator():
+            barrier.wait()
+            for _ in range(NUM_ITERS):
+                CyclicReference()
+
+        def setter():
+            barrier.wait()
+            for i in range(NUM_ITERS):
+                gc.set_threshold(100 + (i % 100), 10 + (i % 10), 10 + (i % 10))
+
+        current_threshold = gc.get_threshold()
+        try:
+            threads = [Thread(target=allocator) for _ in range(NUM_THREADS - 1)]
+            threads.append(Thread(target=setter))
+            with threading_helper.start_threads(threads):
+                pass
+        finally:
+            gc.set_threshold(*current_threshold)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2026-05-24-22-46-49.gh-issue-148613.PLpmyd.rst b/Misc/NEWS.d/next/Core_and_Builtins/2026-05-24-22-46-49.gh-issue-148613.PLpmyd.rst
@@ -0,0 +1,2 @@
+Fix a data race in the free-threaded build between :func:`gc.set_threshold`
+and garbage collection scheduling during object allocation.
diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c
@@ -167,13 +167,16 @@ gc_set_threshold_impl(PyObject *module, int threshold0, int group_right_1,
         gcstate->generations[2].threshold = threshold2;
     }
 #else
+    PyInterpreterState *interp = _PyInterpreterState_GET();
+    _PyEval_StopTheWorld(interp);
     gcstate->young.threshold = threshold0;
     if (group_right_1) {
         gcstate->old[0].threshold = threshold1;
     }
     if (group_right_2) {
         gcstate->old[1].threshold = threshold2;
     }
+    _PyEval_StartTheWorld(interp);
 #endif
     Py_RETURN_NONE;
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix a data race in the free-threaded build between :func:`gc.set_threshold`
	`2`	`+and garbage collection scheduling during object allocation.`
Original file line number	Diff line number	Diff line change
`@@ -167,13 +167,16 @@ gc_set_threshold_impl(PyObject *module, int threshold0, int group_right_1,`
`167`	`167`	`gcstate->generations[2].threshold = threshold2;`
`168`	`168`	`}`
`169`	`169`	`#else`
	`170`	`+ PyInterpreterState *interp = _PyInterpreterState_GET();`
	`171`	`+ _PyEval_StopTheWorld(interp);`
`170`	`172`	`gcstate->young.threshold = threshold0;`
`171`	`173`	`if (group_right_1) {`
`172`	`174`	`gcstate->old[0].threshold = threshold1;`
`173`	`175`	`}`
`174`	`176`	`if (group_right_2) {`
`175`	`177`	`gcstate->old[1].threshold = threshold2;`
`176`	`178`	`}`
	`179`	`+ _PyEval_StartTheWorld(interp);`
`177`	`180`	`#endif`
`178`	`181`	`Py_RETURN_NONE;`
`179`	`182`	`}`