diff options
author | Tejun Heo <tj@kernel.org> | 2011-01-23 08:37:39 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-01-28 08:54:09 -0500 |
commit | bbc9e2f452d9c4b166d1f9a78d941d80173312fe (patch) | |
tree | d75d41187b296235f833e942ed8c1dd938a7bae4 /arch/x86/include/asm/numa_64.h | |
parent | 89e5dc218e084e13a3996db6693b01478912f4ee (diff) |
x86: Unify cpu/apicid <-> NUMA node mapping between 32 and 64bit
The mapping between cpu/apicid and node is done via
apicid_to_node[] on 64bit and apicid_2_node[] +
apic->x86_32_numa_cpu_node() on 32bit. This difference makes it
difficult to further unify 32 and 64bit NUMA handling.
This patch unifies it by replacing both apicid_to_node[] and
apicid_2_node[] with __apicid_to_node[] array, which is accessed
by two accessors - set_apicid_to_node() and numa_cpu_node(). On
64bit, numa_cpu_node() always consults __apicid_to_node[]
directly while 32bit goes through apic->numa_cpu_node() method
to allow apic implementations to override it.
srat_detect_node() for amd cpus contains workaround for broken
NUMA configuration which assumes relationship between APIC ID,
HT node ID and NUMA topology. Leave it to access
__apicid_to_node[] directly as mapping through CPU might result
in undesirable behavior change. The comment is reformatted and
updated to note the ugliness.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Pekka Enberg <penberg@kernel.org>
Cc: eric.dumazet@gmail.com
Cc: yinghai@kernel.org
Cc: brgerst@gmail.com
Cc: gorcunov@gmail.com
Cc: shaohui.zheng@intel.com
Cc: rientjes@google.com
LKML-Reference: <1295789862-25482-14-git-send-email-tj@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Cc: David Rientjes <rientjes@google.com>
Diffstat (limited to 'arch/x86/include/asm/numa_64.h')
-rw-r--r-- | arch/x86/include/asm/numa_64.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/include/asm/numa_64.h b/arch/x86/include/asm/numa_64.h index 0493be39607c..4982a9c08c2f 100644 --- a/arch/x86/include/asm/numa_64.h +++ b/arch/x86/include/asm/numa_64.h | |||
@@ -2,7 +2,6 @@ | |||
2 | #define _ASM_X86_NUMA_64_H | 2 | #define _ASM_X86_NUMA_64_H |
3 | 3 | ||
4 | #include <linux/nodemask.h> | 4 | #include <linux/nodemask.h> |
5 | #include <asm/apicdef.h> | ||
6 | 5 | ||
7 | struct bootnode { | 6 | struct bootnode { |
8 | u64 start; | 7 | u64 start; |
@@ -17,8 +16,6 @@ extern int compute_hash_shift(struct bootnode *nodes, int numblks, | |||
17 | extern void numa_init_array(void); | 16 | extern void numa_init_array(void); |
18 | extern int numa_off; | 17 | extern int numa_off; |
19 | 18 | ||
20 | extern s16 apicid_to_node[MAX_LOCAL_APIC]; | ||
21 | |||
22 | extern unsigned long numa_free_all_bootmem(void); | 19 | extern unsigned long numa_free_all_bootmem(void); |
23 | extern void setup_node_bootmem(int nodeid, unsigned long start, | 20 | extern void setup_node_bootmem(int nodeid, unsigned long start, |
24 | unsigned long end); | 21 | unsigned long end); |
@@ -32,6 +29,7 @@ extern void setup_node_bootmem(int nodeid, unsigned long start, | |||
32 | #define NODE_MIN_SIZE (4*1024*1024) | 29 | #define NODE_MIN_SIZE (4*1024*1024) |
33 | 30 | ||
34 | extern void __init init_cpu_to_node(void); | 31 | extern void __init init_cpu_to_node(void); |
32 | extern int __cpuinit numa_cpu_node(int cpu); | ||
35 | extern void __cpuinit numa_set_node(int cpu, int node); | 33 | extern void __cpuinit numa_set_node(int cpu, int node); |
36 | extern void __cpuinit numa_clear_node(int cpu); | 34 | extern void __cpuinit numa_clear_node(int cpu); |
37 | extern void __cpuinit numa_add_cpu(int cpu); | 35 | extern void __cpuinit numa_add_cpu(int cpu); |
@@ -44,6 +42,7 @@ void numa_emu_cmdline(char *); | |||
44 | #endif /* CONFIG_NUMA_EMU */ | 42 | #endif /* CONFIG_NUMA_EMU */ |
45 | #else | 43 | #else |
46 | static inline void init_cpu_to_node(void) { } | 44 | static inline void init_cpu_to_node(void) { } |
45 | static inline int numa_cpu_node(int cpu) { return NUMA_NO_NODE; } | ||
47 | static inline void numa_set_node(int cpu, int node) { } | 46 | static inline void numa_set_node(int cpu, int node) { } |
48 | static inline void numa_clear_node(int cpu) { } | 47 | static inline void numa_clear_node(int cpu) { } |
49 | static inline void numa_add_cpu(int cpu, int node) { } | 48 | static inline void numa_add_cpu(int cpu, int node) { } |