Skip to content

gh-143108: Don't instrument faulthandler.c for TSan #143109

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
Yhg1s merged 1 commit into from
Dec 24, 2025
+8 −14
Merged

gh-143108: Don't instrument faulthandler.c for TSan #143109

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions Include/internal/pycore_interpframe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ static inline PyCodeObject *_PyFrame_GetCode(_PyInterpreterFrame *f) {
// Similar to _PyFrame_GetCode(), but return NULL if the frame is invalid or
// freed. Used by dump_frame() in Python/traceback.c. The function uses
// heuristics to detect freed memory, it's not 100% reliable.
static inline PyCodeObject*
static inline PyCodeObject* _Py_NO_SANITIZE_THREAD
_PyFrame_SafeGetCode(_PyInterpreterFrame *f)
{
// globals and builtins may be NULL on a legit frame, but it's unlikely.
Expand Down Expand Up @@ -70,7 +70,7 @@ _PyFrame_GetBytecode(_PyInterpreterFrame *f)
// Similar to PyUnstable_InterpreterFrame_GetLasti(), but return NULL if the
// frame is invalid or freed. Used by dump_frame() in Python/traceback.c. The
// function uses heuristics to detect freed memory, it's not 100% reliable.
static inline int
static inline int _Py_NO_SANITIZE_THREAD
_PyFrame_SafeGetLasti(struct _PyInterpreterFrame *f)
{
// Code based on _PyFrame_GetBytecode() but replace _PyFrame_GetCode()
Expand Down
12 changes: 6 additions & 6 deletions Python/traceback.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,7 @@ _Py_DumpWideString(int fd, wchar_t *str)

Return 0 on success. Return -1 if the frame is invalid. */

static int
static int _Py_NO_SANITIZE_THREAD
dump_frame(int fd, _PyInterpreterFrame *frame)
{
if (frame->owner == FRAME_OWNED_BY_INTERPRETER) {
Expand Down Expand Up @@ -1088,7 +1088,7 @@ dump_frame(int fd, _PyInterpreterFrame *frame)
return res;
}

static int
static int _Py_NO_SANITIZE_THREAD
tstate_is_freed(PyThreadState *tstate)
{
if (_PyMem_IsPtrFreed(tstate)) {
Expand All @@ -1104,14 +1104,14 @@ tstate_is_freed(PyThreadState *tstate)
}


static int
static int _Py_NO_SANITIZE_THREAD
interp_is_freed(PyInterpreterState *interp)
{
return _PyMem_IsPtrFreed(interp);
}


static void
static void _Py_NO_SANITIZE_THREAD
dump_traceback(int fd, PyThreadState *tstate, int write_header)
{
if (write_header) {
Expand Down Expand Up @@ -1263,7 +1263,7 @@ write_thread_id(int fd, PyThreadState *tstate, int is_current)

The caller is responsible to call PyErr_CheckSignals() to call Python signal
handlers if signals were received. */
const char*
const char* _Py_NO_SANITIZE_THREAD
_Py_DumpTracebackThreads(int fd, PyInterpreterState *interp,
PyThreadState *current_tstate)
{
Expand Down Expand Up @@ -1332,7 +1332,7 @@ _Py_DumpTracebackThreads(int fd, PyInterpreterState *interp,
}
dump_traceback(fd, tstate, 0);

tstate = PyThreadState_Next(tstate);
tstate = tstate->next;
nthreads++;
} while (tstate != NULL);
_Py_END_SUPPRESS_IPH
Expand Down
6 changes: 0 additions & 6 deletions Tools/tsan/suppressions_free_threading.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,7 @@

# These warnings trigger directly in a CPython function.

race_top:dump_traceback
race_top:fatal_error
race_top:_PyFrame_GetCode
race_top:_PyFrame_Initialize
race_top:_PyObject_TryGetInstanceAttribute
race_top:PyUnstable_InterpreterFrame_GetLine
race_top:write_thread_id

# https://gist.github.com/mpage/6962e8870606cfc960e159b407a0cb40
thread:pthread_create
Expand Down
Loading