| Message ID | 20180711112233.GA15865@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [front-end,build-machinery,opt-framework] Allow setting of stack-clash via configure options. [Patch (4/6)] | expand |
On 07/11/2018 05:22 AM, Tamar Christina wrote: > Hi All, > > This patch defines a configure option to allow the setting of the default > guard size via configure flags when building the target. > > The new flag is: > > * --with-stack-clash-protection-guard-size=<num> > > The value of configured based params are set very early on and allow the > target to validate or reject the values as it sees fit. > > To do this the values for the parameter get set by configure through CPP defines. > In case the back-end wants to know if a value was set or not the original default > value is also passed down as a define. > > This allows a target to check if a param was changed by the user at configure time. > > Bootstrapped Regtested on aarch64-none-linux-gnu, x86_64-pc-linux-gnu and no issues. > Both targets were tested with stack clash on and off by default. > > Ok for trunk? > > Thanks, > Tamar > > gcc/ > 2018-07-11 Tamar Christina <tamar.christina@arm.com> > > PR target/86486 > * configure.ac: Add stack-clash-protection-guard-size. > * config.in (DEFAULT_STK_CLASH_GUARD_SIZE, STK_CLASH_GUARD_SIZE_DEFAULT, > STK_CLASH_GUARD_SIZE_MAX, STK_CLASH_GUARD_SIZE_MIN): New. > * params.def (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE): Use it. > * configure: Regenerate. > * Makefile.in (params.list, params.options): Add include dir for CPP. > * params-list.h: Include auto-host.h > * params-options.h: Likewise. > Something seems wrong here. What's the purpose of including auto-host in params-list and params-options? It seems like you're putting a property of the target (guard size) into the wrong place (auto-host.h). It's also a bit unclear to me why this is necessary at all. Are we planning to support both the 4k and 64k guards? My goal (once the guard was configurable) was never for supporting multiple sizes on a target but instead to allow experimentation to find the right default. Jeff
Hi Jeff, The 07/11/2018 20:21, Jeff Law wrote: > On 07/11/2018 05:22 AM, Tamar Christina wrote: > > Hi All, > > > > This patch defines a configure option to allow the setting of the default > > guard size via configure flags when building the target. > > > > The new flag is: > > > > * --with-stack-clash-protection-guard-size=<num> > > > > The value of configured based params are set very early on and allow the > > target to validate or reject the values as it sees fit. > > > > To do this the values for the parameter get set by configure through CPP defines. > > In case the back-end wants to know if a value was set or not the original default > > value is also passed down as a define. > > > > This allows a target to check if a param was changed by the user at configure time. > > > > Bootstrapped Regtested on aarch64-none-linux-gnu, x86_64-pc-linux-gnu and no issues. > > Both targets were tested with stack clash on and off by default. > > > > Ok for trunk? > > > > Thanks, > > Tamar > > > > gcc/ > > 2018-07-11 Tamar Christina <tamar.christina@arm.com> > > > > PR target/86486 > > * configure.ac: Add stack-clash-protection-guard-size. > > * config.in (DEFAULT_STK_CLASH_GUARD_SIZE, STK_CLASH_GUARD_SIZE_DEFAULT, > > STK_CLASH_GUARD_SIZE_MAX, STK_CLASH_GUARD_SIZE_MIN): New. > > * params.def (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE): Use it. > > * configure: Regenerate. > > * Makefile.in (params.list, params.options): Add include dir for CPP. > > * params-list.h: Include auto-host.h > > * params-options.h: Likewise. > > > Something seems wrong here. > > What's the purpose of including auto-host in params-list and > params-options? It seems like you're putting a property of the target > (guard size) into the wrong place (auto-host.h). > The reason for this is because there's a test gcc.dg/params/blocksort-part.c that uses these params-options to generate test cases to perform parameter validation. However because now the params.def file can contain a CPP macro these would then fail. CPP is already called to create params-options and params-list so the easiest way to fix this test was just to include auto-host which would get it the values from configure. This test is probably not needed anymore after my second patch series as parameters are validated by the front-end now, so they can never go out of range. > It's also a bit unclear to me why this is necessary at all. Are we > planning to support both the 4k and 64k guards? My goal (once the guard > was configurable) was never for supporting multiple sizes on a target > but instead to allow experimentation to find the right default. > I will get back to you on this one. Thanks, Tamar > Jeff --
Hi Jeff, > -----Original Message----- > From: Tamar Christina <Tamar.Christina@arm.com> > Sent: Thursday, July 12, 2018 18:45 > To: Jeff Law <law@redhat.com> > Cc: gcc-patches@gcc.gnu.org; nd <nd@arm.com>; > joseph@codesourcery.com; bonzini@gnu.org; dj@redhat.com; > neroden@gcc.gnu.org; aoliva@redhat.com; Ralf.Wildenhues@gmx.de > Subject: Re: [PATCH][GCC][front-end][build-machinery][opt-framework] > Allow setting of stack-clash via configure options. [Patch (4/6)] > > Hi Jeff, > > The 07/11/2018 20:21, Jeff Law wrote: > > On 07/11/2018 05:22 AM, Tamar Christina wrote: > > > Hi All, > > > > > > This patch defines a configure option to allow the setting of the > > > default guard size via configure flags when building the target. > > > > > > The new flag is: > > > > > > * --with-stack-clash-protection-guard-size=<num> > > > > > > The value of configured based params are set very early on and allow > > > the target to validate or reject the values as it sees fit. > > > > > > To do this the values for the parameter get set by configure through CPP > defines. > > > In case the back-end wants to know if a value was set or not the > > > original default value is also passed down as a define. > > > > > > This allows a target to check if a param was changed by the user at > configure time. > > > > > > Bootstrapped Regtested on aarch64-none-linux-gnu, x86_64-pc-linux- > gnu and no issues. > > > Both targets were tested with stack clash on and off by default. > > > > > > Ok for trunk? > > > > > > Thanks, > > > Tamar > > > > > > gcc/ > > > 2018-07-11 Tamar Christina <tamar.christina@arm.com> > > > > > > PR target/86486 > > > * configure.ac: Add stack-clash-protection-guard-size. > > > * config.in (DEFAULT_STK_CLASH_GUARD_SIZE, > STK_CLASH_GUARD_SIZE_DEFAULT, > > > STK_CLASH_GUARD_SIZE_MAX, STK_CLASH_GUARD_SIZE_MIN): > New. > > > * params.def (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE): > Use it. > > > * configure: Regenerate. > > > * Makefile.in (params.list, params.options): Add include dir for CPP. > > > * params-list.h: Include auto-host.h > > > * params-options.h: Likewise. > > > > > Something seems wrong here. > > > > What's the purpose of including auto-host in params-list and > > params-options? It seems like you're putting a property of the target > > (guard size) into the wrong place (auto-host.h). > > > > The reason for this is because there's a test gcc.dg/params/blocksort-part.c > that uses these params-options to generate test cases to perform parameter > validation. However because now the params.def file can contain a CPP > macro these would then fail. > > CPP is already called to create params-options and params-list so the easiest > way to fix this test was just to include auto-host which would get it the values > from configure. > > This test is probably not needed anymore after my second patch series as > parameters are validated by the front-end now, so they can never go out of > range. > > > It's also a bit unclear to me why this is necessary at all. Are we > > planning to support both the 4k and 64k guards? My goal (once the > > guard was configurable) was never for supporting multiple sizes on a > > target but instead to allow experimentation to find the right default. > > Having talked to people I believe we do need to support both 4k and 64k guards. For the Linux/Glibc world it wouldn't matter much, either 4 or 64k would do, though Glibc has settled on 64k pages. However other systems like (open/free)BSD or musl based systems do not want 64k pages but want 4k ones. So we're ending up having to support both as a compromise. Regards, Tamar > > I will get back to you on this one. > > Thanks, > Tamar > > > Jeff > > --
On 07/19/2018 06:55 AM, Tamar Christina wrote: >>> >>> What's the purpose of including auto-host in params-list and >>> params-options? It seems like you're putting a property of the target >>> (guard size) into the wrong place (auto-host.h). >>> >> >> The reason for this is because there's a test gcc.dg/params/blocksort-part.c >> that uses these params-options to generate test cases to perform parameter >> validation. However because now the params.def file can contain a CPP >> macro these would then fail. >> >> CPP is already called to create params-options and params-list so the easiest >> way to fix this test was just to include auto-host which would get it the values >> from configure. >> >> This test is probably not needed anymore after my second patch series as >> parameters are validated by the front-end now, so they can never go out of >> range. Right, but I don't immediately see a way to avoid the test. ie, it just walks down everything in params.options and except for a couple exceptional values the test gets run. I wonder if all this is an indication that having CPP constants in the options isn't going to work well as we're mixing the distinction between host/target. >> >>> It's also a bit unclear to me why this is necessary at all. Are we >>> planning to support both the 4k and 64k guards? My goal (once the >>> guard was configurable) was never for supporting multiple sizes on a >>> target but instead to allow experimentation to find the right default. >>> > > Having talked to people I believe we do need to support both 4k and 64k guards. > For the Linux/Glibc world it wouldn't matter much, either 4 or 64k would do, though Glibc has settled on 64k pages. > > However other systems like (open/free)BSD or musl based systems do not want > 64k pages but want 4k ones. So we're ending up having to support both as a compromise. Understood. Thanks for verifying. I wonder if we could just bury this entirely in the aarch64 config files and not expose the default into params.def? jeff
Hi Jeff, > -----Original Message----- > From: Jeff Law <law@redhat.com> > Sent: Thursday, July 19, 2018 18:32 > To: Tamar Christina <Tamar.Christina@arm.com> > Cc: gcc-patches@gcc.gnu.org; nd <nd@arm.com>; > joseph@codesourcery.com; bonzini@gnu.org; dj@redhat.com; > neroden@gcc.gnu.org; aoliva@redhat.com; Ralf.Wildenhues@gmx.de > Subject: Re: [PATCH][GCC][front-end][build-machinery][opt-framework] > Allow setting of stack-clash via configure options. [Patch (4/6)] > > On 07/19/2018 06:55 AM, Tamar Christina wrote: > >>> > >>> What's the purpose of including auto-host in params-list and > >>> params-options? It seems like you're putting a property of the > >>> target (guard size) into the wrong place (auto-host.h). > >>> > >> > >> The reason for this is because there's a test > >> gcc.dg/params/blocksort-part.c that uses these params-options to > >> generate test cases to perform parameter validation. However because > >> now the params.def file can contain a CPP macro these would then fail. > >> > >> CPP is already called to create params-options and params-list so the > >> easiest way to fix this test was just to include auto-host which > >> would get it the values from configure. > >> > >> This test is probably not needed anymore after my second patch series > >> as parameters are validated by the front-end now, so they can never > >> go out of range. > Right, but I don't immediately see a way to avoid the test. ie, it just walks > down everything in params.options and except for a couple exceptional > values the test gets run. > > I wonder if all this is an indication that having CPP constants in the options > isn't going to work well as we're mixing the distinction between host/target. > > > >> > >>> It's also a bit unclear to me why this is necessary at all. Are we > >>> planning to support both the 4k and 64k guards? My goal (once the > >>> guard was configurable) was never for supporting multiple sizes on a > >>> target but instead to allow experimentation to find the right default. > >>> > > > > Having talked to people I believe we do need to support both 4k and 64k > guards. > > For the Linux/Glibc world it wouldn't matter much, either 4 or 64k would do, > though Glibc has settled on 64k pages. > > > > However other systems like (open/free)BSD or musl based systems do not > > want 64k pages but want 4k ones. So we're ending up having to support > both as a compromise. > Understood. Thanks for verifying. I wonder if we could just bury this entirely > in the aarch64 config files and not expose the default into params.def? > Burying it in config.gcc isn't ideal because if your C runtime is configurable (like uClibc) it means you have to go and modify this file every time you change something. If the argument is against having these defines in the params and not the configure flag itself then I can just have an aarch64 specific configure flag and just use the created define directly in the AArch64 back-end. Would that be an acceptable solution? Thanks, Tamar > jeff
On 07/20/2018 05:03 AM, Tamar Christina wrote: >> Understood. Thanks for verifying. I wonder if we could just bury this entirely >> in the aarch64 config files and not expose the default into params.def? >> > > Burying it in config.gcc isn't ideal because if your C runtime is configurable (like uClibc) it means you > have to go and modify this file every time you change something. If the argument is > against having these defines in the params and not the configure flag itself then I can just > have an aarch64 specific configure flag and just use the created define directly in the AArch64 back-end. Not config.gcc, but in a .h/.c file for the target. If we leave the generic option, but override the default in the target files. Would that work? Jeff
> > On 07/20/2018 05:03 AM, Tamar Christina wrote: > >> Understood. Thanks for verifying. I wonder if we could just bury > >> this entirely in the aarch64 config files and not expose the default into > params.def? > >> > > > > Burying it in config.gcc isn't ideal because if your C runtime is > > configurable (like uClibc) it means you have to go and modify this > > file every time you change something. If the argument is against > > having these defines in the params and not the configure flag itself then I > can just have an aarch64 specific configure flag and just use the created > define directly in the AArch64 back-end. > Not config.gcc, but in a .h/.c file for the target. > > If we leave the generic option, but override the default in the target files. > Would that work? So leaving the generic configure option? Yes that would work too. The only downside is that if we have want to do any validation on the value at configure time it would need to be manually kept in sync with those in params.def. Or we'd just have to not do any checking at configure time. This would mean you can get to the end of your build and only when you try to use the compiler would it complain. Both aren't a real deal breaker to me. Shall I then just leave the configure flag but remove the params plumbing? Thanks, Tamar > > Jeff
On 07/20/2018 09:39 AM, Tamar Christina wrote: >> >> On 07/20/2018 05:03 AM, Tamar Christina wrote: >>>> Understood. Thanks for verifying. I wonder if we could just bury >>>> this entirely in the aarch64 config files and not expose the default into >> params.def? >>>> >>> >>> Burying it in config.gcc isn't ideal because if your C runtime is >>> configurable (like uClibc) it means you have to go and modify this >>> file every time you change something. If the argument is against >>> having these defines in the params and not the configure flag itself then I >> can just have an aarch64 specific configure flag and just use the created >> define directly in the AArch64 back-end. >> Not config.gcc, but in a .h/.c file for the target. >> >> If we leave the generic option, but override the default in the target files. >> Would that work? > > So leaving the generic configure option? Yes that would work too. The only downside is > that if we have want to do any validation on the value at configure time it would need to > be manually kept in sync with those in params.def. Or we'd just have to not do any checking > at configure time. This would mean you can get to the end of your build and only when you > try to use the compiler would it complain. > > Both aren't a real deal breaker to me. > > Shall I then just leave the configure flag but remove the params plumbing? Yea, I think any sanity check essentially has to move to when the compiler runs. We can always return to param removal at a later point. Can you post an updated patch? Note I'm on PTO starting Wed for a week. If you post it tomorrow I'll try to take a look before I disappear. jeff
Hi Jeff, This patch defines a configure option to allow the setting of the default guard size via configure flags when building the target. The new flag is: * --with-stack-clash-protection-guard-size=<num> The patch defines a new macro DEFAULT_STK_CLASH_GUARD_SIZE which targets need to use explicitly is they want to support this configure flag and values that users may have set. Bootstrapped Regtested on aarch64-none-linux-gnu, x86_64-pc-linux-gnu and no issues. Both targets were tested with stack clash on and off by default. Ok for trunk? Thanks, Tamar gcc/ 2018-07-24 Tamar Christina <tamar.christina@arm.com> PR target/86486 * configure.ac: Add stack-clash-protection-guard-size. * config.in (DEFAULT_STK_CLASH_GUARD_SIZE): New. * params.def: Update comment for guard-size. * configure: Regenerate. > -----Original Message----- > From: Jeff Law <law@redhat.com> > Sent: Monday, July 23, 2018 23:19 > To: Tamar Christina <Tamar.Christina@arm.com> > Cc: gcc-patches@gcc.gnu.org; nd <nd@arm.com>; > joseph@codesourcery.com; bonzini@gnu.org; dj@redhat.com; > neroden@gcc.gnu.org; aoliva@redhat.com; Ralf.Wildenhues@gmx.de > Subject: Re: [PATCH][GCC][front-end][build-machinery][opt-framework] > Allow setting of stack-clash via configure options. [Patch (4/6)] > > On 07/20/2018 09:39 AM, Tamar Christina wrote: > >> > >> On 07/20/2018 05:03 AM, Tamar Christina wrote: > >>>> Understood. Thanks for verifying. I wonder if we could just bury > >>>> this entirely in the aarch64 config files and not expose the > >>>> default into > >> params.def? > >>>> > >>> > >>> Burying it in config.gcc isn't ideal because if your C runtime is > >>> configurable (like uClibc) it means you have to go and modify this > >>> file every time you change something. If the argument is against > >>> having these defines in the params and not the configure flag itself > >>> then I > >> can just have an aarch64 specific configure flag and just use the > >> created define directly in the AArch64 back-end. > >> Not config.gcc, but in a .h/.c file for the target. > >> > >> If we leave the generic option, but override the default in the target files. > >> Would that work? > > > > So leaving the generic configure option? Yes that would work too. The > > only downside is that if we have want to do any validation on the > > value at configure time it would need to be manually kept in sync with > > those in params.def. Or we'd just have to not do any checking at > > configure time. This would mean you can get to the end of your build and > only when you try to use the compiler would it complain. > > > > Both aren't a real deal breaker to me. > > > > Shall I then just leave the configure flag but remove the params plumbing? > Yea, I think any sanity check essentially has to move to when the compiler > runs. We can always return to param removal at a later point. > > Can you post an updated patch? Note I'm on PTO starting Wed for a week. > If you post it tomorrow I'll try to take a look before I disappear. > > jeff diff --git a/gcc/config.in b/gcc/config.in index 2856e72d627df537a301a6c7ab6b5bbb75f6b43f..f3b301ef5afdaf0db8865e11601980f19ea0b3dd 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -55,6 +55,12 @@ #endif +/* Define to larger than zero set the default stack clash protector size. */ +#ifndef USED_FOR_TARGET +#undef DEFAULT_STK_CLASH_GUARD_SIZE +#endif + + /* Define if you want to use __cxa_atexit, rather than atexit, to register C++ destructors for local statics and global objects. This is essential for fully standards-compliant handling of destructors, but requires diff --git a/gcc/configure b/gcc/configure index 60d373982fd38fe51c285e2b02941754d1b833d6..42ec5b536bee90adb319d172eb7cca1a363a87b6 100755 --- a/gcc/configure +++ b/gcc/configure @@ -905,6 +905,7 @@ enable_valgrind_annotations with_stabs enable_multilib enable_multiarch +with_stack_clash_protection_guard_size enable___cxa_atexit enable_decimal_float enable_fixed_point @@ -1724,6 +1725,9 @@ Optional Packages: --with-gnu-as arrange to work with GNU as --with-as arrange to use the specified as (full pathname) --with-stabs arrange to use stabs instead of host debug format + --with-stack-clash-protection-guard-size=size + Set the default stack clash protection guard size + for specific targets. --with-dwarf2 force the default debug format to be DWARF 2 --with-specs=SPECS add SPECS to driver command-line processing --with-pkgversion=PKG Use PKG in the version string in place of "GCC" @@ -7436,6 +7440,35 @@ $as_echo "$enable_multiarch$ma_msg_suffix" >&6; } +# default stack clash protection guard size +# Please keep these in sync with params.def. +stk_clash_min=12 +stk_clash_max=30 +stk_clash_default=12 + +# Keep the default value when the option is not used to 0, this allows us to +# distinguish between the cases where the user specifially set a value via +# configure and when the normal default value is used. + +# Check whether --with-stack-clash-protection-guard-size was given. +if test "${with_stack_clash_protection_guard_size+set}" = set; then : + withval=$with_stack_clash_protection_guard_size; DEFAULT_STK_CLASH_GUARD_SIZE="$with_stack_clash_protection_guard_size" +else + DEFAULT_STK_CLASH_GUARD_SIZE=0 +fi + +if test $DEFAULT_STK_CLASH_GUARD_SIZE -ne 0 \ + && (test $DEFAULT_STK_CLASH_GUARD_SIZE -lt $stk_clash_min \ + || test $DEFAULT_STK_CLASH_GUARD_SIZE -gt $stk_clash_max); then + as_fn_error "Invalid value $DEFAULT_STK_CLASH_GUARD_SIZE for --with-stack-clash-protection-guard-size. Must be between $stk_clash_min and $stk_clash_max." "$LINENO" 5 +fi + + +cat >>confdefs.h <<_ACEOF +#define DEFAULT_STK_CLASH_GUARD_SIZE $DEFAULT_STK_CLASH_GUARD_SIZE +_ACEOF + + # Enable __cxa_atexit for C++. # Check whether --enable-__cxa_atexit was given. if test "${enable___cxa_atexit+set}" = set; then : @@ -18448,7 +18481,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18451 "configure" +#line 18484 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18554,7 +18587,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18557 "configure" +#line 18590 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index 010ecd2ccf609ded1f4d2849a2acc13aba43b55b..2ed1806ed87aca3b451ccd4b0848b50e934b75a9 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -811,6 +811,30 @@ AC_MSG_RESULT($enable_multiarch$ma_msg_suffix) AC_SUBST(with_cpu) AC_SUBST(with_float) +# default stack clash protection guard size +# Please keep these in sync with params.def. +stk_clash_min=12 +stk_clash_max=30 +stk_clash_default=12 + +# Keep the default value when the option is not used to 0, this allows us to +# distinguish between the cases where the user specifially set a value via +# configure and when the normal default value is used. +AC_ARG_WITH(stack-clash-protection-guard-size, +[AS_HELP_STRING([--with-stack-clash-protection-guard-size=size], +[Set the default stack clash protection guard size for specific targets.])], +[DEFAULT_STK_CLASH_GUARD_SIZE="$with_stack_clash_protection_guard_size"], [DEFAULT_STK_CLASH_GUARD_SIZE=0]) +if test $DEFAULT_STK_CLASH_GUARD_SIZE -ne 0 \ + && (test $DEFAULT_STK_CLASH_GUARD_SIZE -lt $stk_clash_min \ + || test $DEFAULT_STK_CLASH_GUARD_SIZE -gt $stk_clash_max); then + AC_MSG_ERROR(m4_normalize([ + Invalid value $DEFAULT_STK_CLASH_GUARD_SIZE for --with-stack-clash-protection-guard-size. \ + Must be between $stk_clash_min and $stk_clash_max.])) +fi + +AC_DEFINE_UNQUOTED(DEFAULT_STK_CLASH_GUARD_SIZE, $DEFAULT_STK_CLASH_GUARD_SIZE, + [Define to larger than zero set the default stack clash protector size.]) + # Enable __cxa_atexit for C++. AC_ARG_ENABLE(__cxa_atexit, [AS_HELP_STRING([--enable-__cxa_atexit], [enable __cxa_atexit for C++])], diff --git a/gcc/params.def b/gcc/params.def index a3906c268814bdc3a813416a60b9f666d1568f0a..b968a3fdbb7aef5074a15c3da8613679825aba2f 100644 --- a/gcc/params.def +++ b/gcc/params.def @@ -213,6 +213,7 @@ DEFPARAM(PARAM_STACK_FRAME_GROWTH, "Maximal stack frame growth due to inlining (in percent).", 1000, 0, 0) +/* Keep these up to date with those in configure.ac. */ DEFPARAM(PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE, "stack-clash-protection-guard-size", "Size of the stack guard expressed as a power of two.",
On Tue, 24 Jul 2018, tamar.christina@arm.com wrote: > This patch defines a configure option to allow the setting of the default > guard size via configure flags when building the target. If you add a configure option, you must also add documentation for it in install.texi.
Hi All, Here's an updated patch with documentation. Ok for trunk? Thanks, Tamar gcc/ 2018-07-24 Tamar Christina <tamar.christina@arm.com> PR target/86486 * configure.ac: Add stack-clash-protection-guard-size. * doc/install.texi: Document it. * config.in (DEFAULT_STK_CLASH_GUARD_SIZE): New. * params.def: Update comment for guard-size. * configure: Regenerate. The 07/24/2018 11:34, Joseph Myers wrote: > On Tue, 24 Jul 2018, tamar.christina@arm.com wrote: > > > This patch defines a configure option to allow the setting of the default > > guard size via configure flags when building the target. > > If you add a configure option, you must also add documentation for it in > install.texi. > > -- > Joseph S. Myers > joseph@codesourcery.com -- diff --git a/gcc/config.in b/gcc/config.in index 2856e72d627df537a301a6c7ab6b5bbb75f6b43f..e853adc9aed366fe7bbc0f598e9f7137d68d7c02 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -55,6 +55,12 @@ #endif +/* Define to larger than zero set to the default stack clash protector size. */ +#ifndef USED_FOR_TARGET +#undef DEFAULT_STK_CLASH_GUARD_SIZE +#endif + + /* Define if you want to use __cxa_atexit, rather than atexit, to register C++ destructors for local statics and global objects. This is essential for fully standards-compliant handling of destructors, but requires diff --git a/gcc/configure b/gcc/configure index 60d373982fd38fe51c285e2b02941754d1b833d6..513a8eada59af8314732d744b673e807829bad77 100755 --- a/gcc/configure +++ b/gcc/configure @@ -905,6 +905,7 @@ enable_valgrind_annotations with_stabs enable_multilib enable_multiarch +with_stack_clash_protection_guard_size enable___cxa_atexit enable_decimal_float enable_fixed_point @@ -1724,6 +1725,9 @@ Optional Packages: --with-gnu-as arrange to work with GNU as --with-as arrange to use the specified as (full pathname) --with-stabs arrange to use stabs instead of host debug format + --with-stack-clash-protection-guard-size=size + Set the default stack clash protection guard size + for specific targets as a power of two. --with-dwarf2 force the default debug format to be DWARF 2 --with-specs=SPECS add SPECS to driver command-line processing --with-pkgversion=PKG Use PKG in the version string in place of "GCC" @@ -7436,6 +7440,35 @@ $as_echo "$enable_multiarch$ma_msg_suffix" >&6; } +# default stack clash protection guard size +# Please keep these in sync with params.def. +stk_clash_min=12 +stk_clash_max=30 +stk_clash_default=12 + +# Keep the default value when the option is not used to 0, this allows us to +# distinguish between the cases where the user specifially set a value via +# configure and when the normal default value is used. + +# Check whether --with-stack-clash-protection-guard-size was given. +if test "${with_stack_clash_protection_guard_size+set}" = set; then : + withval=$with_stack_clash_protection_guard_size; DEFAULT_STK_CLASH_GUARD_SIZE="$with_stack_clash_protection_guard_size" +else + DEFAULT_STK_CLASH_GUARD_SIZE=0 +fi + +if test $DEFAULT_STK_CLASH_GUARD_SIZE -ne 0 \ + && (test $DEFAULT_STK_CLASH_GUARD_SIZE -lt $stk_clash_min \ + || test $DEFAULT_STK_CLASH_GUARD_SIZE -gt $stk_clash_max); then + as_fn_error "Invalid value $DEFAULT_STK_CLASH_GUARD_SIZE for --with-stack-clash-protection-guard-size. Must be between $stk_clash_min and $stk_clash_max." "$LINENO" 5 +fi + + +cat >>confdefs.h <<_ACEOF +#define DEFAULT_STK_CLASH_GUARD_SIZE $DEFAULT_STK_CLASH_GUARD_SIZE +_ACEOF + + # Enable __cxa_atexit for C++. # Check whether --enable-__cxa_atexit was given. if test "${enable___cxa_atexit+set}" = set; then : @@ -18448,7 +18481,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18451 "configure" +#line 18484 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18554,7 +18587,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18557 "configure" +#line 18590 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index 010ecd2ccf609ded1f4d2849a2acc13aba43b55b..e839445c1aea7dc9c5a5ee8dab8191eae5298bc2 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -811,6 +811,30 @@ AC_MSG_RESULT($enable_multiarch$ma_msg_suffix) AC_SUBST(with_cpu) AC_SUBST(with_float) +# default stack clash protection guard size +# Please keep these in sync with params.def. +stk_clash_min=12 +stk_clash_max=30 +stk_clash_default=12 + +# Keep the default value when the option is not used to 0, this allows us to +# distinguish between the cases where the user specifially set a value via +# configure and when the normal default value is used. +AC_ARG_WITH(stack-clash-protection-guard-size, +[AS_HELP_STRING([--with-stack-clash-protection-guard-size=size], +[Set the default stack clash protection guard size for specific targets as a power of two.])], +[DEFAULT_STK_CLASH_GUARD_SIZE="$with_stack_clash_protection_guard_size"], [DEFAULT_STK_CLASH_GUARD_SIZE=0]) +if test $DEFAULT_STK_CLASH_GUARD_SIZE -ne 0 \ + && (test $DEFAULT_STK_CLASH_GUARD_SIZE -lt $stk_clash_min \ + || test $DEFAULT_STK_CLASH_GUARD_SIZE -gt $stk_clash_max); then + AC_MSG_ERROR(m4_normalize([ + Invalid value $DEFAULT_STK_CLASH_GUARD_SIZE for --with-stack-clash-protection-guard-size. \ + Must be between $stk_clash_min and $stk_clash_max.])) +fi + +AC_DEFINE_UNQUOTED(DEFAULT_STK_CLASH_GUARD_SIZE, $DEFAULT_STK_CLASH_GUARD_SIZE, + [Define to larger than zero set the default stack clash protector size.]) + # Enable __cxa_atexit for C++. AC_ARG_ENABLE(__cxa_atexit, [AS_HELP_STRING([--enable-__cxa_atexit], [enable __cxa_atexit for C++])], diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 7c5cdc762d3ecca2b37c1ebc8caf99d22ff351b9..c4590110de500a04d6ed6fdb7e69c2a69a381537 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -1410,6 +1410,11 @@ These features are extensions to the traditional SVR4-based MIPS ABIs and require support from GNU binutils and the runtime C library. +@item --with-stack-clash-protection-guard-size=@var{size} +On certain targets this option sets the default stack clash protection guard +size as a power of two. On AArch64 @var{size} is required to be either +12 (4KB) or 16 (64KB). + @item --enable-__cxa_atexit Define if you want to use __cxa_atexit, rather than atexit, to register C++ destructors for local statics and global objects. diff --git a/gcc/params.def b/gcc/params.def index a3906c268814bdc3a813416a60b9f666d1568f0a..b968a3fdbb7aef5074a15c3da8613679825aba2f 100644 --- a/gcc/params.def +++ b/gcc/params.def @@ -213,6 +213,7 @@ DEFPARAM(PARAM_STACK_FRAME_GROWTH, "Maximal stack frame growth due to inlining (in percent).", 1000, 0, 0) +/* Keep these up to date with those in configure.ac. */ DEFPARAM(PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE, "stack-clash-protection-guard-size", "Size of the stack guard expressed as a power of two.",
Hello, Christina, On Jul 24, 2018, Tamar Christina <Tamar.Christina@arm.com> wrote: > gcc/ > 2018-07-24 Tamar Christina <tamar.christina@arm.com> > PR target/86486 > * configure.ac: Add stack-clash-protection-guard-size. > * doc/install.texi: Document it. > * config.in (DEFAULT_STK_CLASH_GUARD_SIZE): New. > * params.def: Update comment for guard-size. > * configure: Regenerate. The configury bits look almost good to me. I wish the help message, comments and docs expressed somehow that the given power of two expresses a size in bytes, rather than in kilobytes, bits or any other unit that might be reasonably assumed to express stack sizes. I'm afraid I don't know the best way to accomplish that in a few words. > +stk_clash_default=12 This seems to be left-over from an earlier patch, as it is now unused AFAICT. Thanks,
HI Alexandre, Thanks for the review. Attached is the updated patch and new changelog below: Thanks, Tamar gcc/ 2018-07-25 Tamar Christina <tamar.christina@arm.com> PR target/86486 * configure.ac: Add stack-clash-protection-guard-size. * doc/install.texi: Document it. * config.in (DEFAULT_STK_CLASH_GUARD_SIZE): New. * params.def: Update comment for guard-size. (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE, PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL): Update description. * configure: Regenerate. > -----Original Message----- > From: Alexandre Oliva <oliva@gnu.org> > Sent: Tuesday, July 24, 2018 20:24 > To: Tamar Christina <Tamar.Christina@arm.com> > Cc: Joseph Myers <joseph@codesourcery.com>; Jeff Law > <law@redhat.com>; gcc-patches@gcc.gnu.org; nd <nd@arm.com>; > bonzini@gnu.org; dj@redhat.com; neroden@gcc.gnu.org; > Ralf.Wildenhues@gmx.de > Subject: Re: [PATCH][GCC][front-end][build-machinery][opt-framework] > Allow setting of stack-clash via configure options. [Patch (4/6)] > > Hello, Christina, > > On Jul 24, 2018, Tamar Christina <Tamar.Christina@arm.com> wrote: > > > gcc/ > > 2018-07-24 Tamar Christina <tamar.christina@arm.com> > > > PR target/86486 > > * configure.ac: Add stack-clash-protection-guard-size. > > * doc/install.texi: Document it. > > * config.in (DEFAULT_STK_CLASH_GUARD_SIZE): New. > > * params.def: Update comment for guard-size. > > * configure: Regenerate. > > The configury bits look almost good to me. > > I wish the help message, comments and docs expressed somehow that the > given power of two expresses a size in bytes, rather than in kilobytes, bits or > any other unit that might be reasonably assumed to express stack sizes. I'm > afraid I don't know the best way to accomplish that in a few words. > > > +stk_clash_default=12 > > This seems to be left-over from an earlier patch, as it is now unused AFAICT. > > Thanks, > > -- > Alexandre Oliva, freedom fighter https://FSFLA.org/blogs/lxo > Be the change, be Free! FSF Latin America board member > GNU Toolchain Engineer Free Software Evangelist diff --git a/gcc/config.in b/gcc/config.in index 2856e72d627df537a301a6c7ab6b5bbb75f6b43f..32118ef1f94cece06a1d870416c3a1705716d21b 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -55,6 +55,13 @@ #endif +/* Define to larger than zero set to the default stack clash protector size as + a power of two in bytes. */ +#ifndef USED_FOR_TARGET +#undef DEFAULT_STK_CLASH_GUARD_SIZE +#endif + + /* Define if you want to use __cxa_atexit, rather than atexit, to register C++ destructors for local statics and global objects. This is essential for fully standards-compliant handling of destructors, but requires diff --git a/gcc/configure b/gcc/configure index 60d373982fd38fe51c285e2b02941754d1b833d6..77ed62d199b272dfe39de156771dfb774184dd7d 100755 --- a/gcc/configure +++ b/gcc/configure @@ -905,6 +905,7 @@ enable_valgrind_annotations with_stabs enable_multilib enable_multiarch +with_stack_clash_protection_guard_size enable___cxa_atexit enable_decimal_float enable_fixed_point @@ -1724,6 +1725,9 @@ Optional Packages: --with-gnu-as arrange to work with GNU as --with-as arrange to use the specified as (full pathname) --with-stabs arrange to use stabs instead of host debug format + --with-stack-clash-protection-guard-size=size + Set the default stack clash protection guard size + for specific targets as a power of two in bytes. --with-dwarf2 force the default debug format to be DWARF 2 --with-specs=SPECS add SPECS to driver command-line processing --with-pkgversion=PKG Use PKG in the version string in place of "GCC" @@ -7436,6 +7440,34 @@ $as_echo "$enable_multiarch$ma_msg_suffix" >&6; } +# default stack clash protection guard size as power of twos in bytes. +# Please keep these in sync with params.def. +stk_clash_min=12 +stk_clash_max=30 + +# Keep the default value when the option is not used to 0, this allows us to +# distinguish between the cases where the user specifially set a value via +# configure and when the normal default value is used. + +# Check whether --with-stack-clash-protection-guard-size was given. +if test "${with_stack_clash_protection_guard_size+set}" = set; then : + withval=$with_stack_clash_protection_guard_size; DEFAULT_STK_CLASH_GUARD_SIZE="$with_stack_clash_protection_guard_size" +else + DEFAULT_STK_CLASH_GUARD_SIZE=0 +fi + +if test $DEFAULT_STK_CLASH_GUARD_SIZE -ne 0 \ + && (test $DEFAULT_STK_CLASH_GUARD_SIZE -lt $stk_clash_min \ + || test $DEFAULT_STK_CLASH_GUARD_SIZE -gt $stk_clash_max); then + as_fn_error "Invalid value $DEFAULT_STK_CLASH_GUARD_SIZE for --with-stack-clash-protection-guard-size. Must be between $stk_clash_min and $stk_clash_max." "$LINENO" 5 +fi + + +cat >>confdefs.h <<_ACEOF +#define DEFAULT_STK_CLASH_GUARD_SIZE $DEFAULT_STK_CLASH_GUARD_SIZE +_ACEOF + + # Enable __cxa_atexit for C++. # Check whether --enable-__cxa_atexit was given. if test "${enable___cxa_atexit+set}" = set; then : @@ -18448,7 +18480,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18451 "configure" +#line 18483 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18554,7 +18586,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18557 "configure" +#line 18589 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index 010ecd2ccf609ded1f4d2849a2acc13aba43b55b..0bf75e14bf77054d7c5cafd9d686eb0964999227 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -811,6 +811,29 @@ AC_MSG_RESULT($enable_multiarch$ma_msg_suffix) AC_SUBST(with_cpu) AC_SUBST(with_float) +# default stack clash protection guard size as power of twos in bytes. +# Please keep these in sync with params.def. +stk_clash_min=12 +stk_clash_max=30 + +# Keep the default value when the option is not used to 0, this allows us to +# distinguish between the cases where the user specifially set a value via +# configure and when the normal default value is used. +AC_ARG_WITH(stack-clash-protection-guard-size, +[AS_HELP_STRING([--with-stack-clash-protection-guard-size=size], +[Set the default stack clash protection guard size for specific targets as a power of two in bytes.])], +[DEFAULT_STK_CLASH_GUARD_SIZE="$with_stack_clash_protection_guard_size"], [DEFAULT_STK_CLASH_GUARD_SIZE=0]) +if test $DEFAULT_STK_CLASH_GUARD_SIZE -ne 0 \ + && (test $DEFAULT_STK_CLASH_GUARD_SIZE -lt $stk_clash_min \ + || test $DEFAULT_STK_CLASH_GUARD_SIZE -gt $stk_clash_max); then + AC_MSG_ERROR(m4_normalize([ + Invalid value $DEFAULT_STK_CLASH_GUARD_SIZE for --with-stack-clash-protection-guard-size. \ + Must be between $stk_clash_min and $stk_clash_max.])) +fi + +AC_DEFINE_UNQUOTED(DEFAULT_STK_CLASH_GUARD_SIZE, $DEFAULT_STK_CLASH_GUARD_SIZE, + [Define to larger than zero set the default stack clash protector size.]) + # Enable __cxa_atexit for C++. AC_ARG_ENABLE(__cxa_atexit, [AS_HELP_STRING([--enable-__cxa_atexit], [enable __cxa_atexit for C++])], diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 7c5cdc762d3ecca2b37c1ebc8caf99d22ff351b9..8aa7bed0d25081afc859bc3421dc71c68e516cde 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -1410,6 +1410,11 @@ These features are extensions to the traditional SVR4-based MIPS ABIs and require support from GNU binutils and the runtime C library. +@item --with-stack-clash-protection-guard-size=@var{size} +On certain targets this option sets the default stack clash protection guard +size as a power of two in bytes. On AArch64 @var{size} is required to be either +12 (4KB) or 16 (64KB). + @item --enable-__cxa_atexit Define if you want to use __cxa_atexit, rather than atexit, to register C++ destructors for local statics and global objects. diff --git a/gcc/params.def b/gcc/params.def index a3906c268814bdc3a813416a60b9f666d1568f0a..762a38ca07b9a3ed5784d64ab3eab9955e0cb246 100644 --- a/gcc/params.def +++ b/gcc/params.def @@ -213,14 +213,15 @@ DEFPARAM(PARAM_STACK_FRAME_GROWTH, "Maximal stack frame growth due to inlining (in percent).", 1000, 0, 0) +/* Keep these up to date with those in configure.ac. */ DEFPARAM(PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE, "stack-clash-protection-guard-size", - "Size of the stack guard expressed as a power of two.", + "Size of the stack guard expressed as a power of two in bytes.", 12, 12, 30) DEFPARAM(PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL, "stack-clash-protection-probe-interval", - "Interval in which to probe the stack expressed as a power of two.", + "Interval in which to probe the stack expressed as a power of two in bytes.", 12, 10, 16) /* The GCSE optimization will be disabled if it would require
On Jul 25, 2018, Tamar Christina <Tamar.Christina@arm.com> wrote: > gcc/ > 2018-07-25 Tamar Christina <tamar.christina@arm.com> > PR target/86486 > * configure.ac: Add stack-clash-protection-guard-size. > * doc/install.texi: Document it. > * config.in (DEFAULT_STK_CLASH_GUARD_SIZE): New. > * params.def: Update comment for guard-size. > (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE, > PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL): Update description. > * configure: Regenerate. Thanks. No objections from me. I don't see any use of the new config knob, though; assuming it's in a subsequent patch, I guess this one is fine, but I'm not sure I'm entitled to approve it.
Hi Alexandre, > -----Original Message----- > From: gcc-patches-owner@gcc.gnu.org <gcc-patches-owner@gcc.gnu.org> > On Behalf Of Alexandre Oliva > Sent: Thursday, July 26, 2018 08:46 > To: Tamar Christina <Tamar.Christina@arm.com> > Cc: Joseph Myers <joseph@codesourcery.com>; Jeff Law > <law@redhat.com>; gcc-patches@gcc.gnu.org; nd <nd@arm.com>; > bonzini@gnu.org; dj@redhat.com; neroden@gcc.gnu.org; > Ralf.Wildenhues@gmx.de > Subject: Re: [PATCH][GCC][front-end][build-machinery][opt-framework] > Allow setting of stack-clash via configure options. [Patch (4/6)] > > On Jul 25, 2018, Tamar Christina <Tamar.Christina@arm.com> wrote: > > > gcc/ > > 2018-07-25 Tamar Christina <tamar.christina@arm.com> > > > PR target/86486 > > * configure.ac: Add stack-clash-protection-guard-size. > > * doc/install.texi: Document it. > > * config.in (DEFAULT_STK_CLASH_GUARD_SIZE): New. > > * params.def: Update comment for guard-size. > > (PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE, > > PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL): Update > description. > > * configure: Regenerate. > > Thanks. No objections from me. I don't see any use of the new config knob, > though; assuming it's in a subsequent patch, I guess this one is fine, but I'm > not sure I'm entitled to approve it. Yup it's in a subsequent AArch64 patch. That's no problem, Jeff still has to review the other front-end patch so I'll have to wait for approval there anyway. Thanks for the review and comments! Regards, Tamar > > -- > Alexandre Oliva, freedom fighter https://FSFLA.org/blogs/lxo > Be the change, be Free! FSF Latin America board member > GNU Toolchain Engineer Free Software Evangelist
On 07/24/2018 08:14 AM, Tamar Christina wrote: > Hi All, > > Here's an updated patch with documentation. > > > Ok for trunk? > > Thanks, > Tamar > > gcc/ > 2018-07-24 Tamar Christina <tamar.christina@arm.com> > > PR target/86486 > * configure.ac: Add stack-clash-protection-guard-size. > * doc/install.texi: Document it. > * config.in (DEFAULT_STK_CLASH_GUARD_SIZE): New. > * params.def: Update comment for guard-size. > * configure: Regenerate. > > The 07/24/2018 11:34, Joseph Myers wrote: >> On Tue, 24 Jul 2018, tamar.christina@arm.com wrote: >> >>> This patch defines a configure option to allow the setting of the default >>> guard size via configure flags when building the target. >> If you add a configure option, you must also add documentation for it in >> install.texi. >> >> -- >> Joseph S. Myers >> joseph@codesourcery.com > -- > > > rb9473-3.patch > OK. jeff
Hi All, I'm looking for permission to backport this patch to the GCC-8 branch to fix PR86486. OK for backport? Thanks, Tamar > -----Original Message----- > From: Jeff Law <law@redhat.com> > Sent: Friday, August 3, 2018 19:03 > To: Tamar Christina <Tamar.Christina@arm.com>; Joseph Myers > <joseph@codesourcery.com> > Cc: gcc-patches@gcc.gnu.org; nd <nd@arm.com>; bonzini@gnu.org; > dj@redhat.com; neroden@gcc.gnu.org; aoliva@redhat.com; > Ralf.Wildenhues@gmx.de > Subject: Re: [PATCH][GCC][front-end][build-machinery][opt-framework] > Allow setting of stack-clash via configure options. [Patch (4/6)] > > On 07/24/2018 08:14 AM, Tamar Christina wrote: > > Hi All, > > > > Here's an updated patch with documentation. > > > > > > Ok for trunk? > > > > Thanks, > > Tamar > > > > gcc/ > > 2018-07-24 Tamar Christina <tamar.christina@arm.com> > > > > PR target/86486 > > * configure.ac: Add stack-clash-protection-guard-size. > > * doc/install.texi: Document it. > > * config.in (DEFAULT_STK_CLASH_GUARD_SIZE): New. > > * params.def: Update comment for guard-size. > > * configure: Regenerate. > > > > The 07/24/2018 11:34, Joseph Myers wrote: > >> On Tue, 24 Jul 2018, tamar.christina@arm.com wrote: > >> > >>> This patch defines a configure option to allow the setting of the > >>> default guard size via configure flags when building the target. > >> If you add a configure option, you must also add documentation for it > >> in install.texi. > >> > >> -- > >> Joseph S. Myers > >> joseph@codesourcery.com > > -- > > > > > > rb9473-3.patch > > > > OK. > jeff
diff --git a/gcc/Makefile.in b/gcc/Makefile.in index d8f3e8861189604035b248b69bc484443f334c1c..f2fcab8e1c91bac4fac1b7162659165f74c6795b 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -3469,13 +3469,13 @@ installdirs: params.list: s-params.list; @true s-params.list: $(srcdir)/params-list.h $(srcdir)/params.def - $(CPP) $(srcdir)/params-list.h | sed 's/^#.*//;/^$$/d' > tmp-params.list + $(CPP) -I$(objdir) $(srcdir)/params-list.h | sed 's/^#.*//;/^$$/d' > tmp-params.list $(SHELL) $(srcdir)/../move-if-change tmp-params.list params.list $(STAMP) s-params.list params.options: s-params.options; @true s-params.options: $(srcdir)/params-options.h $(srcdir)/params.def - $(CPP) $(srcdir)/params-options.h | sed 's/^#.*//;/^$$/d' > tmp-params.options + $(CPP) -I$(objdir) $(srcdir)/params-options.h | sed 's/^#.*//;/^$$/d' > tmp-params.options $(SHELL) $(srcdir)/../move-if-change tmp-params.options params.options $(STAMP) s-params.options diff --git a/gcc/config.in b/gcc/config.in index 2856e72d627df537a301a6c7ab6b5bbb75f6b43f..bf593b5231adef0a6fc71b259597afa76e862607 100644 --- a/gcc/config.in +++ b/gcc/config.in @@ -55,6 +55,12 @@ #endif +/* Define to larger than zero set the default stack clash protector size. */ +#ifndef USED_FOR_TARGET +#undef DEFAULT_STK_CLASH_GUARD_SIZE +#endif + + /* Define if you want to use __cxa_atexit, rather than atexit, to register C++ destructors for local statics and global objects. This is essential for fully standards-compliant handling of destructors, but requires @@ -2148,6 +2154,24 @@ #endif +/* Set the stack clash guard size default value. */ +#ifndef USED_FOR_TARGET +#undef STK_CLASH_GUARD_SIZE_DEFAULT +#endif + + +/* Set the stack clash guard size maximum value. */ +#ifndef USED_FOR_TARGET +#undef STK_CLASH_GUARD_SIZE_MAX +#endif + + +/* Set the stack clash guard size minimum value. */ +#ifndef USED_FOR_TARGET +#undef STK_CLASH_GUARD_SIZE_MIN +#endif + + /* Define if you can safely include both <string.h> and <strings.h>. */ #ifndef USED_FOR_TARGET #undef STRING_WITH_STRINGS diff --git a/gcc/configure b/gcc/configure index 60d373982fd38fe51c285e2b02941754d1b833d6..35cf0c724b4f14152205153337379e0ae3a0d501 100755 --- a/gcc/configure +++ b/gcc/configure @@ -905,6 +905,7 @@ enable_valgrind_annotations with_stabs enable_multilib enable_multiarch +with_stack_clash_protection_guard_size enable___cxa_atexit enable_decimal_float enable_fixed_point @@ -1724,6 +1725,8 @@ Optional Packages: --with-gnu-as arrange to work with GNU as --with-as arrange to use the specified as (full pathname) --with-stabs arrange to use stabs instead of host debug format + --with-stack-clash-protection-guard-size=size + Set the default stack clash protection guard size. --with-dwarf2 force the default debug format to be DWARF 2 --with-specs=SPECS add SPECS to driver command-line processing --with-pkgversion=PKG Use PKG in the version string in place of "GCC" @@ -7436,6 +7439,51 @@ $as_echo "$enable_multiarch$ma_msg_suffix" >&6; } +# default stack clash protection guard size +# These are kept here and passed down to params.def. This way we don't have to +# worry about keeping them in sync. +stk_clash_min=12 +stk_clash_max=30 +stk_clash_default=12 + +# Keep the default value when the option is not used to 0, this allows us to +# distinguish between the cases where the user specifially set a value via +# configure and when the normal default value is used. + +# Check whether --with-stack-clash-protection-guard-size was given. +if test "${with_stack_clash_protection_guard_size+set}" = set; then : + withval=$with_stack_clash_protection_guard_size; DEFAULT_STK_CLASH_GUARD_SIZE="$with_stack_clash_protection_guard_size" +else + DEFAULT_STK_CLASH_GUARD_SIZE=0 +fi + +if test $DEFAULT_STK_CLASH_GUARD_SIZE -ne 0 \ + && (test $DEFAULT_STK_CLASH_GUARD_SIZE -lt $stk_clash_min \ + || test $DEFAULT_STK_CLASH_GUARD_SIZE -gt $stk_clash_max); then + as_fn_error "Invalid value $DEFAULT_STK_CLASH_GUARD_SIZE for --with-stack-clash-protection-guard-size. Must be between $stk_clash_min and $stk_clash_max." "$LINENO" 5 +fi + + +cat >>confdefs.h <<_ACEOF +#define DEFAULT_STK_CLASH_GUARD_SIZE $DEFAULT_STK_CLASH_GUARD_SIZE +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define STK_CLASH_GUARD_SIZE_MIN $stk_clash_min +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define STK_CLASH_GUARD_SIZE_MAX $stk_clash_max +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define STK_CLASH_GUARD_SIZE_DEFAULT $stk_clash_default +_ACEOF + + # Enable __cxa_atexit for C++. # Check whether --enable-__cxa_atexit was given. if test "${enable___cxa_atexit+set}" = set; then : @@ -18448,7 +18496,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18451 "configure" +#line 18499 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18554,7 +18602,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18557 "configure" +#line 18605 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/gcc/configure.ac b/gcc/configure.ac index 010ecd2ccf609ded1f4d2849a2acc13aba43b55b..77d30825df113fc1f18b86d6a5294c13be9aeb65 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -811,6 +811,36 @@ AC_MSG_RESULT($enable_multiarch$ma_msg_suffix) AC_SUBST(with_cpu) AC_SUBST(with_float) +# default stack clash protection guard size +# These are kept here and passed down to params.def. This way we don't have to +# worry about keeping them in sync. +stk_clash_min=12 +stk_clash_max=30 +stk_clash_default=12 + +# Keep the default value when the option is not used to 0, this allows us to +# distinguish between the cases where the user specifially set a value via +# configure and when the normal default value is used. +AC_ARG_WITH(stack-clash-protection-guard-size, +[AS_HELP_STRING([--with-stack-clash-protection-guard-size=size], [Set the default stack clash protection guard size.])], +[DEFAULT_STK_CLASH_GUARD_SIZE="$with_stack_clash_protection_guard_size"], [DEFAULT_STK_CLASH_GUARD_SIZE=0]) +if test $DEFAULT_STK_CLASH_GUARD_SIZE -ne 0 \ + && (test $DEFAULT_STK_CLASH_GUARD_SIZE -lt $stk_clash_min \ + || test $DEFAULT_STK_CLASH_GUARD_SIZE -gt $stk_clash_max); then + AC_MSG_ERROR(m4_normalize([ + Invalid value $DEFAULT_STK_CLASH_GUARD_SIZE for --with-stack-clash-protection-guard-size. \ + Must be between $stk_clash_min and $stk_clash_max.])) +fi + +AC_DEFINE_UNQUOTED(DEFAULT_STK_CLASH_GUARD_SIZE, $DEFAULT_STK_CLASH_GUARD_SIZE, + [Define to larger than zero set the default stack clash protector size.]) +AC_DEFINE_UNQUOTED(STK_CLASH_GUARD_SIZE_MIN, $stk_clash_min, + [Set the stack clash guard size minimum value.]) +AC_DEFINE_UNQUOTED(STK_CLASH_GUARD_SIZE_MAX, $stk_clash_max, + [Set the stack clash guard size maximum value.]) +AC_DEFINE_UNQUOTED(STK_CLASH_GUARD_SIZE_DEFAULT, $stk_clash_default, + [Set the stack clash guard size default value.]) + # Enable __cxa_atexit for C++. AC_ARG_ENABLE(__cxa_atexit, [AS_HELP_STRING([--enable-__cxa_atexit], [enable __cxa_atexit for C++])], diff --git a/gcc/params-list.h b/gcc/params-list.h index 4889c39a180abb3d0efaaf12e148deb1d011f65f..e58eb50cea356deb85e232da6e3200d6168ac686 100644 --- a/gcc/params-list.h +++ b/gcc/params-list.h @@ -17,6 +17,8 @@ You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ +#include "auto-host.h" + #define DEFPARAM(enumerator, option, nocmsgid, default, min, max) \ enumerator, #define DEFPARAMENUM5(enumerator, option, nocmsgid, default, \ diff --git a/gcc/params-options.h b/gcc/params-options.h index e9ac2e73522ddb6c199ed0af462ebc7e4777d676..ea678ed46ce5d21af0b9bc9e27f358406589a564 100644 --- a/gcc/params-options.h +++ b/gcc/params-options.h @@ -17,6 +17,8 @@ You should have received a copy of the GNU General Public License along with GCC; see the file COPYING3. If not see <http://www.gnu.org/licenses/>. */ +#include "auto-host.h" + #define DEFPARAM(enumerator, option, nocmsgid, default, min, max) \ option=default,min,max #define DEFPARAMENUM5(enumerator, option, nocmsgid, default, \ diff --git a/gcc/params.def b/gcc/params.def index a3906c268814bdc3a813416a60b9f666d1568f0a..d4e0461844dc958cebaefaa9004fd98c78c31419 100644 --- a/gcc/params.def +++ b/gcc/params.def @@ -213,10 +213,14 @@ DEFPARAM(PARAM_STACK_FRAME_GROWTH, "Maximal stack frame growth due to inlining (in percent).", 1000, 0, 0) +/* These values are stored in configure.ac, update them there to keep everything + in sync. */ DEFPARAM(PARAM_STACK_CLASH_PROTECTION_GUARD_SIZE, "stack-clash-protection-guard-size", "Size of the stack guard expressed as a power of two.", - 12, 12, 30) + DEFAULT_STK_CLASH_GUARD_SIZE ? DEFAULT_STK_CLASH_GUARD_SIZE : STK_CLASH_GUARD_SIZE_DEFAULT, + STK_CLASH_GUARD_SIZE_MIN, + STK_CLASH_GUARD_SIZE_MAX) DEFPARAM(PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL, "stack-clash-protection-probe-interval",