[openwrt/openwrt] kernel: Set CONFIG_RCU_CPU_STALL_TIMEOUT=21

LEDE Commits lede-commits at lists.infradead.org
Thu Sep 9 11:25:05 PDT 2021 

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/b9cc16a5e8c8b788f4468f875e0a5eff2ba887cb

commit b9cc16a5e8c8b788f4468f875e0a5eff2ba887cb
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Sun Aug 29 17:52:28 2021 +0200

    kernel: Set CONFIG_RCU_CPU_STALL_TIMEOUT=21
    
    The default value for CONFIG_RCU_CPU_STALL_TIMEOUT was changed from 60
    seconds to 21 seconds in 2012 in the upstream kernel. Some targets
    already use 21 seconds.
    
    This patch changes the default value in the generic configuration to 21
    seconds and removes the target specific configuration options.
    
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
    Acked-by: Rui Salvaterra <rsalvaterra at gmail.com>
---
 target/linux/gemini/config-5.10              | 1 -
 target/linux/gemini/config-5.4               | 1 -
 target/linux/generic/config-5.10             | 2 +-
 target/linux/generic/config-5.4              | 2 +-
 target/linux/ipq40xx/config-5.4              | 1 -
 target/linux/ipq806x/config-5.10             | 1 -
 target/linux/ipq806x/config-5.4              | 1 -
 target/linux/ipq807x/config-default          | 1 -
 target/linux/layerscape/armv7/config-5.4     | 1 -
 target/linux/layerscape/armv8_64b/config-5.4 | 1 -
 target/linux/mediatek/mt7623/config-5.10     | 1 -
 target/linux/oxnas/ox820/config-default      | 1 -
 target/linux/rockchip/armv8/config-5.10      | 1 -
 target/linux/rockchip/armv8/config-5.4       | 1 -
 target/linux/tegra/config-5.10               | 1 -
 target/linux/tegra/config-5.4                | 1 -
 16 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/target/linux/gemini/config-5.10 b/target/linux/gemini/config-5.10
index 319fb6abfd..7fdcc075e6 100644
--- a/target/linux/gemini/config-5.10
+++ b/target/linux/gemini/config-5.10
@@ -332,7 +332,6 @@ CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPT_RCU=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
diff --git a/target/linux/gemini/config-5.4 b/target/linux/gemini/config-5.4
index 8a4f8fb04c..fcb482aed7 100644
--- a/target/linux/gemini/config-5.4
+++ b/target/linux/gemini/config-5.4
@@ -368,7 +368,6 @@ CONFIG_PREEMPT_COUNT=y
 CONFIG_PREEMPT_RCU=y
 CONFIG_PROC_PAGE_MONITOR=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RD_LZ4=y
diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index 2aef5728c2..a9160ee9b1 100644
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -4628,7 +4628,7 @@ CONFIG_PWRSEQ_SIMPLE=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_RCU_BOOST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_EQS_DEBUG is not set
 # CONFIG_RCU_EXPEDITE_BOOT is not set
 # CONFIG_RCU_EXPERT is not set
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 7819d35fc9..a568a9ea7f 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -4259,7 +4259,7 @@ CONFIG_PWRSEQ_SIMPLE=y
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_RBTREE_TEST is not set
 # CONFIG_RCU_BOOST is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=60
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
 # CONFIG_RCU_EQS_DEBUG is not set
 # CONFIG_RCU_EXPEDITE_BOOT is not set
 # CONFIG_RCU_EXPERT is not set
diff --git a/target/linux/ipq40xx/config-5.4 b/target/linux/ipq40xx/config-5.4
index 0bcabd0582..79c6d6c6c2 100644
--- a/target/linux/ipq40xx/config-5.4
+++ b/target/linux/ipq40xx/config-5.4
@@ -378,7 +378,6 @@ CONFIG_QCOM_WDT=y
 # CONFIG_QRTR is not set
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
diff --git a/target/linux/ipq806x/config-5.10 b/target/linux/ipq806x/config-5.10
index b4460af17a..77d1bbda42 100644
--- a/target/linux/ipq806x/config-5.10
+++ b/target/linux/ipq806x/config-5.10
@@ -404,7 +404,6 @@ CONFIG_QCOM_WDT=y
 # CONFIG_QCS_TURING_404 is not set
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGULATOR=y
diff --git a/target/linux/ipq806x/config-5.4 b/target/linux/ipq806x/config-5.4
index 4aecf7dd43..191806585d 100644
--- a/target/linux/ipq806x/config-5.4
+++ b/target/linux/ipq806x/config-5.4
@@ -370,7 +370,6 @@ CONFIG_QCOM_WDT=y
 # CONFIG_QRTR is not set
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
diff --git a/target/linux/ipq807x/config-default b/target/linux/ipq807x/config-default
index 383d57c4a1..ad4aca1b48 100644
--- a/target/linux/ipq807x/config-default
+++ b/target/linux/ipq807x/config-default
@@ -530,7 +530,6 @@ CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
 # CONFIG_RANDOMIZE_BASE is not set
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RD_GZIP=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y
diff --git a/target/linux/layerscape/armv7/config-5.4 b/target/linux/layerscape/armv7/config-5.4
index 2db242e858..ed2e318cd6 100644
--- a/target/linux/layerscape/armv7/config-5.4
+++ b/target/linux/layerscape/armv7/config-5.4
@@ -504,7 +504,6 @@ CONFIG_QORIQ_CPUFREQ=y
 # CONFIG_QUICC_ENGINE is not set
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RD_LZMA=y
diff --git a/target/linux/layerscape/armv8_64b/config-5.4 b/target/linux/layerscape/armv8_64b/config-5.4
index 577174f6a5..9214bf9fea 100644
--- a/target/linux/layerscape/armv8_64b/config-5.4
+++ b/target/linux/layerscape/armv8_64b/config-5.4
@@ -670,7 +670,6 @@ CONFIG_QUOTACTL=y
 CONFIG_RAID6_PQ=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RD_LZMA=y
diff --git a/target/linux/mediatek/mt7623/config-5.10 b/target/linux/mediatek/mt7623/config-5.10
index 1adf04067c..8c5c6c6e85 100644
--- a/target/linux/mediatek/mt7623/config-5.10
+++ b/target/linux/mediatek/mt7623/config-5.10
@@ -508,7 +508,6 @@ CONFIG_PWM_MEDIATEK=y
 CONFIG_PWM_SYSFS=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REGMAP=y
 CONFIG_REGMAP_MMIO=y
 CONFIG_REGULATOR=y
diff --git a/target/linux/oxnas/ox820/config-default b/target/linux/oxnas/ox820/config-default
index bb76a60968..b81f76cc25 100644
--- a/target/linux/oxnas/ox820/config-default
+++ b/target/linux/oxnas/ox820/config-default
@@ -78,7 +78,6 @@ CONFIG_PCI_MSI_IRQ_DOMAIN=y
 # CONFIG_PL310_ERRATA_753970 is not set
 # CONFIG_PL310_ERRATA_769419 is not set
 CONFIG_PM_SLEEP_SMP=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RFS_ACCEL=y
 CONFIG_RPS=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
diff --git a/target/linux/rockchip/armv8/config-5.10 b/target/linux/rockchip/armv8/config-5.10
index c50474db45..30dd24f5db 100644
--- a/target/linux/rockchip/armv8/config-5.10
+++ b/target/linux/rockchip/armv8/config-5.10
@@ -482,7 +482,6 @@ CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
 # CONFIG_RAVE_SP_CORE is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RCU_TRACE=y
 CONFIG_REALTEK_PHY=y
 CONFIG_REGMAP=y
diff --git a/target/linux/rockchip/armv8/config-5.4 b/target/linux/rockchip/armv8/config-5.4
index 544f6f1c85..3195bc53a5 100644
--- a/target/linux/rockchip/armv8/config-5.4
+++ b/target/linux/rockchip/armv8/config-5.4
@@ -462,7 +462,6 @@ CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
 # CONFIG_RAVE_SP_CORE is not set
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_RCU_TRACE=y
 CONFIG_REALTEK_PHY=y
 CONFIG_REFCOUNT_FULL=y
diff --git a/target/linux/tegra/config-5.10 b/target/linux/tegra/config-5.10
index 329ecb2d78..8b03db1809 100644
--- a/target/linux/tegra/config-5.10
+++ b/target/linux/tegra/config-5.10
@@ -349,7 +349,6 @@ CONFIG_PWM_SYSFS=y
 CONFIG_PWM_TEGRA=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
 CONFIG_REGMAP_MMIO=y
diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4
index 0ad606abef..8bc3ab0bd7 100644
--- a/target/linux/tegra/config-5.4
+++ b/target/linux/tegra/config-5.4
@@ -342,7 +342,6 @@ CONFIG_PWM_SYSFS=y
 CONFIG_PWM_TEGRA=y
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
-CONFIG_RCU_CPU_STALL_TIMEOUT=21
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y

More information about the lede-commits mailing list