From 6c57d320484988e87e446e2e60ce42816bf51d53 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 1 Feb 2021 11:00:38 -0800 Subject: sysconf: Add _SC_MINSIGSTKSZ/_SC_SIGSTKSZ [BZ #20305] Add _SC_MINSIGSTKSZ for the minimum signal stack size derived from AT_MINSIGSTKSZ, which is the minimum number of bytes of free stack space required in order to gurantee successful, non-nested handling of a single signal whose handler is an empty function, and _SC_SIGSTKSZ which is the suggested minimum number of bytes of stack space required for a signal stack. If AT_MINSIGSTKSZ isn't available, sysconf (_SC_MINSIGSTKSZ) returns MINSIGSTKSZ. On Linux/x86 with XSAVE, the signal frame used by kernel is composed of the following areas and laid out as: ------------------------------ | alignment padding | ------------------------------ | xsave buffer | ------------------------------ | fsave header (32-bit only) | ------------------------------ | siginfo + ucontext | ------------------------------ Compute AT_MINSIGSTKSZ value as size of xsave buffer + size of fsave header (32-bit only) + size of siginfo and ucontext + alignment padding. If _SC_SIGSTKSZ_SOURCE or _GNU_SOURCE are defined, MINSIGSTKSZ and SIGSTKSZ are redefined as /* Default stack size for a signal handler: sysconf (SC_SIGSTKSZ). */ # undef SIGSTKSZ # define SIGSTKSZ sysconf (_SC_SIGSTKSZ) /* Minimum stack size for a signal handler: SIGSTKSZ. */ # undef MINSIGSTKSZ # define MINSIGSTKSZ SIGSTKSZ Compilation will fail if the source assumes constant MINSIGSTKSZ or SIGSTKSZ. The reason for not simply increasing the kernel's MINSIGSTKSZ #define (apart from the fact that it is rarely used, due to glibc's shadowing definitions) was that userspace binaries will have baked in the old value of the constant and may be making assumptions about it. For example, the type (char [MINSIGSTKSZ]) changes if this #define changes. This could be a problem if an newly built library tries to memcpy() or dump such an object defined by and old binary. Bounds-checking and the stack sizes passed to things like sigaltstack() and makecontext() could similarly go wrong. --- sysdeps/unix/sysv/linux/bits/sigstksz.h | 33 +++++++++ sysdeps/unix/sysv/linux/ia64/sysconf-sigstksz.h | 27 +++++++ sysdeps/unix/sysv/linux/sysconf-sigstksz.h | 38 ++++++++++ sysdeps/unix/sysv/linux/sysconf.c | 9 +++ sysdeps/unix/sysv/linux/x86/dl-minsigstacksize.h | 83 ++++++++++++++++++++++ .../unix/sysv/linux/x86/include/bits/sigstack.h | 5 ++ 6 files changed, 195 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/bits/sigstksz.h create mode 100644 sysdeps/unix/sysv/linux/ia64/sysconf-sigstksz.h create mode 100644 sysdeps/unix/sysv/linux/sysconf-sigstksz.h create mode 100644 sysdeps/unix/sysv/linux/x86/dl-minsigstacksize.h create mode 100644 sysdeps/unix/sysv/linux/x86/include/bits/sigstack.h (limited to 'sysdeps/unix') diff --git a/sysdeps/unix/sysv/linux/bits/sigstksz.h b/sysdeps/unix/sysv/linux/bits/sigstksz.h new file mode 100644 index 0000000000..926508f2b4 --- /dev/null +++ b/sysdeps/unix/sysv/linux/bits/sigstksz.h @@ -0,0 +1,33 @@ +/* Definition of MINSIGSTKSZ and SIGSTKSZ. Linux version. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#ifndef _SIGNAL_H +# error "Never include directly; use instead." +#endif + +#if defined __USE_SC_SIGSTKSZ && __USE_SC_SIGSTKSZ +# include + +/* Default stack size for a signal handler: sysconf (SC_SIGSTKSZ). */ +# undef SIGSTKSZ +# define SIGSTKSZ sysconf (_SC_SIGSTKSZ) + +/* Minimum stack size for a signal handler: SIGSTKSZ. */ +# undef MINSIGSTKSZ +# define MINSIGSTKSZ SIGSTKSZ +#endif diff --git a/sysdeps/unix/sysv/linux/ia64/sysconf-sigstksz.h b/sysdeps/unix/sysv/linux/ia64/sysconf-sigstksz.h new file mode 100644 index 0000000000..7e5ceba151 --- /dev/null +++ b/sysdeps/unix/sysv/linux/ia64/sysconf-sigstksz.h @@ -0,0 +1,27 @@ +/* sysconf_sigstksz (). Linux/ia64 version. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* Return sysconf (_SC_SIGSTKSZ). */ + +static long int +sysconf_sigstksz (void) +{ + _Static_assert (__builtin_constant_p (SIGSTKSZ), + "SIGSTKSZ is constant"); + return SIGSTKSZ; +} diff --git a/sysdeps/unix/sysv/linux/sysconf-sigstksz.h b/sysdeps/unix/sysv/linux/sysconf-sigstksz.h new file mode 100644 index 0000000000..64d450b22c --- /dev/null +++ b/sysdeps/unix/sysv/linux/sysconf-sigstksz.h @@ -0,0 +1,38 @@ +/* sysconf_sigstksz (). Linux version. + Copyright (C) 2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* Return sysconf (_SC_SIGSTKSZ). */ + +static long int +sysconf_sigstksz (void) +{ + long int minsigstacksize = GLRO(dl_minsigstacksize); + assert (minsigstacksize != 0); + _Static_assert (__builtin_constant_p (MINSIGSTKSZ), + "MINSIGSTKSZ is constant"); + if (minsigstacksize < MINSIGSTKSZ) + minsigstacksize = MINSIGSTKSZ; + /* MAX (MINSIGSTKSZ, sysconf (_SC_MINSIGSTKSZ)) * 4. */ + long int sigstacksize = minsigstacksize * 4; + /* Return MAX (SIGSTKSZ, sigstacksize). */ + _Static_assert (__builtin_constant_p (SIGSTKSZ), + "SIGSTKSZ is constant"); + if (sigstacksize < SIGSTKSZ) + sigstacksize = SIGSTKSZ; + return sigstacksize; +} diff --git a/sysdeps/unix/sysv/linux/sysconf.c b/sysdeps/unix/sysv/linux/sysconf.c index bfad5b6858..366fcef01e 100644 --- a/sysdeps/unix/sysv/linux/sysconf.c +++ b/sysdeps/unix/sysv/linux/sysconf.c @@ -16,6 +16,7 @@ License along with the GNU C Library; if not, see . */ +#include #include #include #include @@ -26,6 +27,7 @@ #include #include #include +#include /* Legacy value of ARG_MAX. The macro is now not defined since the actual value varies based on the stack size. */ @@ -75,6 +77,13 @@ __sysconf (int name) } break; + case _SC_MINSIGSTKSZ: + assert (GLRO(dl_minsigstacksize) != 0); + return GLRO(dl_minsigstacksize); + + case _SC_SIGSTKSZ: + return sysconf_sigstksz (); + default: break; } diff --git a/sysdeps/unix/sysv/linux/x86/dl-minsigstacksize.h b/sysdeps/unix/sysv/linux/x86/dl-minsigstacksize.h new file mode 100644 index 0000000000..6088bbc99e --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86/dl-minsigstacksize.h @@ -0,0 +1,83 @@ +/* Emulate AT_MINSIGSTKSZ. Linux/x86 version. + Copyright (C) 2020 Free Software Foundation, Inc. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* Emulate AT_MINSIGSTKSZ with XSAVE. */ + +static inline void +dl_check_minsigstacksize (const struct cpu_features *cpu_features) +{ + /* Return if AT_MINSIGSTKSZ is provide by kernel. */ + if (GLRO(dl_minsigstacksize) != 0) + return; + + if (cpu_features->basic.max_cpuid >= 0xd + && CPU_FEATURES_CPU_P (cpu_features, OSXSAVE)) + { + /* Emulate AT_MINSIGSTKSZ. In Linux kernel, the signal frame data + with XSAVE is composed of the following areas and laid out as: + ------------------------------ + | alignment padding | + ------------------------------ + | xsave buffer | + ------------------------------ + | fsave header (32-bit only) | + ------------------------------ + | siginfo + ucontext | + ------------------------------ + */ + + unsigned int sigframe_size; + +#ifdef __x86_64__ + /* NB: sizeof(struct rt_sigframe) + 8-byte return address in Linux + kernel. */ + sigframe_size = 440 + 8; +#else + /* NB: sizeof(struct sigframe_ia32) + sizeof(struct fregs_state)) + + 4-byte return address + 3 * 4-byte arguments in Linux kernel. */ + sigframe_size = 736 + 112 + 4 + 3 * 4; +#endif + + /* Add 15 bytes to align the stack to 16 bytes. */ + sigframe_size += 15; + + /* Make the space before xsave buffer multiple of 16 bytes. */ + sigframe_size = ALIGN_UP (sigframe_size, 16); + + /* Add (64 - 16)-byte padding to align xsave buffer at 64 bytes. */ + sigframe_size += 64 - 16; + + unsigned int eax, ebx, ecx, edx; + __cpuid_count (0xd, 0, eax, ebx, ecx, edx); + + /* Add the size of xsave buffer. */ + sigframe_size += ebx; + + /* Add the size of FP_XSTATE_MAGIC2. */ +#define FP_XSTATE_MAGIC2 0x46505845U + sigframe_size += sizeof (FP_XSTATE_MAGIC2); + + GLRO(dl_minsigstacksize) = sigframe_size; + } + else + { + /* NB: Default to a constant MINSIGSTKSZ. */ + _Static_assert (__builtin_constant_p (MINSIGSTKSZ), + "MINSIGSTKSZ is constant"); + GLRO(dl_minsigstacksize) = MINSIGSTKSZ; + } +} diff --git a/sysdeps/unix/sysv/linux/x86/include/bits/sigstack.h b/sysdeps/unix/sysv/linux/x86/include/bits/sigstack.h new file mode 100644 index 0000000000..208754c497 --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86/include/bits/sigstack.h @@ -0,0 +1,5 @@ +#include_next + +#ifndef _ISOMAC +# define CONSTANT_MINSIGSTKSZ 0 +#endif -- cgit 1.4.1