[openwrt/openwrt] kernel: Set CONFIG_FRAME_WARN depending on target

LEDE Commits lede-commits at lists.infradead.org
Fri Jun 2 12:19:21 PDT 2023


hauke pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/f949dd5c906fc36d74d86d39fb9c4d514eea57d6

commit f949dd5c906fc36d74d86d39fb9c4d514eea57d6
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Tue May 30 20:21:43 2023 +0200

    kernel: Set CONFIG_FRAME_WARN depending on target
    
    This set the CONFIG_FRAME_WARN option depending on some target settings.
    It will use the default from the upstream kernel and not the hard coded
    value of 1024 now.
    
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
    (cherry picked from commit 16a20512d852f6ecebf8c57cd7fa2572a06a9d0b)
---
 config/Config-kernel.in                       | 11 +++++++++++
 target/linux/generic/config-5.15              |  1 -
 target/linux/layerscape/armv8_64b/config-5.15 |  1 -
 target/linux/octeon/config-5.15               |  1 -
 target/linux/rockchip/armv8/config-5.15       |  1 -
 target/linux/sunxi/config-5.15                |  1 -
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 3a2189d63a..32524f5aed 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -387,6 +387,17 @@ config KERNEL_DEBUG_INFO_REDUCED
 	  DEBUG_INFO build and compile times are reduced too.
 	  Only works with newer gcc versions.
 
+config KERNEL_FRAME_WARN
+	int
+	range 0 8192
+	default 1280 if KERNEL_KASAN && !ARCH_64BIT
+	default 1024 if !ARCH_64BIT
+	default 2048 if ARCH_64BIT
+	help
+	  Tell the compiler to warn at build time for stack frames larger than this.
+	  Setting this too low will cause a lot of warnings.
+	  Setting it to 0 disables the warning.
+
 # KERNEL_DEBUG_LL symbols must have the default value set as otherwise
 # KConfig wont evaluate them unless KERNEL_EARLY_PRINTK is selected
 # which means that buildroot wont override the DEBUG_LL symbols in target
diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index 6ac2993c15..4635a423ff 100644
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -2077,7 +2077,6 @@ CONFIG_FORTIFY_SOURCE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
 # CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION is not set
 # CONFIG_FRAME_POINTER is not set
-CONFIG_FRAME_WARN=1024
 # CONFIG_FREEZER is not set
 # CONFIG_FRONTSWAP is not set
 # CONFIG_FSCACHE is not set
diff --git a/target/linux/layerscape/armv8_64b/config-5.15 b/target/linux/layerscape/armv8_64b/config-5.15
index b4510b7d34..69edc7a3f0 100644
--- a/target/linux/layerscape/armv8_64b/config-5.15
+++ b/target/linux/layerscape/armv8_64b/config-5.15
@@ -269,7 +269,6 @@ CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 CONFIG_FRAME_POINTER=y
-CONFIG_FRAME_WARN=2048
 CONFIG_FREEZER=y
 # CONFIG_FSL_BMAN_TEST is not set
 CONFIG_FSL_DPAA=y
diff --git a/target/linux/octeon/config-5.15 b/target/linux/octeon/config-5.15
index 450b84be44..5882c7dd75 100644
--- a/target/linux/octeon/config-5.15
+++ b/target/linux/octeon/config-5.15
@@ -70,7 +70,6 @@ CONFIG_EXT4_FS=y
 CONFIG_F2FS_FS=y
 CONFIG_FAT_FS=y
 CONFIG_FIXED_PHY=y
-CONFIG_FRAME_WARN=2048
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
 CONFIG_FWNODE_MDIO=y
diff --git a/target/linux/rockchip/armv8/config-5.15 b/target/linux/rockchip/armv8/config-5.15
index 0ed009004f..08ce65d8ea 100644
--- a/target/linux/rockchip/armv8/config-5.15
+++ b/target/linux/rockchip/armv8/config-5.15
@@ -201,7 +201,6 @@ CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 # CONFIG_FORTIFY_SOURCE is not set
 CONFIG_FRAME_POINTER=y
-CONFIG_FRAME_WARN=2048
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y
 CONFIG_FS_POSIX_ACL=y
diff --git a/target/linux/sunxi/config-5.15 b/target/linux/sunxi/config-5.15
index 9771ee8b4c..c33bb7ab6f 100644
--- a/target/linux/sunxi/config-5.15
+++ b/target/linux/sunxi/config-5.15
@@ -161,7 +161,6 @@ CONFIG_FONT_SUPPORT=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
 CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FRAME_WARN=2048
 CONFIG_FREEZER=y
 CONFIG_FS_IOMAP=y
 CONFIG_FS_MBCACHE=y




More information about the lede-commits mailing list