[3.14] gh-137185: Fix _Py_DumpStack() async signal safety (gh-137187) (gh-137206)

Call backtrace() once when installing the signal handler to ensure that
libgcc is dynamically loaded outside the signal handler.

This fixes a "signal-unsafe call inside of a signal" TSan error from
test_faulthandler.test_enable_fd.
(cherry picked from commit 11a8652e25)

Co-authored-by: Sam Gross <colesbury@gmail.com>
This commit is contained in:
Miss Islington (bot) 2025-10-07 20:11:46 +02:00 committed by GitHub
parent 93ac6f3472
commit 75de39ba1b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 18 additions and 0 deletions

View file

@ -100,6 +100,7 @@ extern int _Py_WriteIndentedMargin(int, const char*, PyObject *);
extern int _Py_WriteIndent(int, PyObject *);
// Export for the faulthandler module
PyAPI_FUNC(void) _Py_InitDumpStack(void);
PyAPI_FUNC(void) _Py_DumpStack(int fd);
#ifdef __cplusplus

View file

@ -0,0 +1,2 @@
Fix a potential async-signal-safety issue in :mod:`faulthandler` when
printing C stack traces.

View file

@ -525,6 +525,11 @@ faulthandler_enable(void)
}
#endif
// gh-137185: Initialize C stack trace dumping outside of the signal
// handler. Specifically, we call backtrace() to ensure that libgcc is
// dynamically loaded outside of the signal handler.
_Py_InitDumpStack();
for (size_t i=0; i < faulthandler_nsignals; i++) {
fault_handler_t *handler;
int err;

View file

@ -1327,3 +1327,13 @@ _Py_DumpStack(int fd)
PUTS(fd, " <cannot get C stack on this system>\n");
}
#endif
void
_Py_InitDumpStack(void)
{
#ifdef CAN_C_BACKTRACE
// gh-137185: Call backtrace() once to force libgcc to be loaded early.
void *callstack[1];
(void)backtrace(callstack, 1);
#endif
}