mirror of
https://github.com/python/cpython.git
synced 2025-08-24 18:55:00 +00:00
[3.13] gh-121368: Fix seq lock memory ordering in _PyType_Lookup (GH-121388) (#121505)
The `_PySeqLock_EndRead` function needs an acquire fence to ensure that
the load of the sequence happens after any loads within the read side
critical section. The missing fence can trigger bugs on macOS arm64.
Additionally, we need a release fence in `_PySeqLock_LockWrite` to
ensure that the sequence update is visible before any modifications to
the cache entry.
(cherry picked from commit 1d3cf79a50
)
Co-authored-by: Sam Gross <colesbury@gmail.com>
This commit is contained in:
parent
eef5c6443b
commit
c128718f30
9 changed files with 51 additions and 17 deletions
|
@ -5205,7 +5205,7 @@ _PyType_LookupRef(PyTypeObject *type, PyObject *name)
|
|||
#ifdef Py_GIL_DISABLED
|
||||
// synchronize-with other writing threads by doing an acquire load on the sequence
|
||||
while (1) {
|
||||
int sequence = _PySeqLock_BeginRead(&entry->sequence);
|
||||
uint32_t sequence = _PySeqLock_BeginRead(&entry->sequence);
|
||||
uint32_t entry_version = _Py_atomic_load_uint32_relaxed(&entry->version);
|
||||
uint32_t type_version = _Py_atomic_load_uint32_acquire(&type->tp_version_tag);
|
||||
if (entry_version == type_version &&
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue