gh-128717: Stop-the-world when setting the recursion limit (#128741)

ZeroIntensity · web-flow · commit f6c61bf2d7d8 · 2025-01-12T18:34:30.000+05:30
diff --git a/Lib/test/test_free_threading/test_races.py b/Lib/test/test_free_threading/test_races.py
@@ -270,6 +270,21 @@ def mutate():
 
         do_race(set_value, mutate)
 
+    def test_racing_recursion_limit(self):
+        def something_recursive():
+            def count(n):
+                if n > 0:
+                    return count(n - 1) + 1
+                return 0
+
+            count(50)
+
+        def set_recursion_limit():
+            for limit in range(100, 200):
+                sys.setrecursionlimit(limit)
+
+        do_race(something_recursive, set_recursion_limit)
+
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-01-11-12-39-17.gh-issue-128717.i65d06.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-01-11-12-39-17.gh-issue-128717.i65d06.rst
@@ -0,0 +1,2 @@
+Fix a crash when setting the recursion limit while other threads are active
+on the :term:`free threaded <free threading>` build.
diff --git a/Python/ceval.c b/Python/ceval.c
@@ -294,13 +294,15 @@ void
 Py_SetRecursionLimit(int new_limit)
 {
     PyInterpreterState *interp = _PyInterpreterState_GET();
+    _PyEval_StopTheWorld(interp);
     interp->ceval.recursion_limit = new_limit;
     _Py_FOR_EACH_TSTATE_BEGIN(interp, p) {
         int depth = p->py_recursion_limit - p->py_recursion_remaining;
         p->py_recursion_limit = new_limit;
         p->py_recursion_remaining = new_limit - depth;
     }
     _Py_FOR_EACH_TSTATE_END(interp);
+    _PyEval_StartTheWorld(interp);
 }
 
 /* The function _Py_EnterRecursiveCallTstate() only calls _Py_CheckRecursiveCall()

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix a crash when setting the recursion limit while other threads are active`
	`2`	+on the :term:`free threaded <free threading>` build.
Original file line number	Diff line number	Diff line change
`@@ -294,13 +294,15 @@ void`
`294`	`294`	`Py_SetRecursionLimit(int new_limit)`
`295`	`295`	`{`
`296`	`296`	`PyInterpreterState *interp = _PyInterpreterState_GET();`
	`297`	`+ _PyEval_StopTheWorld(interp);`
`297`	`298`	`interp->ceval.recursion_limit = new_limit;`
`298`	`299`	`_Py_FOR_EACH_TSTATE_BEGIN(interp, p) {`
`299`	`300`	`int depth = p->py_recursion_limit - p->py_recursion_remaining;`
`300`	`301`	`p->py_recursion_limit = new_limit;`
`301`	`302`	`p->py_recursion_remaining = new_limit - depth;`
`302`	`303`	`}`
`303`	`304`	`_Py_FOR_EACH_TSTATE_END(interp);`
	`305`	`+ _PyEval_StartTheWorld(interp);`
`304`	`306`	`}`
`305`	`307`
`306`	`308`	`/* The function _Py_EnterRecursiveCallTstate() only calls _Py_CheckRecursiveCall()`