gh-122697: Fix free-threading memory leaks at shutdown

colesbury · colesbury · commit c9d71321b919 · 2024-08-05T19:18:36.000Z
We were not properly accounting for interpreter memory leaks at
shutdown and had two sources of leaks:

 * Objects that use deferred reference counting and were reachable via
   static types outlive the final GC. We now disable deferred reference
   counting on all objects if we are calling the GC due to interpreter
   shutdown.

 * `_PyMem_FreeDelayed` did not properly check for interpreter shutdown
   so we had some memory blocks that were enqueued to be freed, but
   never actually freed.
diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
@@ -1109,9 +1109,9 @@ free_delayed(uintptr_t ptr)
 #ifndef Py_GIL_DISABLED
     free_work_item(ptr);
 #else
-    if (_PyRuntime.stoptheworld.world_stopped) {
-        // Free immediately if the world is stopped, including during
-        // interpreter shutdown.
+    if (_PyRuntime.stoptheworld.world_stopped || Py_IsFinalizing()) {
+        // Free immediately if the world is stopped and during interpreter
+        // shutdown.
         free_work_item(ptr);
         return;
     }
@@ -1474,6 +1474,8 @@ _PyInterpreterState_FinalizeAllocatedBlocks(PyInterpreterState *interp)
 {
 #ifdef WITH_MIMALLOC
     if (_PyMem_MimallocEnabled()) {
+        Py_ssize_t leaked = _PyInterpreterState_GetAllocatedBlocks(interp);
+        interp->runtime->obmalloc.interpreter_leaks += leaked;
         return;
     }
 #endif
diff --git a/Python/gc_free_threading.c b/Python/gc_free_threading.c
@@ -54,6 +54,7 @@ struct collection_state {
     struct visitor_args base;
     PyInterpreterState *interp;
     GCState *gcstate;
+    _PyGC_Reason reason;
     Py_ssize_t collected;
     Py_ssize_t uncollectable;
     Py_ssize_t long_lived_total;
@@ -571,6 +572,16 @@ scan_heap_visitor(const mi_heap_t *heap, const mi_heap_area_t *area,
             worklist_push(&state->unreachable, op);
         }
     }
+    else if (state->reason == _Py_GC_REASON_SHUTDOWN &&
+             _PyObject_HasDeferredRefcount(op))
+    {
+        // Disable deferred refcounting for reachable objects as well during
+        // interpreter shutdown. This ensures that these objects are collected
+        // immediately when their last reference is removed.
+        disable_deferred_refcounting(op);
+        merge_refcount(op, 0);
+        state->long_lived_total++;
+    }
     else {
         // object is reachable, restore `ob_tid`; we're done with these objects
         gc_restore_tid(op);
@@ -1221,6 +1232,7 @@ gc_collect_main(PyThreadState *tstate, int generation, _PyGC_Reason reason)
     struct collection_state state = {
         .interp = interp,
         .gcstate = gcstate,
+        .reason = reason,
     };
 
     gc_collect_internal(interp, &state, generation);
