Commit 56402d63 authored by Thomas Gleixner's avatar Thomas Gleixner

x86/topology: Handle CPUID bogosity gracefully

Joseph reported that a XEN guest dies with a division by 0 in the package
topology setup code. This happens if cpu_info.x86_max_cores is zero.

Handle that case and emit a warning. This does not fix the underlying XEN bug,
but makes the code more robust.
Reported-and-tested-by: default avatarJoseph Salisbury <joseph.salisbury@canonical.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: David Vrabel <david.vrabel@citrix.com>
Link: http://lkml.kernel.org/r/alpine.DEB.2.11.1605062046270.3540@nanosSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 07837831
...@@ -332,6 +332,11 @@ static void __init smp_init_package_map(void) ...@@ -332,6 +332,11 @@ static void __init smp_init_package_map(void)
* primary cores. * primary cores.
*/ */
ncpus = boot_cpu_data.x86_max_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); __max_logical_packages = DIV_ROUND_UP(total_cpus, ncpus);
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment