[PATCH] kernel: Set CONFIG_RCU_CPU_STALL_TIMEOUT=21

Hauke Mehrtens hauke at hauke-m.de
Sun Aug 29 12:35:08 PDT 2021 

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>
---
 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 319fb6abfd68..7fdcc075e621 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 8a4f8fb04cf2..fcb482aed7bb 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 02e8ce18d123..27d6fc5bf2ba 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 4e40b07b479d..ede4c5ce848b 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 0bcabd0582b2..79c6d6c6c267 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 b4460af17a19..77d1bbda4252 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 4aecf7dd43f3..191806585da9 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 383d57c4a1aa..ad4aca1b48b9 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 2db242e85805..ed2e318cd632 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 577174f6a54d..9214bf9feadb 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 1adf04067cb9..8c5c6c6e854e 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 bb76a609688f..b81f76cc25cc 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 c50474db4587..30dd24f5dbe4 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 544f6f1c85e7..3195bc53a523 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 329ecb2d78b3..8b03db180971 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 0ad606abefad..8bc3ab0bd7b0 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
-- 
2.30.2

More information about the openwrt-devel mailing list