i386 boottime for_each_cpu broken
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 20 lines · Linux Kernel Mailing List
tree
090c471fdb44d8fe88c52e95be0e8e43e31fcd5a
parentd7271b14b2e9e5905aba0fbf5c4dc4f8980c0cb2
author Zwane Mwaikambo <[email protected]> Sun, 04 Sep 2005 05:56:51 -0700 committer Linus Torvalds <[email protected]> Mon, 05 Sep 2005 14:06:13 -0700[PATCH] i386 boottime
for_each_cpubroken
for_each_cpuwalks through all processors incpu_possible_map, which is defined ascpu_callout_mapon i386 and isn't initialised until all processors have been booted. This breaks things which dofor_each_cpuiterations early during boot. So, definecpu_possible_mapas a bitmap withNR_CPUSbits populated. This was triggered by a patch i'm working on which doesalloc_percpubefore bringing up secondary processors.From: Alexander Nyberg <[email protected]>
i386-boottime-for_each_cpu-broken.patch
i386-boottime-for_each_cpu-broken-fix.patch
Quoted 7 lines
The SMP version of
__alloc_percpuchecks thecpu_possible_mapbefore allocating memory for a certain cpu. With the above patches the BSP cpuid is never set incpu_possible_mapwhich breaksCONFIG_SMPon uniprocessor machines (as soon as someone tries to dereference something allocated via__alloc_percpu, which in fact is never allocated since the cpu is not set incpu_possible_map).
Kills my old 4-way Xeon. cpu_possible_map has a value of 0x7 and alloc_percpu() does bad things for the fourth CPU.
Quoted 21 lines
arch/i386/kernel/mpparse.c +2
-1@@ -122,7 +122,7 @@ static int MP_valid_apicid(int apicid, istatic void __init MP_processor_info (struct mpc_config_processor *m) { -int ver, apicid; +int ver, apicid, cpu, found_bsp =0 ;physid_mask_t tmp;if (!(m->mpc_cpuflag &CPU_ENABLED ))@@ -181,6 +181,7 @@ static void __init MP_processor_info (stif (m->mpc_cpuflag &CPU_BOOTPROCESSOR ) {Dprintk (" Bootup CPU\n" ); boot_cpu_physical_apicid = m->mpc_apicid; + found_bsp =1 ; }if (num_processors >=NR_CPUS ) {
arch/i386/kernel/mpparse.c static void __init MP_processor_info (st · line 212
Quoted 8 lines
arch/i386/kernel/mpparse.c +5
-0@@ -204,6 +205,11 @@ static void __init MP_processor_info (streturn ; } +if (found_bsp) + cpu =0 ; +else + cpu = num_processors -1 ; +cpu_set (cpu, cpu_possible_map);
Looky here:
akpm: found_bsp=0 cpu=0 tmp=0x0001 num_processors=1
akpm: found_bsp=0 cpu=1 tmp=0x0002 num_processors=2
akpm: found_bsp=0 cpu=2 tmp=0x0004 num_processors=3
akpm: found_bsp=1 cpu=0 tmp=0x0008 num_processors=4
On this machine, the BSP is the last one to pass through MP_processor_info(), so the rude-looking assumption above screws things up.
I don't know what that found_bsp code is trying to do. It wasn't changelogged and it wasn't commented and removing it makes by box boot again.
What did I break?
arch/i386/kernel/mpparse.c renamed from arch/i386/kernel/mpparse.c~a +7 -13
@@ -122,8 +122,8 @@ static int MP_valid_apicid(int apicid, istatic void __init MP_processor_info (struct mpc_config_processor *m) { -int ver, apicid, cpu, found_bsp =0 ; -physid_mask_t tmp; +int ver, apicid; +physid_mask_t phys_cpu;if (!(m->mpc_cpuflag &CPU_ENABLED ))return ;
@@ -181,7 +181,6 @@ static void __init MP_processor_info (stif (m->mpc_cpuflag &CPU_BOOTPROCESSOR ) {Dprintk (" Bootup CPU\n" ); boot_cpu_physical_apicid = m->mpc_apicid; - found_bsp =1 ; }if (num_processors >=NR_CPUS ) {
@@ -195,24 +194,19 @@ static void __init MP_processor_info (st " Processor ignored.\n", maxcpus);return ; } - num_processors++; ver = m->mpc_apicver;if (!MP_valid_apicid (apicid, ver)) {printk (KERN_WARNING "Processor #%d INVALID. (Max ID: %d).\n" , m->mpc_apicid,MAX_APICS ); - --num_processors;return ; } -if (found_bsp) - cpu =0 ; -else - cpu = num_processors -1 ; -cpu_set (cpu, cpu_possible_map); - tmp =apicid_to_cpu_present (apicid); -physids_or (phys_cpu_present_map, phys_cpu_present_map, tmp); - +cpu_set (num_processors, cpu_possible_map); + num_processors++; + phys_cpu =apicid_to_cpu_present (apicid); +physids_or (phys_cpu_present_map, phys_cpu_present_map, phys_cpu); +/* * Validate version */
_
Quoted 27 lines · Andrew Morton
Quoted 16 lines
static void
__initMP_processor_info(structmpc_config_processor*m) {arch/i386/kernel/mpparse.c renamed from arch/i386/kernel/mpparse.c~a +2
-1-int ver, apicid; +int ver, apicid, cpu, found_bsp =0 ;physid_mask_t tmp;if (!(m->mpc_cpuflag &CPU_ENABLED ))@@ -181,6 +181,7 @@ static void __init MP_processor_info (stif (m->mpc_cpuflag &CPU_BOOTPROCESSOR ) {Dprintk (" Bootup CPU\n" ); boot_cpu_physical_apicid = m->mpc_apicid; + found_bsp =1 ; }if (num_processors >=NR_CPUS ) {arch/i386/kernel/mpparse.c static void __init MP_processor_info (st · line 212
Quoted 8 lines
arch/i386/kernel/mpparse.c renamed from arch/i386/kernel/mpparse.c~a +5
-0@@ -204,6 +205,11 @@ static void __init MP_processor_info (streturn ; } +if (found_bsp) + cpu =0 ; +else + cpu = num_processors -1 ; +cpu_set (cpu, cpu_possible_map);Looky here:
Quoted 7 lines
akpm: found_bsp=0 cpu=0 tmp=0x0001 num_processors=1
akpm: found_bsp=0 cpu=1 tmp=0x0002 num_processors=2
akpm: found_bsp=0 cpu=2 tmp=0x0004 num_processors=3
akpm: found_bsp=1 cpu=0 tmp=0x0008 num_processors=4On this machine, the BSP is the last one to pass through
MP_processor_info(), so the rude-looking assumption above screws things up.
Yes that's a terrible assumption,
Quoted 4 lines
I don't know what that
found_bspcode is trying to do. It wasn't changelogged and it wasn't commented and removing it makes by box boot again.What did I break?
Nothing gov =)
arch/i386/kernel/mpparse.c static void __init MP_processor_info (st · line 209
Quoted 13 lines
arch/i386/kernel/mpparse.c renamed from arch/i386/kernel/mpparse.c~a +5
-8-if (found_bsp) - cpu =0 ; -else - cpu = num_processors -1 ; -cpu_set (cpu, cpu_possible_map); - tmp =apicid_to_cpu_present (apicid); -physids_or (phys_cpu_present_map, phys_cpu_present_map, tmp); - +cpu_set (num_processors, cpu_possible_map); + num_processors++; + phys_cpu =apicid_to_cpu_present (apicid); +physids_or (phys_cpu_present_map, phys_cpu_present_map, phys_cpu); +
That looks fine to me, my BSP assumption was bad bad bad!
Thanks,
Zwane