Change the size of node ids for X86_64 from u8 to s16 to accomodate more than 32k nodes and allow for NUMA_NO_NODE (-1) to be sign extended to int. Based on 2.6.24-rc8-mm1 + latest (08/1/21) git-x86 Cc: David Rientjes Cc: Yinghai Lu Cc: Eric Dumazet Signed-off-by: Mike Travis Reviewed-by: Christoph Lameter --- fixup-V2: - Fixed populate_memnodemap as suggested by Eric. - Change to using s16 for static node id arrays and int for node id's in per_cpu variables and __initdata arrays as suggested by David and Yinghai. - NUMA_NO_NODE is now (-1) fixup: - Size of memnode.embedded_map needs to be changed to accomodate 16-bit node ids as suggested by Eric. V2->V3: - changed memnode.embedded_map from [64-16] to [64-8] (and size comment to 128 bytes) V1->V2: - changed pxm_to_node_map to u16 - changed memnode map entries to u16 --- arch/x86/Kconfig | 1 + arch/x86/mm/numa_64.c | 12 ++++++------ include/asm-x86/mmzone_64.h | 6 +++--- include/asm-x86/numa_64.h | 2 +- include/asm-x86/topology.h | 10 +++++----- 5 files changed, 16 insertions(+), 15 deletions(-) --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -863,6 +863,7 @@ config NUMA_EMU config NODES_SHIFT int + range 1 15 if X86_64 default "6" if X86_64 default "4" if X86_NUMAQ default "3" --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -31,17 +31,17 @@ bootmem_data_t plat_node_bdata[MAX_NUMNO struct memnode memnode; -u16 x86_cpu_to_node_map_init[NR_CPUS] = { +int x86_cpu_to_node_map_init[NR_CPUS] = { [0 ... NR_CPUS-1] = NUMA_NO_NODE }; void *x86_cpu_to_node_map_early_ptr; -DEFINE_PER_CPU(u16, x86_cpu_to_node_map) = NUMA_NO_NODE; +DEFINE_PER_CPU(int, x86_cpu_to_node_map) = NUMA_NO_NODE; EXPORT_PER_CPU_SYMBOL(x86_cpu_to_node_map); #ifdef CONFIG_DEBUG_PER_CPU_MAPS EXPORT_SYMBOL(x86_cpu_to_node_map_early_ptr); #endif -u16 apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { +s16 apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE }; @@ -65,7 +65,7 @@ static int __init populate_memnodemap(co unsigned long addr, end; int i, res = -1; - memset(memnodemap, 0xff, memnodemapsize); + memset(memnodemap, 0xff, sizeof(s16)*memnodemapsize); for (i = 0; i < numnodes; i++) { addr = nodes[i].start; end = nodes[i].end; @@ -74,7 +74,7 @@ static int __init populate_memnodemap(co if ((end >> shift) >= memnodemapsize) return 0; do { - if (memnodemap[addr >> shift] != 0xff) + if (memnodemap[addr >> shift] != NUMA_NO_NODE) return -1; memnodemap[addr >> shift] = i; addr += (1UL << shift); @@ -535,7 +535,7 @@ __cpuinit void numa_add_cpu(int cpu) void __cpuinit numa_set_node(int cpu, int node) { - u16 *cpu_to_node_map = x86_cpu_to_node_map_early_ptr; + int *cpu_to_node_map = x86_cpu_to_node_map_early_ptr; cpu_pda(cpu)->nodenumber = node; --- a/include/asm-x86/mmzone_64.h +++ b/include/asm-x86/mmzone_64.h @@ -15,9 +15,9 @@ struct memnode { int shift; unsigned int mapsize; - u8 *map; - u8 embedded_map[64-16]; -} ____cacheline_aligned; /* total size = 64 bytes */ + s16 *map; + s16 embedded_map[64-8]; +} ____cacheline_aligned; /* total size = 128 bytes */ extern struct memnode memnode; #define memnode_shift memnode.shift #define memnodemap memnode.map --- a/include/asm-x86/numa_64.h +++ b/include/asm-x86/numa_64.h @@ -20,7 +20,7 @@ extern void numa_set_node(int cpu, int n extern void srat_reserve_add_area(int nodeid); extern int hotadd_percent; -extern u16 apicid_to_node[MAX_LOCAL_APIC]; +extern s16 apicid_to_node[MAX_LOCAL_APIC]; extern void numa_initmem_init(unsigned long start_pfn, unsigned long end_pfn); extern unsigned long numa_free_all_bootmem(void); --- a/include/asm-x86/topology.h +++ b/include/asm-x86/topology.h @@ -31,17 +31,17 @@ /* Mappings between logical cpu number and node number */ #ifdef CONFIG_X86_32 -extern u8 cpu_to_node_map[]; +extern int cpu_to_node_map[]; #else -DECLARE_PER_CPU(u16, x86_cpu_to_node_map); -extern u16 x86_cpu_to_node_map_init[]; +DECLARE_PER_CPU(int, x86_cpu_to_node_map); +extern int x86_cpu_to_node_map_init[]; extern void *x86_cpu_to_node_map_early_ptr; #endif extern cpumask_t node_to_cpumask_map[]; -#define NUMA_NO_NODE ((u16)(~0)) +#define NUMA_NO_NODE (-1) /* Returns the number of the node containing CPU 'cpu' */ #ifdef CONFIG_X86_32 @@ -54,7 +54,7 @@ static inline int cpu_to_node(int cpu) #else /* CONFIG_X86_64 */ static inline int early_cpu_to_node(int cpu) { - u16 *cpu_to_node_map = x86_cpu_to_node_map_early_ptr; + int *cpu_to_node_map = x86_cpu_to_node_map_early_ptr; if (cpu_to_node_map) return cpu_to_node_map[cpu]; -- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/