<div dir="ltr"><div>Checked the documentation and values are correct.</div> <div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Oct 6, 2022 at 10:34 AM Dimitri John Ledkov <<a href="mailto:dimitri.ledkov@canonical.com">dimitri.ledkov@canonical.com</a>> wrote: </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">BugLink: <a href="https://bugs.launchpad.net/bugs/1991951" rel="noreferrer" target="_blank">https://bugs.launchpad.net/bugs/1991951</a> Harmonize our RCU and RCU_EXP CPU_STALL_TIMEOUTS to be 60s on all architectures, and the upstream default/maximum 21,000ms for the EXPEDITED one. Signed-off-by: Dimitri John Ledkov <<a href="mailto:dimitri.ledkov@canonical.com" target="_blank">dimitri.ledkov@canonical.com</a>> --- debian.master/config/amd64/config.common.amd64 | 2 -- debian.master/config/annotations | 3 ++- debian.master/config/arm64/config.common.arm64 | 2 -- debian.master/config/armhf/config.common.armhf | 2 -- debian.master/config/config.common.ubuntu | 2 ++ debian.master/config/ppc64el/config.common.ppc64el | 2 -- debian.master/config/riscv64/config.common.riscv64 | 2 -- debian.master/config/s390x/config.common.s390x | 2 -- 8 files changed, 4 insertions(+), 13 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index d4b95ea5d8..a21f3c6831 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -515,8 +515,6 @@ CONFIG_QNX6FS_FS=m CONFIG_QRTR=m CONFIG_RAPIDIO=y CONFIG_RAVE_SP_CORE=m -CONFIG_RCU_CPU_STALL_TIMEOUT=60 -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 CONFIG_RC_CORE=m CONFIG_REED_SOLOMON=m CONFIG_REGMAP_I2C=y diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 0ce3ab0250..238dc03517 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -11850,7 +11850,8 @@ CONFIG_DEBUG_KMEMLEAK policy<{'amd64': 'n', 'arm64': ' CONFIG_RCU_SCALE_TEST policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_RCU_TORTURE_TEST policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_RCU_REF_SCALE_TEST policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> -CONFIG_RCU_CPU_STALL_TIMEOUT policy<{'amd64': '60', 'arm64': '60', 'armhf': '60', 'ppc64el': '21', 'riscv64': '60', 's390x': '21'}> +CONFIG_RCU_CPU_STALL_TIMEOUT policy<{'amd64': '60', 'arm64': '60', 'armhf': '60', 'ppc64el': '60', 'riscv64': '60', 's390x': '60'}> +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT policy<{'amd64': '0', 'arm64': '0', 'armhf': '0', 'ppc64el': '0', 'riscv64': '0', 's390x': '0'}> CONFIG_RCU_TRACE policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> CONFIG_RCU_EQS_DEBUG policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 'riscv64': 'n', 's390x': 'n'}> # diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 83d1069657..4e0922d5e3 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -535,8 +535,6 @@ CONFIG_QNX6FS_FS=m CONFIG_QRTR=m CONFIG_RAPIDIO=y CONFIG_RAVE_SP_CORE=m -CONFIG_RCU_CPU_STALL_TIMEOUT=60 -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 CONFIG_RC_CORE=m CONFIG_REED_SOLOMON=m CONFIG_REGMAP_I2C=y diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf index 99c558ac5a..8354f3cdb0 100644 --- a/debian.master/config/armhf/config.common.armhf +++ b/debian.master/config/armhf/config.common.armhf @@ -520,8 +520,6 @@ CONFIG_QNX6FS_FS=m CONFIG_QRTR=m CONFIG_RAPIDIO=y CONFIG_RAVE_SP_CORE=m -CONFIG_RCU_CPU_STALL_TIMEOUT=60 -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 CONFIG_RC_CORE=m CONFIG_REED_SOLOMON=y CONFIG_REGMAP_I2C=y diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index d26c7df9e7..d45b478131 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -8879,8 +8879,10 @@ CONFIG_RCAR_GEN3_THERMAL=m CONFIG_RCAR_GYRO_ADC=m CONFIG_RCAR_REMOTEPROC=m CONFIG_RCAR_THERMAL=m +CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_EQS_DEBUG is not set # CONFIG_RCU_EXPERT is not set +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 CONFIG_RCU_NEED_SEGCBLIST=y # CONFIG_RCU_REF_SCALE_TEST is not set # CONFIG_RCU_SCALE_TEST is not set diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el index eac947605d..482420cf55 100644 --- a/debian.master/config/ppc64el/config.common.ppc64el +++ b/debian.master/config/ppc64el/config.common.ppc64el @@ -522,8 +522,6 @@ CONFIG_QNX6FS_FS=m CONFIG_QRTR=m CONFIG_RAPIDIO=y CONFIG_RAVE_SP_CORE=m -CONFIG_RCU_CPU_STALL_TIMEOUT=21 -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 CONFIG_RC_CORE=m CONFIG_REED_SOLOMON=m CONFIG_REGMAP_I2C=y diff --git a/debian.master/config/riscv64/config.common.riscv64 b/debian.master/config/riscv64/config.common.riscv64 index ac54b870dd..6bdbed0465 100644 --- a/debian.master/config/riscv64/config.common.riscv64 +++ b/debian.master/config/riscv64/config.common.riscv64 @@ -512,8 +512,6 @@ CONFIG_QNX6FS_FS=m CONFIG_QRTR=m CONFIG_RAPIDIO=y CONFIG_RAVE_SP_CORE=m -CONFIG_RCU_CPU_STALL_TIMEOUT=60 -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=20 CONFIG_RC_CORE=m CONFIG_REED_SOLOMON=m CONFIG_REGMAP_I2C=y diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index 2e40e3d523..97237c526f 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -472,8 +472,6 @@ CONFIG_PTP_1588_CLOCK_OPTIONAL=m # CONFIG_QRTR is not set # CONFIG_RAPIDIO is not set # CONFIG_RAVE_SP_CORE is not set -CONFIG_RCU_CPU_STALL_TIMEOUT=21 -CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 # CONFIG_RC_CORE is not set CONFIG_REGMAP_I2C=m # CONFIG_REGULATOR is not set -- 2.34.1 -- kernel-team mailing list <a href="mailto:kernel-team@lists.ubuntu.com" target="_blank">kernel-team@lists.ubuntu.com</a> <a href="https://lists.ubuntu.com/mailman/listinfo/kernel-team" rel="noreferrer" target="_blank">https://lists.ubuntu.com/mailman/listinfo/kernel-team</a> </blockquote></div></div>