Messages in this thread | | | From | Tejun Heo <> | Subject | [PATCHSET] x86: unify x86_32 and 64 NUMA init paths, take#2 | Date | Sat, 27 Nov 2010 16:21:49 +0100 |
| |
Hello,
This is the second take of unify-x86_32-and-64-NUMA-init-paths patchset. Changes from the last take[L] are,
* As suggested by Ingo, 0004 from the previous series is further split into 0004-0011.
* Comment noting the ugliness of x86_32 logical apicid mapping difference added.
This patchset started as an attempt to fix percpu setup problem on x86_32 NUMA configurations reported by Eric Dumazet. On x86_32, NUMA configuration is initialized during SMP bringup which happens way later than percpu setup. As percpu setup code doesn't have access to NUMA configuration, it gets set up as if the system is UMA.
The NUMA init paths differ subtly yet significantly between x86_32 and 64 making it quite difficult to follow. Custom apic configurations on x86_32 worsens the problem.
There is no fundamental reason why x86_32 can't be initialized in the same steps as x86_64. They just were written differently and just weren't unified during x86_32/64 code merge. This patchset unifies them and in the process fixes percpu setup problem on 32bit NUMA.
This patchset contains the following sixteen patches.
0001-x86-Kill-unused-static-boot_cpu_logical_apicid-in-sm.patch 0002-x86-Rename-x86_32-MAX_APICID-to-MAX_LOCAL_APIC.patch 0003-x86-Make-default_send_IPI_mask_sequence-allbutself_l.patch 0004-x86-Use-local-variable-to-cache-smp_processor_id-in-.patch 0005-x86-Replace-cpu_2_logical_apicid-with-early-percpu-v.patch 0006-x86-Always-use-x86_cpu_to_logical_apicid-for-cpu-log.patch 0007-x86-Remove-custom-apic-cpu_to_logical_apicid-impleme.patch 0008-x86-Use-apic-cpu_to_logical_apicid-to-find-out-logic.patch 0009-x86-Implement-cpu_to_logical_apicid-for-bigsmp_32.patch 0010-x86-Implement-cpu_to_logical_apicid-for-summit_32.patch 0011-x86-Implement-cpu_to_logical_apicid-for-numaq_32.patch 0012-x86-Replace-apic-apicid_to_node-with-numa_cpu_node.patch 0013-x86-Unify-cpu-apicid-NUMA-node-mapping-between-32-an.patch 0014-x86-Unify-CPU-NUMA-node-mapping-between-32-and-64bit.patch 0015-x86-Unify-node_to_cpumask_map-handling-between-32-an.patch 0016-x86-Unify-NUMA-initialization-between-32-and-64bit.patch
0001-0004 are small preparation patches.
0005-0011 change the role of apic->cpu_to_logical_apicid(). It's now called once for each cpu early during boot and the output is recorded. apic works fine but I couldn't test other apic configurations.
I couldn't figure out how to determine logical_apicid early for numaq and it still has the stub cpu_to_logical_apicid() implementation which would result in suboptimal percpu configuration. NUMA configuration is still updated during SMP bringup, so the situation is the same as before the series, but if someone knows how to convert this one, please go ahead.
0005 replaces apic->apicid_to_node() with ->numa_cpu_node() as some need physical apicid while others logical and both can be easily found from cpu.
0006-0009 unify different parts of NUMA initialization/handling step by step. Afterwards, x86_32 and 64 behave mostly the same regarding NUMA initialization making the whole thing much easier to understand and percpu setup works correctly on x86_32 too.
This patchset is on top of the current mainline (19650e8580987c0ffabc2fe2cbc16b944789df8b) and also avaialbe in the following git branch,
git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git x86_32-numa
and contains the following changes.
arch/x86/Kconfig | 2 arch/x86/include/asm/apic.h | 22 ++- arch/x86/include/asm/apicdef.h | 1 arch/x86/include/asm/ipi.h | 8 - arch/x86/include/asm/mpspec.h | 3 arch/x86/include/asm/numa.h | 61 ++++++++++ arch/x86/include/asm/numa_32.h | 7 - arch/x86/include/asm/numa_64.h | 16 -- arch/x86/include/asm/smp.h | 3 arch/x86/include/asm/topology.h | 17 -- arch/x86/kernel/acpi/boot.c | 8 - arch/x86/kernel/apic/apic.c | 52 ++++++-- arch/x86/kernel/apic/apic_flat_64.c | 4 arch/x86/kernel/apic/apic_noop.c | 4 arch/x86/kernel/apic/bigsmp_32.c | 33 ++--- arch/x86/kernel/apic/es7000_32.c | 33 ++--- arch/x86/kernel/apic/ipi.c | 12 - arch/x86/kernel/apic/numaq_32.c | 29 +++- arch/x86/kernel/apic/probe_32.c | 2 arch/x86/kernel/apic/summit_32.c | 46 ++----- arch/x86/kernel/apic/x2apic_cluster.c | 2 arch/x86/kernel/apic/x2apic_phys.c | 2 arch/x86/kernel/apic/x2apic_uv_x.c | 2 arch/x86/kernel/cpu/amd.c | 18 +- arch/x86/kernel/cpu/common.c | 2 arch/x86/kernel/cpu/intel.c | 5 arch/x86/kernel/setup.c | 2 arch/x86/kernel/setup_percpu.c | 11 + arch/x86/kernel/smpboot.c | 68 ----------- arch/x86/mm/k8topology_64.c | 2 arch/x86/mm/numa.c | 179 +++++++++++++++++++++++++++++ arch/x86/mm/numa_32.c | 7 + arch/x86/mm/numa_64.c | 205 ---------------------------------- arch/x86/mm/srat_32.c | 6 arch/x86/mm/srat_64.c | 10 - 35 files changed, 433 insertions(+), 451 deletions(-)
Thanks.
-- tejun
[L] http://lkml.org/lkml/2010/11/11/96
| |