From patchwork Mon Feb 24 06:47:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Heimes X-Patchwork-Id: 1242826 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) 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: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Qt1l6PSHz9sRf; Mon, 24 Feb 2020 17:48:27 +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 1j67XU-0006Sh-EY; Mon, 24 Feb 2020 06:48:24 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j67XS-0006Sa-OK for kernel-team@lists.ubuntu.com; Mon, 24 Feb 2020 06:48:22 +0000 Received: from 2.general.fheimes.uk.vpn ([10.172.194.67] helo=T570.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1j67XS-0007Id-Ey for kernel-team@lists.ubuntu.com; Mon, 24 Feb 2020 06:48:22 +0000 From: frank.heimes@canonical.com To: kernel-team@lists.ubuntu.com Subject: [F][PATCH 1/1] Ubuntu: [Config] Update kernel options CONFIG_NR_CPUS and CONFIG_NUMA_EMU Date: Mon, 24 Feb 2020 07:47:21 +0100 Message-Id: <20200224064721.126455-2-frank.heimes@canonical.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200224064721.126455-1-frank.heimes@canonical.com> References: <20200224064721.126455-1-frank.heimes@canonical.com> 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" From: Frank Heimes BugLink: https://bugs.launchpad.net/bugs/1864198 Starting with focal Ubuntu for s390x gets compiled for z13. This allows an increase (actually doubling) of the CONFIG_NR_CPUS option value - and with that CONFIG_NUMA_EMU should be unset. These config changes are now the default for focal and higher on s390x. Signed-off-by: Frank Heimes --- debian.master/config/annotations | 6 ++++-- debian.master/config/s390x/config.common.s390x | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 94ff2d758d49..474e10e7fbb3 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -12325,7 +12325,8 @@ CONFIG_PM_DEBUG flag # Menu: Processor support CONFIG_SMP policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'ppc64el': 'y', 's390x': 'y'}> -CONFIG_NR_CPUS policy<{'amd64': '8192', 'arm64': '256', 'armhf': '4', 'i386': '8', 'ppc64el': '2048', 's390x': '256'}> +CONFIG_NR_CPUS policy<{'amd64': '8192', 'arm64': '256', 'armhf': '4', 'i386': '8', 'ppc64el': '2048', 's390x': '512'}> +CONFIG_NR_CPUS note # Menu: Processor support >> Architecture: powerpc CONFIG_ALTIVEC policy<{'ppc64el': 'y'}> @@ -12678,9 +12679,10 @@ CONFIG_MARCH_Z14 policy<{'s390x': 'n'}> CONFIG_MARCH_Z15 policy<{'s390x': 'n'}> # Menu: Processor type and features >> Select NUMA modes -CONFIG_NUMA_EMU policy<{'amd64': 'n', 's390x': 'y'}> +CONFIG_NUMA_EMU policy<{'amd64': 'n', 's390x': 'n'}> # CONFIG_NUMA_EMU note mark +CONFIG_NUMA_EMU note # Menu: Processor type and features >> Select NUMA modes >> Architecture: s390 diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x index d43713b2f319..459d0cf33287 100644 --- a/debian.master/config/s390x/config.common.s390x +++ b/debian.master/config/s390x/config.common.s390x @@ -384,11 +384,11 @@ CONFIG_MFD_CORE=m # CONFIG_NFP is not set CONFIG_NODES_SHIFT=4 # CONFIG_NOZOMI is not set -CONFIG_NR_CPUS=256 +CONFIG_NR_CPUS=512 # CONFIG_NTB is not set CONFIG_NTFS_RW=y # CONFIG_NUMA_BALANCING_DEFAULT_ENABLED is not set -CONFIG_NUMA_EMU=y +# CONFIG_NUMA_EMU is not set # CONFIG_NVMEM is not set # CONFIG_N_GSM is not set # CONFIG_OF is not set