mirror of
https://github.com/python/cpython.git
synced 2025-08-01 07:33:08 +00:00
bpo-46968: Fix faulthandler for Sapphire Rapids Xeon (GH-31789)
In Linux kernel 5.14 one can dynamically request size of altstacksize based on hardware capabilities with getauxval(AT_MINSIGSTKSZ). This changes allows for Python extension's request to Linux kernel to use AMX_TILE instruction set on Sapphire Rapids Xeon processor to succeed, unblocking use of the ISA in frameworks. Introduced HAVE_LINUX_AUXVEC_H in configure.ac and pyconfig.h.in Used cpython_autoconf:269 docker container to generate configure.
This commit is contained in:
parent
dc374ac7b0
commit
3b128c0548
5 changed files with 30 additions and 8 deletions
|
@ -0,0 +1,5 @@
|
||||||
|
:mod:`faulthandler`: On Linux 5.14 and newer, dynamically determine size of
|
||||||
|
signal handler stack size CPython allocates using ``getauxval(AT_MINSIGSTKSZ)``.
|
||||||
|
This changes allows for Python extension's request to Linux kernel to use
|
||||||
|
AMX_TILE instruction set on Sapphire Rapids Xeon processor to succeed,
|
||||||
|
unblocking use of the ISA in frameworks.
|
|
@ -20,6 +20,17 @@
|
||||||
# include <sys/resource.h>
|
# include <sys/resource.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* Using an alternative stack requires sigaltstack()
|
||||||
|
and sigaction() SA_ONSTACK */
|
||||||
|
#if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION)
|
||||||
|
# define FAULTHANDLER_USE_ALT_STACK
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(FAULTHANDLER_USE_ALT_STACK) && defined(HAVE_LINUX_AUXVEC_H)
|
||||||
|
# include <linux/auxvec.h>
|
||||||
|
# include <sys/auxv.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Allocate at maximum 100 MiB of the stack to raise the stack overflow */
|
/* Allocate at maximum 100 MiB of the stack to raise the stack overflow */
|
||||||
#define STACK_OVERFLOW_MAX_SIZE (100 * 1024 * 1024)
|
#define STACK_OVERFLOW_MAX_SIZE (100 * 1024 * 1024)
|
||||||
|
|
||||||
|
@ -137,12 +148,6 @@ static fault_handler_t faulthandler_handlers[] = {
|
||||||
static const size_t faulthandler_nsignals = \
|
static const size_t faulthandler_nsignals = \
|
||||||
Py_ARRAY_LENGTH(faulthandler_handlers);
|
Py_ARRAY_LENGTH(faulthandler_handlers);
|
||||||
|
|
||||||
/* Using an alternative stack requires sigaltstack()
|
|
||||||
and sigaction() SA_ONSTACK */
|
|
||||||
#if defined(HAVE_SIGALTSTACK) && defined(HAVE_SIGACTION)
|
|
||||||
# define FAULTHANDLER_USE_ALT_STACK
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef FAULTHANDLER_USE_ALT_STACK
|
#ifdef FAULTHANDLER_USE_ALT_STACK
|
||||||
static stack_t stack;
|
static stack_t stack;
|
||||||
static stack_t old_stack;
|
static stack_t old_stack;
|
||||||
|
@ -1373,6 +1378,15 @@ _PyFaulthandler_Init(int enable)
|
||||||
signal handler uses more than SIGSTKSZ bytes of stack memory on some
|
signal handler uses more than SIGSTKSZ bytes of stack memory on some
|
||||||
platforms. */
|
platforms. */
|
||||||
stack.ss_size = SIGSTKSZ * 2;
|
stack.ss_size = SIGSTKSZ * 2;
|
||||||
|
#ifdef AT_MINSIGSTKSZ
|
||||||
|
/* bpo-46968: Query Linux for minimal stack size to ensure signal delivery
|
||||||
|
for the hardware running CPython. This OS feature is available in
|
||||||
|
Linux kernel version >= 5.14 */
|
||||||
|
unsigned long at_minstack_size = getauxval(AT_MINSIGSTKSZ);
|
||||||
|
if (at_minstack_size != 0) {
|
||||||
|
stack.ss_size = SIGSTKSZ + at_minstack_size;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
memset(&thread, 0, sizeof(thread));
|
memset(&thread, 0, sizeof(thread));
|
||||||
|
|
2
configure
generated
vendored
2
configure
generated
vendored
|
@ -8652,7 +8652,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
|
||||||
# checks for header files
|
# checks for header files
|
||||||
for ac_header in \
|
for ac_header in \
|
||||||
alloca.h asm/types.h bluetooth.h conio.h crypt.h direct.h dlfcn.h endian.h errno.h fcntl.h grp.h \
|
alloca.h asm/types.h bluetooth.h conio.h crypt.h direct.h dlfcn.h endian.h errno.h fcntl.h grp.h \
|
||||||
ieeefp.h io.h langinfo.h libintl.h libutil.h linux/memfd.h linux/random.h linux/soundcard.h \
|
ieeefp.h io.h langinfo.h libintl.h libutil.h linux/auxvec.h linux/memfd.h linux/random.h linux/soundcard.h \
|
||||||
linux/tipc.h linux/wait.h netinet/in.h netpacket/packet.h poll.h process.h pthread.h pty.h \
|
linux/tipc.h linux/wait.h netinet/in.h netpacket/packet.h poll.h process.h pthread.h pty.h \
|
||||||
sched.h setjmp.h shadow.h signal.h spawn.h stropts.h sys/audioio.h sys/bsdtty.h sys/devpoll.h \
|
sched.h setjmp.h shadow.h signal.h spawn.h stropts.h sys/audioio.h sys/bsdtty.h sys/devpoll.h \
|
||||||
sys/endian.h sys/epoll.h sys/event.h sys/eventfd.h sys/file.h sys/ioctl.h sys/kern_control.h \
|
sys/endian.h sys/epoll.h sys/event.h sys/eventfd.h sys/file.h sys/ioctl.h sys/kern_control.h \
|
||||||
|
|
|
@ -2375,7 +2375,7 @@ AC_DEFINE(STDC_HEADERS, 1, [Define to 1 if you have the ANSI C header files.])
|
||||||
# checks for header files
|
# checks for header files
|
||||||
AC_CHECK_HEADERS([ \
|
AC_CHECK_HEADERS([ \
|
||||||
alloca.h asm/types.h bluetooth.h conio.h crypt.h direct.h dlfcn.h endian.h errno.h fcntl.h grp.h \
|
alloca.h asm/types.h bluetooth.h conio.h crypt.h direct.h dlfcn.h endian.h errno.h fcntl.h grp.h \
|
||||||
ieeefp.h io.h langinfo.h libintl.h libutil.h linux/memfd.h linux/random.h linux/soundcard.h \
|
ieeefp.h io.h langinfo.h libintl.h libutil.h linux/auxvec.h linux/memfd.h linux/random.h linux/soundcard.h \
|
||||||
linux/tipc.h linux/wait.h netinet/in.h netpacket/packet.h poll.h process.h pthread.h pty.h \
|
linux/tipc.h linux/wait.h netinet/in.h netpacket/packet.h poll.h process.h pthread.h pty.h \
|
||||||
sched.h setjmp.h shadow.h signal.h spawn.h stropts.h sys/audioio.h sys/bsdtty.h sys/devpoll.h \
|
sched.h setjmp.h shadow.h signal.h spawn.h stropts.h sys/audioio.h sys/bsdtty.h sys/devpoll.h \
|
||||||
sys/endian.h sys/epoll.h sys/event.h sys/eventfd.h sys/file.h sys/ioctl.h sys/kern_control.h \
|
sys/endian.h sys/epoll.h sys/event.h sys/eventfd.h sys/file.h sys/ioctl.h sys/kern_control.h \
|
||||||
|
|
|
@ -661,6 +661,9 @@
|
||||||
/* Define to 1 if you have the `linkat' function. */
|
/* Define to 1 if you have the `linkat' function. */
|
||||||
#undef HAVE_LINKAT
|
#undef HAVE_LINKAT
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <linux/auxvec.h> header file. */
|
||||||
|
#undef HAVE_LINUX_AUXVEC_H
|
||||||
|
|
||||||
/* Define to 1 if you have the <linux/can/bcm.h> header file. */
|
/* Define to 1 if you have the <linux/can/bcm.h> header file. */
|
||||||
#undef HAVE_LINUX_CAN_BCM_H
|
#undef HAVE_LINUX_CAN_BCM_H
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue