forked from Minki/linux
d2105b10fe
Calgary hits a NULL pointer dereference when booting in a multi-chassis NUMA system. See Redhat bugzilla number 198498, found by Konrad Rzeszutek (konradr@redhat.com). There are many issues that had to be resolved to fix this problem. Firstly when I originally wrote the code to handle NUMA systems, I had a large misunderstanding that was not corrected until now. That was that I thought the "number of nodes online" referred to number of physical systems connected. So that if NUMA was disabled, there would only be 1 node and it would only show that node's PCI bus. In reality if NUMA is disabled, the system displays all of the connected chassis as one node but is only ignorant of the delays in accessing main memory. Therefore, references to num_online_nodes() and MAX_NUMNODES are incorrect and need to be set to the maximum number of nodes that can be accessed (which are 8). I created a variable, MAX_NUM_CHASSIS, and set it to 8 to fix this. Secondly, when walking the PCI in detect_calgary, the code only checked the first "slot" when looking to see if a device is present. This will work for most cases, but unfortunately it isn't always the case. In the NUMA MXE drawers, there are USB devices present on the 3rd slot (with slot 1 being empty). So, to work around this, all slots (up to 8) are scanned to see if there are any devices present. Lastly, the bus is being enumerated on large systems in a different way the we originally thought. This throws the ugly logic we had out the window. To more elegantly handle this, I reorganized the kva array to be sparse (which removed the need to have any bus number to kva slot logic in tce.c) and created a secondary space array to contain the bus number to phb mapping. With these changes Calgary boots on an x460 with 4 nodes with and without NUMA enabled. Signed-off-by: Jon Mason <jdmason@us.ibm.com> Signed-off-by: Muli Ben-Yehuda <muli@il.ibm.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org> |
||
|---|---|---|
| .. | ||
| acpi | ||
| cpufreq | ||
| aperture.c | ||
| apic.c | ||
| asm-offsets.c | ||
| audit.c | ||
| crash_dump.c | ||
| crash.c | ||
| e820.c | ||
| early_printk.c | ||
| entry.S | ||
| functionlist | ||
| genapic_cluster.c | ||
| genapic_flat.c | ||
| genapic.c | ||
| head64.c | ||
| head.S | ||
| i387.c | ||
| i8259.c | ||
| init_task.c | ||
| io_apic.c | ||
| ioport.c | ||
| irq.c | ||
| k8.c | ||
| kprobes.c | ||
| ldt.c | ||
| machine_kexec.c | ||
| Makefile | ||
| mce_amd.c | ||
| mce_intel.c | ||
| mce.c | ||
| module.c | ||
| mpparse.c | ||
| nmi.c | ||
| pci-calgary.c | ||
| pci-dma.c | ||
| pci-gart.c | ||
| pci-nommu.c | ||
| pci-swiotlb.c | ||
| pmtimer.c | ||
| process.c | ||
| ptrace.c | ||
| reboot.c | ||
| relocate_kernel.S | ||
| setup64.c | ||
| setup.c | ||
| signal.c | ||
| smp.c | ||
| smpboot.c | ||
| stacktrace.c | ||
| suspend_asm.S | ||
| suspend.c | ||
| sys_x86_64.c | ||
| syscall.c | ||
| tce.c | ||
| time.c | ||
| trampoline.S | ||
| traps.c | ||
| vmlinux.lds.S | ||
| vsmp.c | ||
| vsyscall.c | ||
| x8664_ksyms.c | ||