Skip to content

Fix race condition when closing jitdump file in perf JIT trampoline #143965

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

Open
rgfegegeegege wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −2
Open

Fix race condition when closing jitdump file in perf JIT trampoline #143965

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 12 additions & 2 deletions Python/perf_jit_trampoline.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,15 @@ static void perf_map_jit_write_entry(void *state, const void *code_addr,
}
}

/* Acquire lock to protect against concurrent fini() */
PyThread_acquire_lock(perf_jit_map_state.map_lock, WAIT_LOCK);

/* Double-check in case fini() closed it while we were waiting */
if (perf_jit_map_state.perf_map == NULL) {
PyThread_release_lock(perf_jit_map_state.map_lock);
return;
}

/*
* Extract function information from Python code object
*
Expand Down Expand Up @@ -1315,6 +1324,7 @@ static void perf_map_jit_write_entry(void *state, const void *code_addr,

/* Clean up allocated memory */
PyMem_RawFree(perf_map_entry);
PyThread_release_lock(perf_jit_map_state.map_lock);
}

// =============================================================================
Expand Down Expand Up @@ -1346,12 +1356,12 @@ static int perf_map_jit_fini(void* state) {
*/
if (perf_jit_map_state.perf_map != NULL) {
PyThread_acquire_lock(perf_jit_map_state.map_lock, 1);
fclose(perf_jit_map_state.perf_map); // This also flushes buffers
fclose(perf_jit_map_state.perf_map);
perf_jit_map_state.perf_map = NULL; // Move inside lock
PyThread_release_lock(perf_jit_map_state.map_lock);

/* Clean up synchronization primitive */
PyThread_free_lock(perf_jit_map_state.map_lock);
perf_jit_map_state.perf_map = NULL;
}

/*
Expand Down