From: Petr Viktorin Date: Tue, 30 Sep 2025 14:43:49 +0000 (+0200) Subject: gh-139116: tracemalloc: Detach thread state when acquiring tables_lock (GH-139449) X-Git-Tag: v3.15.0a1~178 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01157e0cdff1321a065b0a00c5a97460f52af07e;p=thirdparty%2FPython%2Fcpython.git gh-139116: tracemalloc: Detach thread state when acquiring tables_lock (GH-139449) * gh-139116: tracemalloc: Detach thread state when acquiring tables_lock This prevents a deadlock when: - One thread is in `_PyTraceMalloc_Stop`, with `TABLES_LOCK` held, calling `PyRefTracer_SetTracer` which wants to stop the world - Another is thread in `PyTraceMalloc_Track`, just attached thread state, waiting for `TABLES_LOCK` Detaching the thread state while waiting for `TABLES_LOCK` allows `PyRefTracer_SetTracer` to stop the world. Co-authored-by: Peter Bierma --- diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-09-30-14-57-19.gh-issue-139116.nlVf40.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-09-30-14-57-19.gh-issue-139116.nlVf40.rst new file mode 100644 index 000000000000..00692e97c44f --- /dev/null +++ b/Misc/NEWS.d/next/Core_and_Builtins/2025-09-30-14-57-19.gh-issue-139116.nlVf40.rst @@ -0,0 +1,2 @@ +Prevent a deadlock when multiple threads start, stop and use :mod:`tracemalloc` +simultaneously. diff --git a/Python/tracemalloc.c b/Python/tracemalloc.c index 7066a214f106..7a0853b6a07f 100644 --- a/Python/tracemalloc.c +++ b/Python/tracemalloc.c @@ -36,7 +36,7 @@ static int _PyTraceMalloc_TraceRef(PyObject *op, PyRefTracerEvent event, the GIL held from PyMem_RawFree(). It cannot acquire the lock because it would introduce a deadlock in _PyThreadState_DeleteCurrent(). */ #define tables_lock _PyRuntime.tracemalloc.tables_lock -#define TABLES_LOCK() PyMutex_LockFlags(&tables_lock, _Py_LOCK_DONT_DETACH) +#define TABLES_LOCK() PyMutex_Lock(&tables_lock) #define TABLES_UNLOCK() PyMutex_Unlock(&tables_lock)