10000 gh-128942: make arraymodule.c free-thread safe (lock-free) by tom-pytel · Pull Request #130771 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content

gh-128942: make arraymodule.c free-thread safe (lock-free) #130771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 50 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
f54c5fc
slow arraymodule
tom-pytel Mar 1, 2025
4c71f00
lockfree read and write single element
tom-pytel Mar 2, 2025
512c4c7
📜🤖 Added by blurb_it.
blurb-it[bot] Mar 2, 2025
060100f
ensure_shared_on_resize() in one more place
tom-pytel Mar 2, 2025
d0b17c6
fix stupid direct return out of critical section
tom-pytel Mar 3, 2025
c17b787
requested changes
tom-pytel Mar 3, 2025
4fd8383
downgrade to _Py_atomic_load_ptr_relaxed in missed place
tom-pytel Mar 3, 2025
d00f2b7
arraymodule linked statically
tom-pytel Mar 4, 2025
a3e6004
cleanups
tom-pytel Mar 5, 2025
fb6212a
test and tsan stuff
tom-pytel Mar 5, 2025
04a8f9d
getters and setters using atomics
tom-pytel Mar 5, 2025
01423fd
fix 2 byte wchar_t
tom-pytel Mar 6, 2025
99331dd
remove debug printf
tom-pytel Mar 6, 2025
07c98cc
just a hunch...
tom-pytel Mar 6, 2025
cf3bbbb
atomic "memcpy"
tom-pytel Mar 6, 2025
51135a4
misc
tom-pytel Mar 7, 2025
fff827e
use proper type FT_ macros
tom-pytel Mar 8, 2025
12f0ff6
atomic aggregate _Py_atomic_source_memcpy_relaxed()
tom-pytel Mar 10, 2025
1a6b8df
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel Mar 11, 2025
94ef417
remove atomic memcpy
tom-pytel Mar 11, 2025
0056412
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel Mar 11, 2025
1431784
regen clinic
tom-pytel Mar 11, 2025
460d3d7
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel Mar 11, 2025
409239c
requested changes
tom-pytel Mar 15, 2025
a6f17c9
more requested changes
tom-pytel Mar 17, 2025
b5d219e
__declspec(align(8)) for Windows
tom-pytel Mar 17, 2025
2c82071
shut up check-c-globals
tom-pytel Mar 17, 2025
1ba50e9
alignment changes
tom-pytel Mar 20, 2025
576aebf
MS_WINDOWS -> _MSC_VER
tom-pytel Mar 20, 2025
4dd0954
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel Mar 20, 2025
d4e5313
#include "pycore_gc.h", something moved
tom-pytel Mar 20, 2025
48eabe3
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel Mar 25, 2025
c056b13
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel Mar 25, 2025
affae8e
remove NULL check in arraydata_free()
tom-pytel Mar 25, 2025
689c7a3
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel Mar 31, 2025
3e2f8cd
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel Apr 4, 2025
7286fed
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel Apr 14, 2025
6550906
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel Apr 23, 2025
5b35203
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel May 2, 2025
15d92ca
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel May 5, 2025
2e7132e
change to use new _Py_ALIGN_AS() macro
tom-pytel May 5, 2025
06f86cf
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel May 8, 2025
d29c208
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel May 23, 2025
8db665a
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel Jun 10, 2025
cad8ca2
Merge in the main branch, switch to _Py_ALIGNED_DEF
encukou Jun 11, 2025
1a50981
requested changes
tom-pytel Jun 11, 2025
f023e77
shut up UBSan
tom-pytel Jun 13, 2025
b53ba2a
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel Jun 21, 2025
eb60ffa
Merge branch 'main' into fix-issue-128942-lockfree
tom-pytel Jul 6, 2025
6d50e9a
add size to _PyMem_FreeDelayed()
tom-pytel Jul 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
atomic aggregate _Py_atomic_source_memcpy_relaxed()
  • Loading branch information
tom-pytel committed Mar 10, 2025
commit 12f0ff64afe5584982c3518bdf199607595aacd7
149 changes: 122 additions & 27 deletions Modules/arraymodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -217,38 +217,136 @@ arraydata_realloc(arraydata *data, Py_ssize_t size, int itemsize)

#ifdef Py_GIL_DISABLED

// This really doesn't belong here, for show at the moment.
static void
atomic_itemcpy(void *dest, const void *src, size_t n, int itemsize)
_Py_atomic_source_memcpy_relaxed(void *dest, void *src, size_t n)
{
if (itemsize == 1) {
for (char *d = (char *) dest, *end = d + n, *s = (char *) src;
d < end; d++, s++) {
*d = _Py_atomic_load_char_relaxed(s);
int diff = (int)((uintptr_t)dest ^ (uintptr_t)src);

// the first half is needed to deal with misalignment

if (diff & 1) { // dest and src not word aligned with each other
for (void *end = (char *)dest + n; dest < end;
dest = (char *)dest + 1, src = (char *)src + 1) {
*((char *)dest) = _Py_atomic_load_char_relaxed((char *)src);
}

return;
}
else if (itemsize == 2) {
for (short *d = (short *) dest, *end = d + n, *s = (short *) src;
d < end; d++, s++) {
*d = _Py_atomic_load_short_relaxed(s);

if ((uintptr_t)dest & 1) { // dest and src not word aligned in memory
if (n) {
*(char *)dest = _Py_atomic_load_char_relaxed((char *)src);
dest = (char *)dest + 1;
src = (char *)src + 1;
n -= 1;
}

if (!n) {
return;
}
}
else if (itemsize == 4) {
for (PY_UINT32_T *d = (PY_UINT32_T *) dest, *end = d + n, *s = (PY_UINT32_T *) src;
d < end; d++, s++) {
*d = (PY_UINT32_T) _Py_atomic_load_uint32_relaxed(s);

if (diff & 2) { // dest and src not dword aligned with each other
size_t n2 = n / 2;

for (void *end = (short *)dest + n2; dest < end;
dest = (short *)dest + 1, src = (short *)src + 1) {
*((short *)dest) = _Py_atomic_load_short_relaxed((short *)src);
}

if (n & 1) {
*((char *)dest) = _Py_atomic_load_char_relaxed((char *)src);
}

return;
}
else if (itemsize == 8) {
for (PY_UINT64_T *d = (PY_UINT64_T *) dest, *end = d + n, *s = (PY_UINT64_T *) src;
d < end; d++, s++) {
*d = (PY_UINT64_T) _Py_atomic_load_uint64_relaxed(s);

if ((uintptr_t)dest & 2) { // dest and src not dword aligned in memory
if (n >= 2) {
*(short *)dest = _Py_atomic_load_short_relaxed((short *)src);
dest = (short *)dest + 1;
src = (short *)src + 1;
n -= 2;
}

if (!n) {
return;
}
}
else {
assert(false);

if (diff & 4) { // dest and src not qword aligned with each other
size_t n4 = n / 4;

for (void *end = (PY_UINT32_T *)dest + n4; dest < end;
dest = (PY_UINT32_T *)dest + 1, src = (PY_UINT32_T *)src + 1) {
*((PY_UINT32_T *)dest) = (PY_UINT32_T)_Py_atomic_load_uint32_relaxed((PY_UINT32_T *)src);
}

if (n & 2) {
*((short *)dest) = _Py_atomic_load_short_relaxed((short *)src);
dest = (short *)dest + 1;
src = (short *)src + 1;
}

if (n & 1) {
*((char *)dest) = _Py_atomic_load_char_relaxed((char *)src);
}

return;
}

if ((uintptr_t)dest & 4) { // dest and src not qword aligned in memory
if (n >= 4) {
*(PY_UINT32_T *)dest = _Py_atomic_load_uint32_relaxed((PY_UINT32_T *)src);
dest = (PY_UINT32_T *)dest + 1;
src = (PY_UINT32_T *)src + 1;
n -= 4;
}

if (!n) {
return;
}
}

// the second half is aligned copy

size_t n8 = n / 8;

if (n8) {
for (void *end = (PY_UINT64_T *)dest + n8; dest < end;
dest = (PY_UINT64_T *)dest + 1, src = (PY_UINT64_T *)src + 1) {
*((PY_UINT64_T *)dest) = (PY_UINT64_T)_Py_atomic_load_uint64_relaxed((PY_UINT64_T *)src);
}

n -= n8 * 8;
}

if (n & 4) {
*((PY_UINT32_T *)dest) = (PY_UINT32_T)_Py_atomic_load_uint32_relaxed((PY_UINT32_T *)src);
dest = (PY_UINT32_T *)dest + 1;
src = (PY_UINT32_T *)src + 1;
}

if (n & 2) {
*((short *)dest) = _Py_atomic_load_short_relaxed((short *)src);
dest = (short *)dest + 1;
src = (short *)src + 1;
}

if (n & 1) {
*((char *)dest) = _Py_atomic_load_char_relaxed((char *)src);
}
}

#define FT_ATOMIC_SOURCE_MEMCPY_RELAXED(dest, src, n) \
_Py_atomic_source_memcpy_relaxed((dest), (src), (n))

#else

#define FT_ATOMIC_SOURCE_MEMCPY_RELAXED(dest, src, n) \
memcpy((dest), (src), (n))

#endif

static int
Expand Down Expand Up @@ -327,11 +425,7 @@ array_resize(arrayobject *self, Py_ssize_t newsize)
}
if (data != NULL) {
Py_ssize_t size = Py_SIZE(self);
#ifdef Py_GIL_DISABLED
atomic_itemcpy(newdata->items, data->items, Py_MIN(size, newsize), itemsize);
#else
memcpy(newdata->items, data->items, Py_MIN(size, newsize) * itemsize);
#endif
FT_ATOMIC_SOURCE_MEMCPY_RELAXED(newdata->items, data->items, Py_MIN(size, newsize) * itemsize);
arraydata_free(data, _PyObject_GC_IS_SHARED(self));
}
_Py_atomic_store_ptr_release(&self->data, newdata);
Expand Down Expand Up @@ -1243,8 +1337,9 @@ array_slice(arrayobject *a, Py_ssize_t ilow, Py_ssize_t ihigh)
if (np == NULL)
return NULL;
if (ihigh > ilow) {
memcpy(np->data->items, a->data->items + ilow * a->ob_descr->itemsize,
(ihigh-ilow) * a->ob_descr->itemsize);
FT_ATOMIC_SOURCE_MEMCPY_RELAXED(
np->data->items, a->data->items + ilow * a->ob_descr->itemsize,
(ihigh-ilow) * a->ob_descr->itemsize);
}
return (PyObject *)np;
}
Expand Down Expand Up @@ -2895,7 +2990,7 @@ array_subscr_slice_lock_held(PyObject *op, PyObject *item)
slicelength, self->ob_descr);
if (result == NULL)
return NULL;
memcpy(((arrayobject *)result)->data->items,
FT_ATOMIC_SOURCE_MEMCPY_RELAXED(((arrayobject *)result)->data->items,
self->data->items + start * itemsize,
slicelength * itemsize);
return result;
Expand Down
Loading
0