diff options
author | Sam Gross <colesbury@gmail.com> | 2024-03-06 14:42:11 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-06 14:42:11 (GMT) |
commit | c012c8ab7bb72a733bd98be5df32e262b9045f1a (patch) | |
tree | c3f39b0baae9a5b28816e768d788f0ec8d60ee0c /Python/pystate.c | |
parent | 02ee475ee3ce9468d44758df2cd79df9f0926303 (diff) | |
download | cpython-c012c8ab7bb72a733bd98be5df32e262b9045f1a.zip cpython-c012c8ab7bb72a733bd98be5df32e262b9045f1a.tar.gz cpython-c012c8ab7bb72a733bd98be5df32e262b9045f1a.tar.bz2 |
gh-115103: Delay reuse of mimalloc pages that store PyObjects (#115435)
This implements the delayed reuse of mimalloc pages that contain Python
objects in the free-threaded build.
Allocations of the same size class are grouped in data structures called
pages. These are different from operating system pages. For thread-safety, we
want to ensure that memory used to store PyObjects remains valid as long as
there may be concurrent lock-free readers; we want to delay using it for
other size classes, in other heaps, or returning it to the operating system.
When a mimalloc page becomes empty, instead of immediately freeing it, we tag
it with a QSBR goal and insert it into a per-thread state linked list of
pages to be freed. When mimalloc needs a fresh page, we process the queue and
free any still empty pages that are now deemed safe to be freed. Pages
waiting to be freed are still available for allocations of the same size
class and allocating from a page prevent it from being freed. There is
additional logic to handle abandoned pages when threads exit.
Diffstat (limited to 'Python/pystate.c')
-rw-r--r-- | Python/pystate.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Python/pystate.c b/Python/pystate.c index 3d6394f..274aec8 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -2839,6 +2839,7 @@ tstate_mimalloc_bind(PyThreadState *tstate) // the "backing" heap. mi_tld_t *tld = &mts->tld; _mi_tld_init(tld, &mts->heaps[_Py_MIMALLOC_HEAP_MEM]); + llist_init(&mts->page_list); // Exiting threads push any remaining in-use segments to the abandoned // pool to be re-claimed later by other threads. We use per-interpreter @@ -2865,6 +2866,12 @@ tstate_mimalloc_bind(PyThreadState *tstate) mts->heaps[i].debug_offset = (uint8_t)debug_offsets[i]; } + // Heaps that store Python objects should use QSBR to delay freeing + // mimalloc pages while there may be concurrent lock-free readers. + mts->heaps[_Py_MIMALLOC_HEAP_OBJECT].page_use_qsbr = true; + mts->heaps[_Py_MIMALLOC_HEAP_GC].page_use_qsbr = true; + mts->heaps[_Py_MIMALLOC_HEAP_GC_PRE].page_use_qsbr = true; + // By default, object allocations use _Py_MIMALLOC_HEAP_OBJECT. // _PyObject_GC_New() and similar functions temporarily override this to // use one of the GC heaps. |