Skip to content

gh-117657: TSAN fix race on gstate->young.count #118313

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.

Sign up for GitHub

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

Merged
merged 16 commits into from
Apr 29, 2024
Merged

gh-117657: TSAN fix race on gstate->young.count #118313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e7a4477
TSAN fix race between atomic and none-atomic mutation of tate->young.…
SonicField Apr 26, 2024
14858c2
Merge remote-tracking branch 'upstream/main'
SonicField Apr 26, 2024
5457972
📜🤖 Added by blurb_it.
blurb-it[bot] Apr 26, 2024
d83833c
merge with upstream
SonicField Apr 26, 2024
edd9b7b
TSAN: move gc counter reset into critical section
SonicField Apr 26, 2024
e9bae12
Resolved merge conflict in Tools/tsan/suppressions_free_threading.txt
SonicField Apr 26, 2024
e1e040c
Merge branch 'main' of github.com:SonicField/cpython
SonicField Apr 26, 2024
dc97546
Merge branch 'main' of github.com:SonicField/cpython
SonicField Apr 26, 2024
2f200c9
Merge branch 'main' of github.com:SonicField/cpython
SonicField Apr 26, 2024
364d1d9
TSAN: Fix compiler warning in gc patch
SonicField Apr 26, 2024
6ec56ac
Merge branch 'main' into main
SonicField Apr 29, 2024
ef64718
Merge branch 'main' into main
SonicField Apr 29, 2024
822f8cc
Merge branch 'main' into main
SonicField Apr 29, 2024
655e071
Remove not require news entry
SonicField Apr 29, 2024
85b7b5c
Merge branch 'main' of github.com:SonicField/cpython
SonicField Apr 29, 2024
29c2696
Merge branch 'main' into main
SonicField Apr 29, 2024
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
25 changes: 13 additions & 12 deletions Python/gc_free_threading.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1044,9 +1044,20 @@ record_deallocation(PyThreadState *tstate)
}

static void
gc_collect_internal(PyInterpreterState *interp, struct collection_state *state)
gc_collect_internal(PyInterpreterState *interp, struct collection_state *state, int generation)
{
_PyEval_StopTheWorld(interp);

// update collection and allocation counters
if (generation+1 < NUM_GENERATIONS) {
state->gcstate->old[generation].count += 1;
}

state->gcstate->young.count = 0;
for (int i = 1; i <= generation; ++i) {
state->gcstate->old[i-1].count = 0;
}

// merge refcounts for all queued objects
merge_all_queued_objects(interp, state);
process_delayed_frees(interp);
Expand Down Expand Up @@ -1115,7 +1126,6 @@ gc_collect_internal(PyInterpreterState *interp, struct collection_state *state)
static Py_ssize_t
gc_collect_main(PyThreadState *tstate, int generation, _PyGC_Reason reason)
{
int i;
Py_ssize_t m = 0; /* # objects collected */
Py_ssize_t n = 0; /* # unreachable objects that couldn't be collected */
PyTime_t t1 = 0; /* initialize to prevent a compiler warning */
Expand Down Expand Up @@ -1161,23 +1171,14 @@ gc_collect_main(PyThreadState *tstate, int generation, _PyGC_Reason reason)
PyDTrace_GC_START(generation);
}

/* update collection and allocation counters */
if (generation+1 < NUM_GENERATIONS) {
gcstate->old[generation].count += 1;
}
gcstate->young.count = 0;
for (i = 1; i <= generation; i++) {
gcstate->old[i-1].count = 0;
}

PyInterpreterState *interp = tstate->interp;

struct collection_state state = {
.interp = interp,
.gcstate = gcstate,
};

gc_collect_internal(interp, &state);
gc_collect_internal(interp, &state, generation);

m = state.collected;
n = state.uncollectable;
Expand Down
1 change: 0 additions & 1 deletion Tools/tsan/suppressions_free_threading.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ race:_PyObject_GC_TRACK
race:_PyParkingLot_Park
race:_PyType_HasFeature
race:assign_version_tag
race:gc_collect_main
race:gc_restore_tid
race:initialize_new_array
race:insertdict
Expand Down
Loading