s390/smp: fix physical to logical CPU map for SMT

[ Upstream commit 72a81ad9d6d62dcb79f7e8ad66ffd1c768b72026 ]

If an SMT capable system is not IPL'ed from the first CPU the setup of
the physical to logical CPU mapping is broken: the IPL core gets CPU
number 0, but then the next core gets CPU number 1. Correct would be
that all SMT threads of CPU 0 get the subsequent logical CPU numbers.

This is important since a lot of code (like e.g. the CPU topology
code) assumes that CPU maps are setup like this. If the mapping is
broken the system will not IPL due to broken topology masks:

[    1.716341] BUG: arch topology broken
[    1.716342]      the SMT domain not a subset of the MC domain
[    1.716343] BUG: arch topology broken
[    1.716344]      the MC domain not a subset of the BOOK domain

This scenario can usually not happen since LPARs are always IPL'ed
from CPU 0 and also re-IPL is intiated from CPU 0. However older
kernels did initiate re-IPL on an arbitrary CPU. If therefore a re-IPL
from an old kernel into a new kernel is initiated this may lead to
crash.

Fix this by setting up the physical to logical CPU mapping correctly.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 27258db640d7371ecb5882f9de6669ab69d99a0a..b649a6538350da6f034200b137ba8138e6cb348c 100644 (file)
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -725,39 +725,67 @@ static void __ref smp_get_core_info(struct sclp_core_info *info, int early)
 
 static int smp_add_present_cpu(int cpu);
 
-static int __smp_rescan_cpus(struct sclp_core_info *info, int sysfs_add)
+static int smp_add_core(struct sclp_core_entry *core, cpumask_t *avail,
+                       bool configured, bool early)
 {
        struct pcpu *pcpu;
-       cpumask_t avail;
-       int cpu, nr, i, j;
+       int cpu, nr, i;
        u16 address;
 
        nr = 0;
-       cpumask_xor(&avail, cpu_possible_mask, cpu_present_mask);
-       cpu = cpumask_first(&avail);
-       for (i = 0; (i < info->combined) && (cpu < nr_cpu_ids); i++) {
-               if (sclp.has_core_type && info->core[i].type != boot_core_type)
+       if (sclp.has_core_type && core->type != boot_core_type)
+               return nr;
+       cpu = cpumask_first(avail);
+       address = core->core_id << smp_cpu_mt_shift;
+       for (i = 0; (i <= smp_cpu_mtid) && (cpu < nr_cpu_ids); i++) {
+               if (pcpu_find_address(cpu_present_mask, address + i))
                        continue;
-               address = info->core[i].core_id << smp_cpu_mt_shift;
-               for (j = 0; j <= smp_cpu_mtid; j++) {
-                       if (pcpu_find_address(cpu_present_mask, address + j))
-                               continue;
-                       pcpu = pcpu_devices + cpu;
-                       pcpu->address = address + j;
-                       pcpu->state =
-                               (cpu >= info->configured*(smp_cpu_mtid + 1)) ?
-                               CPU_STATE_STANDBY : CPU_STATE_CONFIGURED;
-                       smp_cpu_set_polarization(cpu, POLARIZATION_UNKNOWN);
-                       set_cpu_present(cpu, true);
-                       if (sysfs_add && smp_add_present_cpu(cpu) != 0)
-                               set_cpu_present(cpu, false);
-                       else
-                               nr++;
-                       cpu = cpumask_next(cpu, &avail);
-                       if (cpu >= nr_cpu_ids)
+               pcpu = pcpu_devices + cpu;
+               pcpu->address = address + i;
+               if (configured)
+                       pcpu->state = CPU_STATE_CONFIGURED;
+               else
+                       pcpu->state = CPU_STATE_STANDBY;
+               smp_cpu_set_polarization(cpu, POLARIZATION_UNKNOWN);
+               set_cpu_present(cpu, true);
+               if (!early && smp_add_present_cpu(cpu) != 0)
+                       set_cpu_present(cpu, false);
+               else
+                       nr++;
+               cpumask_clear_cpu(cpu, avail);
+               cpu = cpumask_next(cpu, avail);
+       }
+       return nr;
+}
+
+static int __smp_rescan_cpus(struct sclp_core_info *info, bool early)
+{
+       struct sclp_core_entry *core;
+       cpumask_t avail;
+       bool configured;
+       u16 core_id;
+       int nr, i;
+
+       nr = 0;
+       cpumask_xor(&avail, cpu_possible_mask, cpu_present_mask);
+       /*
+        * Add IPL core first (which got logical CPU number 0) to make sure
+        * that all SMT threads get subsequent logical CPU numbers.
+        */
+       if (early) {
+               core_id = pcpu_devices[0].address >> smp_cpu_mt_shift;
+               for (i = 0; i < info->configured; i++) {
+                       core = &info->core[i];
+                       if (core->core_id == core_id) {
+                               nr += smp_add_core(core, &avail, true, early);
                                break;
+                       }
                }
        }
+       for (i = 0; i < info->combined; i++) {
+               configured = i < info->configured;
+               nr += smp_add_core(&info->core[i], &avail, configured, early);
+       }
        return nr;
 }
 
@@ -803,7 +831,7 @@ void __init smp_detect_cpus(void)
 
        /* Add CPUs present at boot */
        get_online_cpus();
-       __smp_rescan_cpus(info, 0);
+       __smp_rescan_cpus(info, true);
        put_online_cpus();
        memblock_free_early((unsigned long)info, sizeof(*info));
 }
@@ -1156,7 +1184,7 @@ int __ref smp_rescan_cpus(void)
        smp_get_core_info(info, 0);
        get_online_cpus();
        mutex_lock(&smp_cpu_state_mutex);
-       nr = __smp_rescan_cpus(info, 1);
+       nr = __smp_rescan_cpus(info, false);
        mutex_unlock(&smp_cpu_state_mutex);
        put_online_cpus();
        kfree(info);