From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965306AbdKQPcr (ORCPT ); Fri, 17 Nov 2017 10:32:47 -0500 Received: from terminus.zytor.com ([65.50.211.136]:33667 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965139AbdKQPcl (ORCPT ); Fri, 17 Nov 2017 10:32:41 -0500 Date: Fri, 17 Nov 2017 07:27:52 -0800 From: tip-bot for Prarit Bhargava Message-ID: Cc: eranian@google.com, tglx@linutronix.de, vkuznets@redhat.com, ak@linux.intel.com, bp@suse.de, piotr.luc@intel.com, minipli@googlemail.com, borntraeger@de.ibm.com, dave.hansen@intel.com, arvind.yadav.cs@gmail.com, linux-kernel@vger.kernel.org, thomas.lendacky@amd.com, peterz@infradead.org, kirill.shutemov@linux.intel.com, luto@kernel.org, hpa@zytor.com, kan.liang@intel.com, prarit@redhat.com, mingo@kernel.org, he.chen@linux.intel.com, tim.c.chen@linux.intel.com Reply-To: kan.liang@intel.com, hpa@zytor.com, mingo@kernel.org, prarit@redhat.com, tim.c.chen@linux.intel.com, he.chen@linux.intel.com, dave.hansen@intel.com, piotr.luc@intel.com, minipli@googlemail.com, borntraeger@de.ibm.com, arvind.yadav.cs@gmail.com, peterz@infradead.org, thomas.lendacky@amd.com, linux-kernel@vger.kernel.org, kirill.shutemov@linux.intel.com, luto@kernel.org, ak@linux.intel.com, bp@suse.de, tglx@linutronix.de, eranian@google.com, vkuznets@redhat.com In-Reply-To: <20171114124257.22013-4-prarit@redhat.com> References: <20171114124257.22013-4-prarit@redhat.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/smpboot: Fix __max_logical_packages estimate Git-Commit-ID: b4c0a7326f5dc0ef7a64128b0ae7d081f4b2cbd1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b4c0a7326f5dc0ef7a64128b0ae7d081f4b2cbd1 Gitweb: https://git.kernel.org/tip/b4c0a7326f5dc0ef7a64128b0ae7d081f4b2cbd1 Author: Prarit Bhargava AuthorDate: Tue, 14 Nov 2017 07:42:57 -0500 Committer: Thomas Gleixner CommitDate: Fri, 17 Nov 2017 16:22:31 +0100 x86/smpboot: Fix __max_logical_packages estimate A system booted with a small number of cores enabled per package panics because the estimate of __max_logical_packages is too low. This occurs when the total number of active cores across all packages is less than the maximum core count for a single package. e.g.: On a 4 package system with 20 cores/package where only 4 cores are enabled on each package, the value of __max_logical_packages is calculated as DIV_ROUND_UP(16 / 20) = 1 and not 4. Calculate __max_logical_packages after the cpu enumeration has completed. Use the boot cpu's data to extrapolate the number of packages. Signed-off-by: Prarit Bhargava Signed-off-by: Thomas Gleixner Cc: Tom Lendacky Cc: Andi Kleen Cc: Christian Borntraeger Cc: Peter Zijlstra Cc: Kan Liang Cc: He Chen Cc: Stephane Eranian Cc: Dave Hansen Cc: Piotr Luc Cc: Andy Lutomirski Cc: Arvind Yadav Cc: Vitaly Kuznetsov Cc: Borislav Petkov Cc: Tim Chen Cc: Mathias Krause Cc: "Kirill A. Shutemov" Link: https://lkml.kernel.org/r/20171114124257.22013-4-prarit@redhat.com --- arch/x86/kernel/smpboot.c | 55 +++++++++-------------------------------------- 1 file changed, 10 insertions(+), 45 deletions(-) diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index da5e162..3d01df7 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -310,12 +310,6 @@ int topology_update_package_map(unsigned int pkg, unsigned int cpu) if (new >= 0) goto found; - if (logical_packages >= __max_logical_packages) { - pr_warn("Package %u of CPU %u exceeds BIOS package data %u.\n", - logical_packages, cpu, __max_logical_packages); - return -ENOSPC; - } - new = logical_packages++; if (new != pkg) { pr_info("CPU %u Converting physical %u to logical package %u\n", @@ -326,44 +320,6 @@ found: return 0; } -static void __init smp_init_package_map(struct cpuinfo_x86 *c, unsigned int cpu) -{ - unsigned int ncpus; - - /* - * Today neither Intel nor AMD support heterogenous systems. That - * might change in the future.... - * - * While ideally we'd want '* smp_num_siblings' in the below @ncpus - * computation, this won't actually work since some Intel BIOSes - * report inconsistent HT data when they disable HT. - * - * In particular, they reduce the APIC-IDs to only include the cores, - * but leave the CPUID topology to say there are (2) siblings. - * This means we don't know how many threads there will be until - * after the APIC enumeration. - * - * By not including this we'll sometimes over-estimate the number of - * logical packages by the amount of !present siblings, but this is - * still better than MAX_LOCAL_APIC. - * - * We use total_cpus not nr_cpu_ids because nr_cpu_ids can be limited - * on the command line leading to a similar issue as the HT disable - * problem because the hyperthreads are usually enumerated after the - * primary cores. - */ - ncpus = boot_cpu_data.x86_max_cores; - if (!ncpus) { - pr_warn("x86_max_cores == zero !?!?"); - ncpus = 1; - } - - __max_logical_packages = DIV_ROUND_UP(total_cpus, ncpus); - pr_info("Max logical packages: %u\n", __max_logical_packages); - - topology_update_package_map(c->phys_proc_id, cpu); -} - void __init smp_store_boot_cpu_info(void) { int id = 0; /* CPU 0 */ @@ -371,7 +327,7 @@ void __init smp_store_boot_cpu_info(void) *c = boot_cpu_data; c->cpu_index = id; - smp_init_package_map(c, id); + topology_update_package_map(c->phys_proc_id, id); c->initialized = true; } @@ -1341,7 +1297,16 @@ void __init native_smp_prepare_boot_cpu(void) void __init native_smp_cpus_done(unsigned int max_cpus) { + int ncpus; + pr_debug("Boot done\n"); + /* + * Today neither Intel nor AMD support heterogenous systems so + * extrapolate the boot cpu's data to all packages. + */ + ncpus = cpu_data(0).booted_cores * smp_num_siblings; + __max_logical_packages = DIV_ROUND_UP(nr_cpu_ids, ncpus); + pr_info("Max logical packages: %u\n", __max_logical_packages); if (x86_has_numa_in_package) set_sched_topology(x86_numa_in_package_topology);