From patchwork Thu Oct 6 15:33:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1687047 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=KsHQECvC; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MjwTJ1Gxnz1yqk for ; Fri, 7 Oct 2022 02:33:54 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ogSsW-0001qL-4p; Thu, 06 Oct 2022 15:33:40 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1ogSsQ-0001qE-Em for kernel-team@lists.ubuntu.com; Thu, 06 Oct 2022 15:33:34 +0000 Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 901293F838 for ; Thu, 6 Oct 2022 15:33:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1665070411; bh=GXn8wh/GbWETj+Zs1wepk5LdyjQ/zWcR7dFn+NLShds=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=KsHQECvC8vvaSX3M6DVJK0K2nZonbo9yeVoPEpCZab3E1ChelL1V066Ho4LZBPQCY O4WrA7wQVX80zgR9PaEcVidcGZY5dnWlbQmYlzhS+aeeR514E9WlOBRYbRRASSSLqJ ymqxlUebZVQj0hL/DVvGLY4U6GryQmmu4+MYCjPeWRHY9fX3IaaOW/uRRDhiCpv7Ok jLCngHXvNdx/tutElMpVwjQvkLhvRUvzEaaLXW2vhywkDwFdNT8O1VvNUVhmeNQqq3 ggOJ4BLtYbr/mk89LiZUHJWSgYkclzH59BXxuC4nDWWg+4HA9v03ATpHENseAnABF1 tHbhg4B8t8Njw== Received: by mail-pj1-f69.google.com with SMTP id pa16-20020a17090b265000b0020a71040b4cso1247853pjb.6 for ; Thu, 06 Oct 2022 08:33:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date; bh=GXn8wh/GbWETj+Zs1wepk5LdyjQ/zWcR7dFn+NLShds=; b=meKQXDwOzkYOXhD4PftSZIGiqt4HT7AxdDRe3TyMpHn3F1yIr2ootd8Sjxc0o8iWPj CkaRfmkhOZlB/LHzwWVQj4N8Wn3FyqLkXbnTH9gjHcVBv7laga2cUyf9GUE/v0d6a3g0 a6i8MO02Nt2zA0u884uqM5Zfkp3EEFSBtslp5Dgx4XlwVjayD7zRo0EUNUsTrFkZH+6d gdx4lCzZdYPfovaaoY06sDLqUgNktwb1l73L2TqLiN5RQdoBdCcmL7GCp4kRE8zoemvj GyUs+Lvc4NJbZ2vXBX0h2k+DWK4FZm8fwjw5y8YOORrbYNK4+YQ4OLuZj14pp4qBAoBw 3koA== X-Gm-Message-State: ACrzQf0/Yt6WyZM3pD4DjVYHh0ccP+6QjvCe9A4DWxbRSyG5OuyRxIDN 0catqgQKNB14dUGkh3je+Da5T25dF1b3siN54WYR3WhtfLLJYkkpujnukNpFbv73X+GL/LoLlHx gdIZeYRKlMyRQ8SnFSrYJ5V0WMl5XtlIi4NLBQfG46g== X-Received: by 2002:a17:90b:4b03:b0:202:a7e1:2c9a with SMTP id lx3-20020a17090b4b0300b00202a7e12c9amr253667pjb.195.1665070409422; Thu, 06 Oct 2022 08:33:29 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5yZS+rK1FqChTTYNyotYoWRUMHsKBJ9xzQQMDPmSe0wsgAgL5m5rsZXwVexqWsIA1tdeRbOw== X-Received: by 2002:a17:90b:4b03:b0:202:a7e1:2c9a with SMTP id lx3-20020a17090b4b0300b00202a7e12c9amr253629pjb.195.1665070408993; Thu, 06 Oct 2022 08:33:28 -0700 (PDT) Received: from localhost ([2001:67c:1562:8007::aac:415c]) by smtp.gmail.com with ESMTPSA id c12-20020a17090ae10c00b00200b12f2bf3sm2982538pjz.51.2022.10.06.08.33.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Oct 2022 08:33:28 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [KINETIC][UNSTABLE][PATCH] UBUNTU: [Config] Harmonize RCU_CPU_STALL_TIMEOUT Date: Thu, 6 Oct 2022 16:33:21 +0100 Message-Id: <20221006153321.797086-1-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/1991951 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 Acked-by: Tim Gardner --- 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