mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-29 07:34:06 +08:00
bbc9e2f452
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>
53 lines
1.5 KiB
C
53 lines
1.5 KiB
C
#ifndef _ASM_X86_NUMA_64_H
|
|
#define _ASM_X86_NUMA_64_H
|
|
|
|
#include <linux/nodemask.h>
|
|
|
|
struct bootnode {
|
|
u64 start;
|
|
u64 end;
|
|
};
|
|
|
|
extern int compute_hash_shift(struct bootnode *nodes, int numblks,
|
|
int *nodeids);
|
|
|
|
#define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))
|
|
|
|
extern void numa_init_array(void);
|
|
extern int numa_off;
|
|
|
|
extern unsigned long numa_free_all_bootmem(void);
|
|
extern void setup_node_bootmem(int nodeid, unsigned long start,
|
|
unsigned long end);
|
|
|
|
#ifdef CONFIG_NUMA
|
|
/*
|
|
* Too small node sizes may confuse the VM badly. Usually they
|
|
* result from BIOS bugs. So dont recognize nodes as standalone
|
|
* NUMA entities that have less than this amount of RAM listed:
|
|
*/
|
|
#define NODE_MIN_SIZE (4*1024*1024)
|
|
|
|
extern void __init init_cpu_to_node(void);
|
|
extern int __cpuinit numa_cpu_node(int cpu);
|
|
extern void __cpuinit numa_set_node(int cpu, int node);
|
|
extern void __cpuinit numa_clear_node(int cpu);
|
|
extern void __cpuinit numa_add_cpu(int cpu);
|
|
extern void __cpuinit numa_remove_cpu(int cpu);
|
|
|
|
#ifdef CONFIG_NUMA_EMU
|
|
#define FAKE_NODE_MIN_SIZE ((u64)32 << 20)
|
|
#define FAKE_NODE_MIN_HASH_MASK (~(FAKE_NODE_MIN_SIZE - 1UL))
|
|
void numa_emu_cmdline(char *);
|
|
#endif /* CONFIG_NUMA_EMU */
|
|
#else
|
|
static inline void init_cpu_to_node(void) { }
|
|
static inline int numa_cpu_node(int cpu) { return NUMA_NO_NODE; }
|
|
static inline void numa_set_node(int cpu, int node) { }
|
|
static inline void numa_clear_node(int cpu) { }
|
|
static inline void numa_add_cpu(int cpu, int node) { }
|
|
static inline void numa_remove_cpu(int cpu) { }
|
|
#endif
|
|
|
|
#endif /* _ASM_X86_NUMA_64_H */
|