APPLIED: [JAMMY][SRU][PATCH v2] UBUNTU: [Config] Harmonize RCU_CPU_STALL_TIMEOUT

[Stefan Bader]

On 16.11.22 17:52, Dimitri John Ledkov wrote:
> BugLink: https://bugs.launchpad.net/bugs/1991951
> 
> Harmonize our RCU_CPU_STALL_TIMEOUTS to be 60s on all architectures,
> v5.15 based kernels do not have separate config for expedited
> timeout. This change is already done in kinetic kernels.
> 
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
> Signed-off-by: Andrea Righi <andrea.righi at canonical.com>
> Signed-off-by: Dimitri John Ledkov <dimitri.ledkov at canonical.com>
> ---

Applied to jammy:linux/master-next. Thanks.

-Stefan

>   changes since v1: correct Subject
> 
>   debian.master/config/amd64/config.common.amd64     | 1 -
>   debian.master/config/annotations                   | 4 ++--
>   debian.master/config/arm64/config.common.arm64     | 1 -
>   debian.master/config/armhf/config.common.armhf     | 1 -
>   debian.master/config/config.common.ubuntu          | 1 +
>   debian.master/config/ppc64el/config.common.ppc64el | 1 -
>   debian.master/config/s390x/config.common.s390x     | 1 -
>   7 files changed, 3 insertions(+), 7 deletions(-)
> 
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index 2d6d851762..cdc38fb9c9 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -511,7 +511,6 @@ CONFIG_QNX6FS_FS=m
>   CONFIG_QRTR=m
>   CONFIG_RAPIDIO=y
>   CONFIG_RAVE_SP_CORE=m
> -CONFIG_RCU_CPU_STALL_TIMEOUT=60
>   CONFIG_RC_CORE=m
>   CONFIG_REED_SOLOMON=m
>   CONFIG_REGULATOR=y
> diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> index 49b70907bf..69eda79708 100644
> --- a/debian.master/config/annotations
> +++ b/debian.master/config/annotations
> @@ -11992,11 +11992,11 @@ CONFIG_DEBUG_KMEMLEAK                           policy<{'amd64': 'n', 'arm64': '
>   CONFIG_RCU_SCALE_TEST                           policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
>   CONFIG_RCU_TORTURE_TEST                         policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
>   CONFIG_RCU_REF_SCALE_TEST                       policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
> -CONFIG_RCU_CPU_STALL_TIMEOUT                    policy<{'amd64': '60', 'arm64': '60', 'armhf': '60', 'ppc64el': '21', 's390x': '21'}>
> +CONFIG_RCU_CPU_STALL_TIMEOUT                    policy<{'amd64': '60', 'arm64': '60', 'armhf': '60', 'ppc64el': '60', 's390x': '60'}>
>   CONFIG_RCU_TRACE                                policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
>   CONFIG_RCU_EQS_DEBUG                            policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'ppc64el': 'n', 's390x': 'n'}>
>   #
> -CONFIG_RCU_CPU_STALL_TIMEOUT                    flag<REVIEW>
> +CONFIG_RCU_CPU_STALL_TIMEOUT                    mark<ENFORCED> note<LP:1991951>
>   
>   # Menu: Kernel hacking >> Sample kernel code
>   CONFIG_SAMPLES                                  policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
> diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
> index 68483c043f..38d7c7974f 100644
> --- a/debian.master/config/arm64/config.common.arm64
> +++ b/debian.master/config/arm64/config.common.arm64
> @@ -532,7 +532,6 @@ CONFIG_QNX6FS_FS=m
>   CONFIG_QRTR=m
>   CONFIG_RAPIDIO=y
>   CONFIG_RAVE_SP_CORE=m
> -CONFIG_RCU_CPU_STALL_TIMEOUT=60
>   CONFIG_RC_CORE=m
>   CONFIG_REED_SOLOMON=m
>   CONFIG_REGULATOR=y
> diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
> index 4d7cb28487..8487f0af2d 100644
> --- a/debian.master/config/armhf/config.common.armhf
> +++ b/debian.master/config/armhf/config.common.armhf
> @@ -518,7 +518,6 @@ CONFIG_QNX6FS_FS=m
>   CONFIG_QRTR=m
>   CONFIG_RAPIDIO=y
>   CONFIG_RAVE_SP_CORE=m
> -CONFIG_RCU_CPU_STALL_TIMEOUT=60
>   CONFIG_RC_CORE=m
>   CONFIG_REED_SOLOMON=y
>   CONFIG_REGULATOR=y
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index 9c01413281..1eceb77212 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -8575,6 +8575,7 @@ CONFIG_RCAR_DMAC=m
>   CONFIG_RCAR_GEN3_THERMAL=m
>   CONFIG_RCAR_GYRO_ADC=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_NEED_SEGCBLIST=y
> diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
> index 0903629730..d39d33c602 100644
> --- a/debian.master/config/ppc64el/config.common.ppc64el
> +++ b/debian.master/config/ppc64el/config.common.ppc64el
> @@ -523,7 +523,6 @@ CONFIG_QNX6FS_FS=m
>   CONFIG_QRTR=m
>   CONFIG_RAPIDIO=y
>   CONFIG_RAVE_SP_CORE=m
> -CONFIG_RCU_CPU_STALL_TIMEOUT=21
>   CONFIG_RC_CORE=m
>   CONFIG_REED_SOLOMON=m
>   CONFIG_REGULATOR=y
> diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
> index 54ccf042ea..16b93389ff 100644
> --- a/debian.master/config/s390x/config.common.s390x
> +++ b/debian.master/config/s390x/config.common.s390x
> @@ -475,7 +475,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_RC_CORE is not set
>   # CONFIG_REGULATOR is not set
>   # CONFIG_REISERFS_FS is not set

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20221121/055d2c54/attachment.sig>