Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 1 | /* |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 2 | * Generic VM initialization for x86-64 NUMA setups. |
| 3 | * Copyright 2002,2003 Andi Kleen, SuSE Labs. |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 4 | */ |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 5 | #include <linux/kernel.h> |
| 6 | #include <linux/mm.h> |
| 7 | #include <linux/string.h> |
| 8 | #include <linux/init.h> |
| 9 | #include <linux/bootmem.h> |
| 10 | #include <linux/mmzone.h> |
| 11 | #include <linux/ctype.h> |
| 12 | #include <linux/module.h> |
| 13 | #include <linux/nodemask.h> |
travis@sgi.com | 3cc87e3 | 2008-01-30 13:33:11 +0100 | [diff] [blame] | 14 | #include <linux/sched.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 15 | |
| 16 | #include <asm/e820.h> |
| 17 | #include <asm/proto.h> |
| 18 | #include <asm/dma.h> |
| 19 | #include <asm/numa.h> |
| 20 | #include <asm/acpi.h> |
Thomas Gleixner | c9ff034 | 2008-01-30 13:30:16 +0100 | [diff] [blame] | 21 | #include <asm/k8.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 22 | |
Ravikiran G Thirumalai | 6c231b7 | 2005-09-06 15:17:45 -0700 | [diff] [blame] | 23 | struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 24 | EXPORT_SYMBOL(node_data); |
| 25 | |
Eric Dumazet | dcf36bf | 2006-03-25 16:31:46 +0100 | [diff] [blame] | 26 | struct memnode memnode; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 27 | |
travis@sgi.com | 4323838 | 2008-01-30 13:33:25 +0100 | [diff] [blame] | 28 | s16 apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = { |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 29 | [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE |
Andi Kleen | 3f098c2 | 2005-09-12 18:49:24 +0200 | [diff] [blame] | 30 | }; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 31 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 32 | int numa_off __initdata; |
Thomas Gleixner | 864fc31 | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 33 | static unsigned long __initdata nodemap_addr; |
| 34 | static unsigned long __initdata nodemap_size; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 35 | |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 36 | DEFINE_PER_CPU(int, node_number) = 0; |
| 37 | EXPORT_PER_CPU_SYMBOL(node_number); |
| 38 | |
| 39 | /* |
| 40 | * Map cpu index to node index |
| 41 | */ |
| 42 | DEFINE_EARLY_PER_CPU(int, x86_cpu_to_node_map, NUMA_NO_NODE); |
| 43 | EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_node_map); |
| 44 | |
| 45 | /* |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 46 | * Given a shift value, try to populate memnodemap[] |
| 47 | * Returns : |
| 48 | * 1 if OK |
| 49 | * 0 if memnodmap[] too small (of shift too small) |
| 50 | * -1 if node overlap or lost ram (shift too big) |
| 51 | */ |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 52 | static int __init populate_memnodemap(const struct bootnode *nodes, |
Suresh Siddha | 6ec6e0d | 2008-03-25 10:14:35 -0700 | [diff] [blame] | 53 | int numnodes, int shift, int *nodeids) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 54 | { |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 55 | unsigned long addr, end; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 56 | int i, res = -1; |
Keith Mannthey | b684664 | 2005-07-28 21:15:38 -0700 | [diff] [blame] | 57 | |
travis@sgi.com | 4323838 | 2008-01-30 13:33:25 +0100 | [diff] [blame] | 58 | memset(memnodemap, 0xff, sizeof(s16)*memnodemapsize); |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 59 | for (i = 0; i < numnodes; i++) { |
| 60 | addr = nodes[i].start; |
| 61 | end = nodes[i].end; |
| 62 | if (addr >= end) |
| 63 | continue; |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 64 | if ((end >> shift) >= memnodemapsize) |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 65 | return 0; |
| 66 | do { |
travis@sgi.com | 4323838 | 2008-01-30 13:33:25 +0100 | [diff] [blame] | 67 | if (memnodemap[addr >> shift] != NUMA_NO_NODE) |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 68 | return -1; |
Suresh Siddha | 6ec6e0d | 2008-03-25 10:14:35 -0700 | [diff] [blame] | 69 | |
| 70 | if (!nodeids) |
| 71 | memnodemap[addr >> shift] = i; |
| 72 | else |
| 73 | memnodemap[addr >> shift] = nodeids[i]; |
| 74 | |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 75 | addr += (1UL << shift); |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 76 | } while (addr < end); |
| 77 | res = 1; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 78 | } |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 79 | return res; |
| 80 | } |
| 81 | |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 82 | static int __init allocate_cachealigned_memnodemap(void) |
| 83 | { |
Yinghai Lu | 24a5da7 | 2008-02-01 17:49:41 +0100 | [diff] [blame] | 84 | unsigned long addr; |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 85 | |
| 86 | memnodemap = memnode.embedded_map; |
travis@sgi.com | 316390b | 2008-01-30 13:33:15 +0100 | [diff] [blame] | 87 | if (memnodemapsize <= ARRAY_SIZE(memnode.embedded_map)) |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 88 | return 0; |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 89 | |
Yinghai Lu | 24a5da7 | 2008-02-01 17:49:41 +0100 | [diff] [blame] | 90 | addr = 0x8000; |
Joerg Roedel | be3e89e | 2008-07-25 16:48:58 +0200 | [diff] [blame] | 91 | nodemap_size = roundup(sizeof(s16) * memnodemapsize, L1_CACHE_BYTES); |
Yinghai Lu | c987d12 | 2008-06-24 22:14:09 -0700 | [diff] [blame] | 92 | nodemap_addr = find_e820_area(addr, max_pfn<<PAGE_SHIFT, |
Yinghai Lu | 24a5da7 | 2008-02-01 17:49:41 +0100 | [diff] [blame] | 93 | nodemap_size, L1_CACHE_BYTES); |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 94 | if (nodemap_addr == -1UL) { |
| 95 | printk(KERN_ERR |
| 96 | "NUMA: Unable to allocate Memory to Node hash map\n"); |
| 97 | nodemap_addr = nodemap_size = 0; |
| 98 | return -1; |
| 99 | } |
Yinghai Lu | 24a5da7 | 2008-02-01 17:49:41 +0100 | [diff] [blame] | 100 | memnodemap = phys_to_virt(nodemap_addr); |
Yinghai Lu | 25eff8d | 2008-02-01 17:49:41 +0100 | [diff] [blame] | 101 | reserve_early(nodemap_addr, nodemap_addr + nodemap_size, "MEMNODEMAP"); |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 102 | |
| 103 | printk(KERN_DEBUG "NUMA: Allocated memnodemap from %lx - %lx\n", |
| 104 | nodemap_addr, nodemap_addr + nodemap_size); |
| 105 | return 0; |
| 106 | } |
| 107 | |
| 108 | /* |
| 109 | * The LSB of all start and end addresses in the node map is the value of the |
| 110 | * maximum possible shift. |
| 111 | */ |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 112 | static int __init extract_lsb_from_nodes(const struct bootnode *nodes, |
| 113 | int numnodes) |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 114 | { |
Amul Shah | 5441392 | 2007-02-13 13:26:20 +0100 | [diff] [blame] | 115 | int i, nodes_used = 0; |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 116 | unsigned long start, end; |
| 117 | unsigned long bitfield = 0, memtop = 0; |
| 118 | |
| 119 | for (i = 0; i < numnodes; i++) { |
| 120 | start = nodes[i].start; |
| 121 | end = nodes[i].end; |
| 122 | if (start >= end) |
| 123 | continue; |
Amul Shah | 5441392 | 2007-02-13 13:26:20 +0100 | [diff] [blame] | 124 | bitfield |= start; |
| 125 | nodes_used++; |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 126 | if (end > memtop) |
| 127 | memtop = end; |
| 128 | } |
Amul Shah | 5441392 | 2007-02-13 13:26:20 +0100 | [diff] [blame] | 129 | if (nodes_used <= 1) |
| 130 | i = 63; |
| 131 | else |
| 132 | i = find_first_bit(&bitfield, sizeof(unsigned long)*8); |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 133 | memnodemapsize = (memtop >> i)+1; |
| 134 | return i; |
| 135 | } |
| 136 | |
Suresh Siddha | 6ec6e0d | 2008-03-25 10:14:35 -0700 | [diff] [blame] | 137 | int __init compute_hash_shift(struct bootnode *nodes, int numnodes, |
| 138 | int *nodeids) |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 139 | { |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 140 | int shift; |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 141 | |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 142 | shift = extract_lsb_from_nodes(nodes, numnodes); |
| 143 | if (allocate_cachealigned_memnodemap()) |
| 144 | return -1; |
Andi Kleen | 6b050f8 | 2006-01-11 22:44:33 +0100 | [diff] [blame] | 145 | printk(KERN_DEBUG "NUMA: Using %d for the hash shift.\n", |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 146 | shift); |
| 147 | |
Suresh Siddha | 6ec6e0d | 2008-03-25 10:14:35 -0700 | [diff] [blame] | 148 | if (populate_memnodemap(nodes, numnodes, shift, nodeids) != 1) { |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 149 | printk(KERN_INFO "Your memory is not aligned you need to " |
| 150 | "rebuild your kernel with a bigger NODEMAPSIZE " |
| 151 | "shift=%d\n", shift); |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 152 | return -1; |
| 153 | } |
Keith Mannthey | b684664 | 2005-07-28 21:15:38 -0700 | [diff] [blame] | 154 | return shift; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 155 | } |
| 156 | |
KAMEZAWA Hiroyuki | f2dbcfa | 2009-02-18 14:48:32 -0800 | [diff] [blame] | 157 | int __meminit __early_pfn_to_nid(unsigned long pfn) |
Matt Tolentino | bbfceef | 2005-06-23 00:08:07 -0700 | [diff] [blame] | 158 | { |
| 159 | return phys_to_nid(pfn << PAGE_SHIFT); |
| 160 | } |
Matt Tolentino | bbfceef | 2005-06-23 00:08:07 -0700 | [diff] [blame] | 161 | |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 162 | static void * __init early_node_mem(int nodeid, unsigned long start, |
Yinghai Lu | 24a5da7 | 2008-02-01 17:49:41 +0100 | [diff] [blame] | 163 | unsigned long end, unsigned long size, |
| 164 | unsigned long align) |
Andi Kleen | a806223 | 2006-04-07 19:49:21 +0200 | [diff] [blame] | 165 | { |
Yinghai Lu | cef625e | 2010-02-10 01:20:18 -0800 | [diff] [blame^] | 166 | unsigned long mem; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 167 | |
Yinghai Lu | cef625e | 2010-02-10 01:20:18 -0800 | [diff] [blame^] | 168 | /* |
| 169 | * put it on high as possible |
| 170 | * something will go with NODE_DATA |
| 171 | */ |
| 172 | if (start < (MAX_DMA_PFN<<PAGE_SHIFT)) |
| 173 | start = MAX_DMA_PFN<<PAGE_SHIFT; |
| 174 | if (start < (MAX_DMA32_PFN<<PAGE_SHIFT) && |
| 175 | end > (MAX_DMA32_PFN<<PAGE_SHIFT)) |
| 176 | start = MAX_DMA32_PFN<<PAGE_SHIFT; |
| 177 | mem = find_e820_area(start, end, size, align); |
Yinghai Lu | 9347e0b | 2008-02-01 17:49:42 +0100 | [diff] [blame] | 178 | if (mem != -1L) |
Andi Kleen | a806223 | 2006-04-07 19:49:21 +0200 | [diff] [blame] | 179 | return __va(mem); |
Yinghai Lu | 9347e0b | 2008-02-01 17:49:42 +0100 | [diff] [blame] | 180 | |
Yinghai Lu | cef625e | 2010-02-10 01:20:18 -0800 | [diff] [blame^] | 181 | /* extend the search scope */ |
| 182 | end = max_pfn_mapped << PAGE_SHIFT; |
| 183 | if (end > (MAX_DMA32_PFN<<PAGE_SHIFT)) |
| 184 | start = MAX_DMA32_PFN<<PAGE_SHIFT; |
| 185 | else |
| 186 | start = MAX_DMA_PFN<<PAGE_SHIFT; |
Yinghai Lu | 1842f90 | 2010-02-10 01:20:15 -0800 | [diff] [blame] | 187 | mem = find_e820_area(start, end, size, align); |
| 188 | if (mem != -1L) |
| 189 | return __va(mem); |
| 190 | |
| 191 | printk(KERN_ERR "Cannot find %lu bytes in node %d\n", |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 192 | size, nodeid); |
Yinghai Lu | 1842f90 | 2010-02-10 01:20:15 -0800 | [diff] [blame] | 193 | |
| 194 | return NULL; |
Andi Kleen | a806223 | 2006-04-07 19:49:21 +0200 | [diff] [blame] | 195 | } |
| 196 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 197 | /* Initialize bootmem allocator for a node */ |
Yinghai Lu | 7c43769 | 2009-05-15 13:59:37 -0700 | [diff] [blame] | 198 | void __init |
| 199 | setup_node_bootmem(int nodeid, unsigned long start, unsigned long end) |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 200 | { |
Thomas Gleixner | 886533a | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 201 | unsigned long start_pfn, last_pfn, bootmap_pages, bootmap_size; |
Yinghai Lu | 7c43769 | 2009-05-15 13:59:37 -0700 | [diff] [blame] | 202 | const int pgdat_size = roundup(sizeof(pg_data_t), PAGE_SIZE); |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 203 | unsigned long bootmap_start, nodedata_phys; |
Andi Kleen | a806223 | 2006-04-07 19:49:21 +0200 | [diff] [blame] | 204 | void *bootmap; |
Yinghai Lu | 1a27fc0 | 2008-03-18 12:52:37 -0700 | [diff] [blame] | 205 | int nid; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 206 | |
Yinghai Lu | 4c31e92 | 2009-04-22 14:19:27 -0700 | [diff] [blame] | 207 | if (!end) |
| 208 | return; |
| 209 | |
Yinghai Lu | 7c43769 | 2009-05-15 13:59:37 -0700 | [diff] [blame] | 210 | /* |
| 211 | * Don't confuse VM with a node that doesn't have the |
| 212 | * minimum amount of memory: |
| 213 | */ |
| 214 | if (end && (end - start) < NODE_MIN_SIZE) |
| 215 | return; |
| 216 | |
Joerg Roedel | be3e89e | 2008-07-25 16:48:58 +0200 | [diff] [blame] | 217 | start = roundup(start, ZONE_ALIGN); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 218 | |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 219 | printk(KERN_INFO "Bootmem setup node %d %016lx-%016lx\n", nodeid, |
| 220 | start, end); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 221 | |
| 222 | start_pfn = start >> PAGE_SHIFT; |
Thomas Gleixner | 886533a | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 223 | last_pfn = end >> PAGE_SHIFT; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 224 | |
Yinghai Lu | 24a5da7 | 2008-02-01 17:49:41 +0100 | [diff] [blame] | 225 | node_data[nodeid] = early_node_mem(nodeid, start, end, pgdat_size, |
| 226 | SMP_CACHE_BYTES); |
Andi Kleen | a806223 | 2006-04-07 19:49:21 +0200 | [diff] [blame] | 227 | if (node_data[nodeid] == NULL) |
| 228 | return; |
| 229 | nodedata_phys = __pa(node_data[nodeid]); |
Yinghai Lu | 1842f90 | 2010-02-10 01:20:15 -0800 | [diff] [blame] | 230 | reserve_early(nodedata_phys, nodedata_phys + pgdat_size, "NODE_DATA"); |
Yinghai Lu | 6118f76 | 2008-02-04 16:47:56 +0100 | [diff] [blame] | 231 | printk(KERN_INFO " NODE_DATA [%016lx - %016lx]\n", nodedata_phys, |
| 232 | nodedata_phys + pgdat_size - 1); |
Yinghai Lu | 1842f90 | 2010-02-10 01:20:15 -0800 | [diff] [blame] | 233 | nid = phys_to_nid(nodedata_phys); |
| 234 | if (nid != nodeid) |
| 235 | printk(KERN_INFO " NODE_DATA(%d) on node %d\n", nodeid, nid); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 236 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 237 | memset(NODE_DATA(nodeid), 0, sizeof(pg_data_t)); |
Johannes Weiner | b61bfa3 | 2008-07-23 21:26:55 -0700 | [diff] [blame] | 238 | NODE_DATA(nodeid)->bdata = &bootmem_node_data[nodeid]; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 239 | NODE_DATA(nodeid)->node_start_pfn = start_pfn; |
Thomas Gleixner | 886533a | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 240 | NODE_DATA(nodeid)->node_spanned_pages = last_pfn - start_pfn; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 241 | |
Yinghai Lu | 1a27fc0 | 2008-03-18 12:52:37 -0700 | [diff] [blame] | 242 | /* |
| 243 | * Find a place for the bootmem map |
| 244 | * nodedata_phys could be on other nodes by alloc_bootmem, |
| 245 | * so need to sure bootmap_start not to be small, otherwise |
| 246 | * early_node_mem will get that with find_e820_area instead |
| 247 | * of alloc_bootmem, that could clash with reserved range |
| 248 | */ |
Thomas Gleixner | 886533a | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 249 | bootmap_pages = bootmem_bootmap_pages(last_pfn - start_pfn); |
Yinghai Lu | 1842f90 | 2010-02-10 01:20:15 -0800 | [diff] [blame] | 250 | bootmap_start = roundup(nodedata_phys + pgdat_size, PAGE_SIZE); |
Yinghai Lu | 24a5da7 | 2008-02-01 17:49:41 +0100 | [diff] [blame] | 251 | /* |
Paul Jackson | e9197bf | 2008-05-14 08:15:10 -0700 | [diff] [blame] | 252 | * SMP_CACHE_BYTES could be enough, but init_bootmem_node like |
Yinghai Lu | 24a5da7 | 2008-02-01 17:49:41 +0100 | [diff] [blame] | 253 | * to use that to align to PAGE_SIZE |
| 254 | */ |
Andi Kleen | a806223 | 2006-04-07 19:49:21 +0200 | [diff] [blame] | 255 | bootmap = early_node_mem(nodeid, bootmap_start, end, |
Yinghai Lu | 24a5da7 | 2008-02-01 17:49:41 +0100 | [diff] [blame] | 256 | bootmap_pages<<PAGE_SHIFT, PAGE_SIZE); |
Andi Kleen | a806223 | 2006-04-07 19:49:21 +0200 | [diff] [blame] | 257 | if (bootmap == NULL) { |
Yinghai Lu | 1842f90 | 2010-02-10 01:20:15 -0800 | [diff] [blame] | 258 | free_early(nodedata_phys, nodedata_phys + pgdat_size); |
Andi Kleen | a806223 | 2006-04-07 19:49:21 +0200 | [diff] [blame] | 259 | node_data[nodeid] = NULL; |
| 260 | return; |
| 261 | } |
| 262 | bootmap_start = __pa(bootmap); |
Yinghai Lu | 1842f90 | 2010-02-10 01:20:15 -0800 | [diff] [blame] | 263 | reserve_early(bootmap_start, bootmap_start+(bootmap_pages<<PAGE_SHIFT), |
| 264 | "BOOTMAP"); |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 265 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 266 | bootmap_size = init_bootmem_node(NODE_DATA(nodeid), |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 267 | bootmap_start >> PAGE_SHIFT, |
Thomas Gleixner | 886533a | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 268 | start_pfn, last_pfn); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 269 | |
Yinghai Lu | 6118f76 | 2008-02-04 16:47:56 +0100 | [diff] [blame] | 270 | printk(KERN_INFO " bootmap [%016lx - %016lx] pages %lx\n", |
| 271 | bootmap_start, bootmap_start + bootmap_size - 1, |
| 272 | bootmap_pages); |
Yinghai Lu | 1a27fc0 | 2008-03-18 12:52:37 -0700 | [diff] [blame] | 273 | nid = phys_to_nid(bootmap_start); |
| 274 | if (nid != nodeid) |
| 275 | printk(KERN_INFO " bootmap(%d) on node %d\n", nodeid, nid); |
Yinghai Lu | 1842f90 | 2010-02-10 01:20:15 -0800 | [diff] [blame] | 276 | |
| 277 | free_bootmem_with_active_regions(nodeid, end); |
Yinghai Lu | 1a27fc0 | 2008-03-18 12:52:37 -0700 | [diff] [blame] | 278 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 279 | node_set_online(nodeid); |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 280 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 281 | |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 282 | /* |
| 283 | * There are unfortunately some poorly designed mainboards around that |
| 284 | * only connect memory to a single CPU. This breaks the 1:1 cpu->node |
| 285 | * mapping. To avoid this fill in the mapping for all possible CPUs, |
| 286 | * as the number of CPUs is not known yet. We round robin the existing |
| 287 | * nodes. |
| 288 | */ |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 289 | void __init numa_init_array(void) |
| 290 | { |
| 291 | int rr, i; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 292 | |
Ravikiran G Thirumalai | 85cc513 | 2005-09-30 11:59:22 -0700 | [diff] [blame] | 293 | rr = first_node(node_online_map); |
Mike Travis | 168ef54 | 2008-12-16 17:34:01 -0800 | [diff] [blame] | 294 | for (i = 0; i < nr_cpu_ids; i++) { |
travis@sgi.com | 1ce3571 | 2008-01-30 13:33:33 +0100 | [diff] [blame] | 295 | if (early_cpu_to_node(i) != NUMA_NO_NODE) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 296 | continue; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 297 | numa_set_node(i, rr); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 298 | rr = next_node(rr, node_online_map); |
| 299 | if (rr == MAX_NUMNODES) |
| 300 | rr = first_node(node_online_map); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 301 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 302 | } |
| 303 | |
| 304 | #ifdef CONFIG_NUMA_EMU |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 305 | /* Numa emulation */ |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 306 | static struct bootnode nodes[MAX_NUMNODES] __initdata; |
| 307 | static struct bootnode physnodes[MAX_NUMNODES] __initdata; |
Thomas Gleixner | 864fc31 | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 308 | static char *cmdline __initdata; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 309 | |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 310 | static int __init setup_physnodes(unsigned long start, unsigned long end, |
| 311 | int acpi, int k8) |
| 312 | { |
| 313 | int nr_nodes = 0; |
| 314 | int ret = 0; |
| 315 | int i; |
| 316 | |
| 317 | #ifdef CONFIG_ACPI_NUMA |
| 318 | if (acpi) |
| 319 | nr_nodes = acpi_get_nodes(physnodes); |
| 320 | #endif |
| 321 | #ifdef CONFIG_K8_NUMA |
| 322 | if (k8) |
| 323 | nr_nodes = k8_get_nodes(physnodes); |
| 324 | #endif |
| 325 | /* |
| 326 | * Basic sanity checking on the physical node map: there may be errors |
| 327 | * if the SRAT or K8 incorrectly reported the topology or the mem= |
| 328 | * kernel parameter is used. |
| 329 | */ |
| 330 | for (i = 0; i < nr_nodes; i++) { |
| 331 | if (physnodes[i].start == physnodes[i].end) |
| 332 | continue; |
| 333 | if (physnodes[i].start > end) { |
| 334 | physnodes[i].end = physnodes[i].start; |
| 335 | continue; |
| 336 | } |
| 337 | if (physnodes[i].end < start) { |
| 338 | physnodes[i].start = physnodes[i].end; |
| 339 | continue; |
| 340 | } |
| 341 | if (physnodes[i].start < start) |
| 342 | physnodes[i].start = start; |
| 343 | if (physnodes[i].end > end) |
| 344 | physnodes[i].end = end; |
| 345 | } |
| 346 | |
| 347 | /* |
| 348 | * Remove all nodes that have no memory or were truncated because of the |
| 349 | * limited address range. |
| 350 | */ |
| 351 | for (i = 0; i < nr_nodes; i++) { |
| 352 | if (physnodes[i].start == physnodes[i].end) |
| 353 | continue; |
| 354 | physnodes[ret].start = physnodes[i].start; |
| 355 | physnodes[ret].end = physnodes[i].end; |
| 356 | ret++; |
| 357 | } |
| 358 | |
| 359 | /* |
| 360 | * If no physical topology was detected, a single node is faked to cover |
| 361 | * the entire address space. |
| 362 | */ |
| 363 | if (!ret) { |
| 364 | physnodes[ret].start = start; |
| 365 | physnodes[ret].end = end; |
| 366 | ret = 1; |
| 367 | } |
| 368 | return ret; |
| 369 | } |
| 370 | |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 371 | /* |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 372 | * Setups up nid to range from addr to addr + size. If the end |
| 373 | * boundary is greater than max_addr, then max_addr is used instead. |
| 374 | * The return value is 0 if there is additional memory left for |
| 375 | * allocation past addr and -1 otherwise. addr is adjusted to be at |
| 376 | * the end of the node. |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 377 | */ |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 378 | static int __init setup_node_range(int nid, u64 *addr, u64 size, u64 max_addr) |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 379 | { |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 380 | int ret = 0; |
| 381 | nodes[nid].start = *addr; |
| 382 | *addr += size; |
| 383 | if (*addr >= max_addr) { |
| 384 | *addr = max_addr; |
| 385 | ret = -1; |
| 386 | } |
| 387 | nodes[nid].end = *addr; |
Suresh Siddha | e3f1cae | 2007-05-02 19:27:20 +0200 | [diff] [blame] | 388 | node_set(nid, node_possible_map); |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 389 | printk(KERN_INFO "Faking node %d at %016Lx-%016Lx (%LuMB)\n", nid, |
| 390 | nodes[nid].start, nodes[nid].end, |
| 391 | (nodes[nid].end - nodes[nid].start) >> 20); |
| 392 | return ret; |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 393 | } |
| 394 | |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 395 | /* |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 396 | * Sets up nr_nodes fake nodes interleaved over physical nodes ranging from addr |
| 397 | * to max_addr. The return value is the number of nodes allocated. |
| 398 | */ |
| 399 | static int __init split_nodes_interleave(u64 addr, u64 max_addr, |
| 400 | int nr_phys_nodes, int nr_nodes) |
| 401 | { |
| 402 | nodemask_t physnode_mask = NODE_MASK_NONE; |
| 403 | u64 size; |
| 404 | int big; |
| 405 | int ret = 0; |
| 406 | int i; |
| 407 | |
| 408 | if (nr_nodes <= 0) |
| 409 | return -1; |
| 410 | if (nr_nodes > MAX_NUMNODES) { |
| 411 | pr_info("numa=fake=%d too large, reducing to %d\n", |
| 412 | nr_nodes, MAX_NUMNODES); |
| 413 | nr_nodes = MAX_NUMNODES; |
| 414 | } |
| 415 | |
| 416 | size = (max_addr - addr - e820_hole_size(addr, max_addr)) / nr_nodes; |
| 417 | /* |
| 418 | * Calculate the number of big nodes that can be allocated as a result |
| 419 | * of consolidating the remainder. |
| 420 | */ |
| 421 | big = ((size & ~FAKE_NODE_MIN_HASH_MASK) & nr_nodes) / |
| 422 | FAKE_NODE_MIN_SIZE; |
| 423 | |
| 424 | size &= FAKE_NODE_MIN_HASH_MASK; |
| 425 | if (!size) { |
| 426 | pr_err("Not enough memory for each node. " |
| 427 | "NUMA emulation disabled.\n"); |
| 428 | return -1; |
| 429 | } |
| 430 | |
| 431 | for (i = 0; i < nr_phys_nodes; i++) |
| 432 | if (physnodes[i].start != physnodes[i].end) |
| 433 | node_set(i, physnode_mask); |
| 434 | |
| 435 | /* |
| 436 | * Continue to fill physical nodes with fake nodes until there is no |
| 437 | * memory left on any of them. |
| 438 | */ |
| 439 | while (nodes_weight(physnode_mask)) { |
| 440 | for_each_node_mask(i, physnode_mask) { |
| 441 | u64 end = physnodes[i].start + size; |
| 442 | u64 dma32_end = PFN_PHYS(MAX_DMA32_PFN); |
| 443 | |
| 444 | if (ret < big) |
| 445 | end += FAKE_NODE_MIN_SIZE; |
| 446 | |
| 447 | /* |
| 448 | * Continue to add memory to this fake node if its |
| 449 | * non-reserved memory is less than the per-node size. |
| 450 | */ |
| 451 | while (end - physnodes[i].start - |
| 452 | e820_hole_size(physnodes[i].start, end) < size) { |
| 453 | end += FAKE_NODE_MIN_SIZE; |
| 454 | if (end > physnodes[i].end) { |
| 455 | end = physnodes[i].end; |
| 456 | break; |
| 457 | } |
| 458 | } |
| 459 | |
| 460 | /* |
| 461 | * If there won't be at least FAKE_NODE_MIN_SIZE of |
| 462 | * non-reserved memory in ZONE_DMA32 for the next node, |
| 463 | * this one must extend to the boundary. |
| 464 | */ |
| 465 | if (end < dma32_end && dma32_end - end - |
| 466 | e820_hole_size(end, dma32_end) < FAKE_NODE_MIN_SIZE) |
| 467 | end = dma32_end; |
| 468 | |
| 469 | /* |
| 470 | * If there won't be enough non-reserved memory for the |
| 471 | * next node, this one must extend to the end of the |
| 472 | * physical node. |
| 473 | */ |
| 474 | if (physnodes[i].end - end - |
| 475 | e820_hole_size(end, physnodes[i].end) < size) |
| 476 | end = physnodes[i].end; |
| 477 | |
| 478 | /* |
| 479 | * Avoid allocating more nodes than requested, which can |
| 480 | * happen as a result of rounding down each node's size |
| 481 | * to FAKE_NODE_MIN_SIZE. |
| 482 | */ |
| 483 | if (nodes_weight(physnode_mask) + ret >= nr_nodes) |
| 484 | end = physnodes[i].end; |
| 485 | |
| 486 | if (setup_node_range(ret++, &physnodes[i].start, |
| 487 | end - physnodes[i].start, |
| 488 | physnodes[i].end) < 0) |
| 489 | node_clear(i, physnode_mask); |
| 490 | } |
| 491 | } |
| 492 | return ret; |
| 493 | } |
| 494 | |
| 495 | /* |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 496 | * Splits num_nodes nodes up equally starting at node_start. The return value |
| 497 | * is the number of nodes split up and addr is adjusted to be at the end of the |
| 498 | * last node allocated. |
| 499 | */ |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 500 | static int __init split_nodes_equally(u64 *addr, u64 max_addr, int node_start, |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 501 | int num_nodes) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 502 | { |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 503 | unsigned int big; |
| 504 | u64 size; |
| 505 | int i; |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 506 | |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 507 | if (num_nodes <= 0) |
| 508 | return -1; |
| 509 | if (num_nodes > MAX_NUMNODES) |
| 510 | num_nodes = MAX_NUMNODES; |
David Rientjes | a7e9662 | 2007-07-21 17:11:29 +0200 | [diff] [blame] | 511 | size = (max_addr - *addr - e820_hole_size(*addr, max_addr)) / |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 512 | num_nodes; |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 513 | /* |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 514 | * Calculate the number of big nodes that can be allocated as a result |
| 515 | * of consolidating the leftovers. |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 516 | */ |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 517 | big = ((size & ~FAKE_NODE_MIN_HASH_MASK) * num_nodes) / |
| 518 | FAKE_NODE_MIN_SIZE; |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 519 | |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 520 | /* Round down to nearest FAKE_NODE_MIN_SIZE. */ |
| 521 | size &= FAKE_NODE_MIN_HASH_MASK; |
| 522 | if (!size) { |
| 523 | printk(KERN_ERR "Not enough memory for each node. " |
| 524 | "NUMA emulation disabled.\n"); |
| 525 | return -1; |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 526 | } |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 527 | |
| 528 | for (i = node_start; i < num_nodes + node_start; i++) { |
| 529 | u64 end = *addr + size; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 530 | |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 531 | if (i < big) |
| 532 | end += FAKE_NODE_MIN_SIZE; |
| 533 | /* |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 534 | * The final node can have the remaining system RAM. Other |
| 535 | * nodes receive roughly the same amount of available pages. |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 536 | */ |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 537 | if (i == num_nodes + node_start - 1) |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 538 | end = max_addr; |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 539 | else |
David Rientjes | a7e9662 | 2007-07-21 17:11:29 +0200 | [diff] [blame] | 540 | while (end - *addr - e820_hole_size(*addr, end) < |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 541 | size) { |
| 542 | end += FAKE_NODE_MIN_SIZE; |
| 543 | if (end > max_addr) { |
| 544 | end = max_addr; |
| 545 | break; |
| 546 | } |
| 547 | } |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 548 | if (setup_node_range(i, addr, end - *addr, max_addr) < 0) |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 549 | break; |
| 550 | } |
| 551 | return i - node_start + 1; |
| 552 | } |
| 553 | |
| 554 | /* |
David Rientjes | 382591d | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 555 | * Splits the remaining system RAM into chunks of size. The remaining memory is |
| 556 | * always assigned to a final node and can be asymmetric. Returns the number of |
| 557 | * nodes split. |
| 558 | */ |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 559 | static int __init split_nodes_by_size(u64 *addr, u64 max_addr, int node_start, |
| 560 | u64 size) |
David Rientjes | 382591d | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 561 | { |
| 562 | int i = node_start; |
| 563 | size = (size << 20) & FAKE_NODE_MIN_HASH_MASK; |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 564 | while (!setup_node_range(i++, addr, size, max_addr)) |
David Rientjes | 382591d | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 565 | ; |
| 566 | return i - node_start; |
| 567 | } |
| 568 | |
| 569 | /* |
Thomas Gleixner | 886533a | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 570 | * Sets up the system RAM area from start_pfn to last_pfn according to the |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 571 | * numa=fake command-line option. |
| 572 | */ |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 573 | static int __init numa_emulation(unsigned long start_pfn, |
| 574 | unsigned long last_pfn, int acpi, int k8) |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 575 | { |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 576 | u64 size, addr = start_pfn << PAGE_SHIFT; |
Thomas Gleixner | 886533a | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 577 | u64 max_addr = last_pfn << PAGE_SHIFT; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 578 | int num_nodes = 0, num = 0, coeff_flag, coeff = -1, i; |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 579 | int num_phys_nodes; |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 580 | |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 581 | num_phys_nodes = setup_physnodes(addr, max_addr, acpi, k8); |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 582 | /* |
| 583 | * If the numa=fake command-line is just a single number N, split the |
| 584 | * system RAM into N fake nodes. |
| 585 | */ |
| 586 | if (!strchr(cmdline, '*') && !strchr(cmdline, ',')) { |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 587 | long n = simple_strtol(cmdline, NULL, 0); |
| 588 | |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 589 | num_nodes = split_nodes_interleave(addr, max_addr, |
| 590 | num_phys_nodes, n); |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 591 | if (num_nodes < 0) |
| 592 | return num_nodes; |
| 593 | goto out; |
| 594 | } |
| 595 | |
| 596 | /* Parse the command line. */ |
David Rientjes | 382591d | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 597 | for (coeff_flag = 0; ; cmdline++) { |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 598 | if (*cmdline && isdigit(*cmdline)) { |
| 599 | num = num * 10 + *cmdline - '0'; |
| 600 | continue; |
| 601 | } |
David Rientjes | 382591d | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 602 | if (*cmdline == '*') { |
| 603 | if (num > 0) |
| 604 | coeff = num; |
| 605 | coeff_flag = 1; |
| 606 | } |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 607 | if (!*cmdline || *cmdline == ',') { |
David Rientjes | 382591d | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 608 | if (!coeff_flag) |
| 609 | coeff = 1; |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 610 | /* |
| 611 | * Round down to the nearest FAKE_NODE_MIN_SIZE. |
| 612 | * Command-line coefficients are in megabytes. |
| 613 | */ |
| 614 | size = ((u64)num << 20) & FAKE_NODE_MIN_HASH_MASK; |
David Rientjes | 382591d | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 615 | if (size) |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 616 | for (i = 0; i < coeff; i++, num_nodes++) |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 617 | if (setup_node_range(num_nodes, &addr, |
| 618 | size, max_addr) < 0) |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 619 | goto done; |
David Rientjes | 382591d | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 620 | if (!*cmdline) |
| 621 | break; |
| 622 | coeff_flag = 0; |
| 623 | coeff = -1; |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 624 | } |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 625 | num = 0; |
| 626 | } |
| 627 | done: |
| 628 | if (!num_nodes) |
| 629 | return -1; |
David Rientjes | 14694d7 | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 630 | /* Fill remainder of system RAM, if appropriate. */ |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 631 | if (addr < max_addr) { |
David Rientjes | 382591d | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 632 | if (coeff_flag && coeff < 0) { |
| 633 | /* Split remaining nodes into num-sized chunks */ |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 634 | num_nodes += split_nodes_by_size(&addr, max_addr, |
David Rientjes | 382591d | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 635 | num_nodes, num); |
| 636 | goto out; |
| 637 | } |
David Rientjes | 14694d7 | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 638 | switch (*(cmdline - 1)) { |
| 639 | case '*': |
| 640 | /* Split remaining nodes into coeff chunks */ |
| 641 | if (coeff <= 0) |
| 642 | break; |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 643 | num_nodes += split_nodes_equally(&addr, max_addr, |
David Rientjes | 14694d7 | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 644 | num_nodes, coeff); |
| 645 | break; |
| 646 | case ',': |
| 647 | /* Do not allocate remaining system RAM */ |
| 648 | break; |
| 649 | default: |
| 650 | /* Give one final node */ |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 651 | setup_node_range(num_nodes, &addr, max_addr - addr, |
| 652 | max_addr); |
David Rientjes | 14694d7 | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 653 | num_nodes++; |
| 654 | } |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 655 | } |
| 656 | out: |
Suresh Siddha | 6ec6e0d | 2008-03-25 10:14:35 -0700 | [diff] [blame] | 657 | memnode_shift = compute_hash_shift(nodes, num_nodes, NULL); |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 658 | if (memnode_shift < 0) { |
| 659 | memnode_shift = 0; |
| 660 | printk(KERN_ERR "No NUMA hash function found. NUMA emulation " |
| 661 | "disabled.\n"); |
| 662 | return -1; |
| 663 | } |
| 664 | |
| 665 | /* |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 666 | * We need to vacate all active ranges that may have been registered for |
| 667 | * the e820 memory map. |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 668 | */ |
| 669 | remove_all_active_ranges(); |
Suresh Siddha | e3f1cae | 2007-05-02 19:27:20 +0200 | [diff] [blame] | 670 | for_each_node_mask(i, node_possible_map) { |
Mel Gorman | 5cb248a | 2006-09-27 01:49:52 -0700 | [diff] [blame] | 671 | e820_register_active_regions(i, nodes[i].start >> PAGE_SHIFT, |
| 672 | nodes[i].end >> PAGE_SHIFT); |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 673 | setup_node_bootmem(i, nodes[i].start, nodes[i].end); |
Mel Gorman | 5cb248a | 2006-09-27 01:49:52 -0700 | [diff] [blame] | 674 | } |
David Rientjes | 3484d79 | 2007-07-21 17:10:32 +0200 | [diff] [blame] | 675 | acpi_fake_nodes(nodes, num_nodes); |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 676 | numa_init_array(); |
| 677 | return 0; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 678 | } |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 679 | #endif /* CONFIG_NUMA_EMU */ |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 680 | |
David Rientjes | 8ee2deb | 2009-09-25 15:20:00 -0700 | [diff] [blame] | 681 | void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn, |
| 682 | int acpi, int k8) |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 683 | { |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 684 | int i; |
| 685 | |
Suresh Siddha | e3f1cae | 2007-05-02 19:27:20 +0200 | [diff] [blame] | 686 | nodes_clear(node_possible_map); |
Yinghai Lu | b7ad149 | 2008-02-17 02:02:21 -0800 | [diff] [blame] | 687 | nodes_clear(node_online_map); |
Suresh Siddha | e3f1cae | 2007-05-02 19:27:20 +0200 | [diff] [blame] | 688 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 689 | #ifdef CONFIG_NUMA_EMU |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 690 | if (cmdline && !numa_emulation(start_pfn, last_pfn, acpi, k8)) |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 691 | return; |
Suresh Siddha | e3f1cae | 2007-05-02 19:27:20 +0200 | [diff] [blame] | 692 | nodes_clear(node_possible_map); |
Yinghai Lu | b7ad149 | 2008-02-17 02:02:21 -0800 | [diff] [blame] | 693 | nodes_clear(node_online_map); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 694 | #endif |
| 695 | |
| 696 | #ifdef CONFIG_ACPI_NUMA |
David Rientjes | 8716273 | 2009-09-25 15:20:04 -0700 | [diff] [blame] | 697 | if (!numa_off && acpi && !acpi_scan_nodes(start_pfn << PAGE_SHIFT, |
| 698 | last_pfn << PAGE_SHIFT)) |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 699 | return; |
Suresh Siddha | e3f1cae | 2007-05-02 19:27:20 +0200 | [diff] [blame] | 700 | nodes_clear(node_possible_map); |
Yinghai Lu | b7ad149 | 2008-02-17 02:02:21 -0800 | [diff] [blame] | 701 | nodes_clear(node_online_map); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 702 | #endif |
| 703 | |
| 704 | #ifdef CONFIG_K8_NUMA |
David Rientjes | 8ee2deb | 2009-09-25 15:20:00 -0700 | [diff] [blame] | 705 | if (!numa_off && k8 && !k8_scan_nodes()) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 706 | return; |
Suresh Siddha | e3f1cae | 2007-05-02 19:27:20 +0200 | [diff] [blame] | 707 | nodes_clear(node_possible_map); |
Yinghai Lu | b7ad149 | 2008-02-17 02:02:21 -0800 | [diff] [blame] | 708 | nodes_clear(node_online_map); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 709 | #endif |
| 710 | printk(KERN_INFO "%s\n", |
| 711 | numa_off ? "NUMA turned off" : "No NUMA configuration found"); |
| 712 | |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 713 | printk(KERN_INFO "Faking a node at %016lx-%016lx\n", |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 714 | start_pfn << PAGE_SHIFT, |
Thomas Gleixner | 886533a | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 715 | last_pfn << PAGE_SHIFT); |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 716 | /* setup dummy node covering all memory */ |
| 717 | memnode_shift = 63; |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 718 | memnodemap = memnode.embedded_map; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 719 | memnodemap[0] = 0; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 720 | node_set_online(0); |
Suresh Siddha | e3f1cae | 2007-05-02 19:27:20 +0200 | [diff] [blame] | 721 | node_set(0, node_possible_map); |
Mike Travis | 168ef54 | 2008-12-16 17:34:01 -0800 | [diff] [blame] | 722 | for (i = 0; i < nr_cpu_ids; i++) |
Andi Kleen | 69d81fc | 2005-11-05 17:25:53 +0100 | [diff] [blame] | 723 | numa_set_node(i, 0); |
Thomas Gleixner | 886533a | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 724 | e820_register_active_regions(0, start_pfn, last_pfn); |
| 725 | setup_node_bootmem(0, start_pfn << PAGE_SHIFT, last_pfn << PAGE_SHIFT); |
Andi Kleen | 69d81fc | 2005-11-05 17:25:53 +0100 | [diff] [blame] | 726 | } |
| 727 | |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 728 | unsigned long __init numa_free_all_bootmem(void) |
| 729 | { |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 730 | unsigned long pages = 0; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 731 | int i; |
| 732 | |
| 733 | for_each_online_node(i) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 734 | pages += free_all_bootmem_node(NODE_DATA(i)); |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 735 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 736 | return pages; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 737 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 738 | |
Andi Kleen | 2c8c0e6 | 2006-09-26 10:52:32 +0200 | [diff] [blame] | 739 | static __init int numa_setup(char *opt) |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 740 | { |
Andi Kleen | 2c8c0e6 | 2006-09-26 10:52:32 +0200 | [diff] [blame] | 741 | if (!opt) |
| 742 | return -EINVAL; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 743 | if (!strncmp(opt, "off", 3)) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 744 | numa_off = 1; |
| 745 | #ifdef CONFIG_NUMA_EMU |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 746 | if (!strncmp(opt, "fake=", 5)) |
| 747 | cmdline = opt + 5; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 748 | #endif |
| 749 | #ifdef CONFIG_ACPI_NUMA |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 750 | if (!strncmp(opt, "noacpi", 6)) |
| 751 | acpi_numa = -1; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 752 | #endif |
Andi Kleen | 2c8c0e6 | 2006-09-26 10:52:32 +0200 | [diff] [blame] | 753 | return 0; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 754 | } |
Andi Kleen | 2c8c0e6 | 2006-09-26 10:52:32 +0200 | [diff] [blame] | 755 | early_param("numa", numa_setup); |
| 756 | |
Mike Travis | 23ca4bb | 2008-05-12 21:21:12 +0200 | [diff] [blame] | 757 | #ifdef CONFIG_NUMA |
Yinghai Lu | d9c2d5a | 2009-11-21 00:23:37 -0800 | [diff] [blame] | 758 | |
| 759 | static __init int find_near_online_node(int node) |
| 760 | { |
| 761 | int n, val; |
| 762 | int min_val = INT_MAX; |
| 763 | int best_node = -1; |
| 764 | |
| 765 | for_each_online_node(n) { |
| 766 | val = node_distance(node, n); |
| 767 | |
| 768 | if (val < min_val) { |
| 769 | min_val = val; |
| 770 | best_node = n; |
| 771 | } |
| 772 | } |
| 773 | |
| 774 | return best_node; |
| 775 | } |
| 776 | |
Ravikiran Thirumalai | 05b3cbd | 2006-01-11 22:45:36 +0100 | [diff] [blame] | 777 | /* |
| 778 | * Setup early cpu_to_node. |
| 779 | * |
| 780 | * Populate cpu_to_node[] only if x86_cpu_to_apicid[], |
| 781 | * and apicid_to_node[] tables have valid entries for a CPU. |
| 782 | * This means we skip cpu_to_node[] initialisation for NUMA |
| 783 | * emulation and faking node case (when running a kernel compiled |
| 784 | * for NUMA on a non NUMA box), which is OK as cpu_to_node[] |
| 785 | * is already initialized in a round robin manner at numa_init_array, |
| 786 | * prior to this call, and this initialization is good enough |
| 787 | * for the fake NUMA cases. |
Mike Travis | 23ca4bb | 2008-05-12 21:21:12 +0200 | [diff] [blame] | 788 | * |
| 789 | * Called before the per_cpu areas are setup. |
Ravikiran Thirumalai | 05b3cbd | 2006-01-11 22:45:36 +0100 | [diff] [blame] | 790 | */ |
| 791 | void __init init_cpu_to_node(void) |
| 792 | { |
Mike Travis | 23ca4bb | 2008-05-12 21:21:12 +0200 | [diff] [blame] | 793 | int cpu; |
| 794 | u16 *cpu_to_apicid = early_per_cpu_ptr(x86_cpu_to_apicid); |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 795 | |
Mike Travis | 23ca4bb | 2008-05-12 21:21:12 +0200 | [diff] [blame] | 796 | BUG_ON(cpu_to_apicid == NULL); |
| 797 | |
| 798 | for_each_possible_cpu(cpu) { |
Yinghai Lu | 7c9e92b | 2008-02-19 15:35:54 -0800 | [diff] [blame] | 799 | int node; |
Mike Travis | 23ca4bb | 2008-05-12 21:21:12 +0200 | [diff] [blame] | 800 | u16 apicid = cpu_to_apicid[cpu]; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 801 | |
Ravikiran Thirumalai | 05b3cbd | 2006-01-11 22:45:36 +0100 | [diff] [blame] | 802 | if (apicid == BAD_APICID) |
| 803 | continue; |
Yinghai Lu | 7c9e92b | 2008-02-19 15:35:54 -0800 | [diff] [blame] | 804 | node = apicid_to_node[apicid]; |
| 805 | if (node == NUMA_NO_NODE) |
Ravikiran Thirumalai | 05b3cbd | 2006-01-11 22:45:36 +0100 | [diff] [blame] | 806 | continue; |
Yinghai Lu | 7c9e92b | 2008-02-19 15:35:54 -0800 | [diff] [blame] | 807 | if (!node_online(node)) |
Yinghai Lu | d9c2d5a | 2009-11-21 00:23:37 -0800 | [diff] [blame] | 808 | node = find_near_online_node(node); |
Mike Travis | 23ca4bb | 2008-05-12 21:21:12 +0200 | [diff] [blame] | 809 | numa_set_node(cpu, node); |
Ravikiran Thirumalai | 05b3cbd | 2006-01-11 22:45:36 +0100 | [diff] [blame] | 810 | } |
| 811 | } |
Mike Travis | 23ca4bb | 2008-05-12 21:21:12 +0200 | [diff] [blame] | 812 | #endif |
Ravikiran Thirumalai | 05b3cbd | 2006-01-11 22:45:36 +0100 | [diff] [blame] | 813 | |
Andi Kleen | cf05013 | 2006-01-11 22:46:27 +0100 | [diff] [blame] | 814 | |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 815 | void __cpuinit numa_set_node(int cpu, int node) |
| 816 | { |
| 817 | int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map); |
| 818 | |
| 819 | /* early setting, no percpu area yet */ |
| 820 | if (cpu_to_node_map) { |
| 821 | cpu_to_node_map[cpu] = node; |
| 822 | return; |
| 823 | } |
| 824 | |
| 825 | #ifdef CONFIG_DEBUG_PER_CPU_MAPS |
Brian Gerst | 44581a2 | 2009-02-08 09:58:40 -0500 | [diff] [blame] | 826 | if (cpu >= nr_cpu_ids || !cpu_possible(cpu)) { |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 827 | printk(KERN_ERR "numa_set_node: invalid cpu# (%d)\n", cpu); |
| 828 | dump_stack(); |
| 829 | return; |
| 830 | } |
| 831 | #endif |
| 832 | per_cpu(x86_cpu_to_node_map, cpu) = node; |
| 833 | |
| 834 | if (node != NUMA_NO_NODE) |
| 835 | per_cpu(node_number, cpu) = node; |
| 836 | } |
| 837 | |
| 838 | void __cpuinit numa_clear_node(int cpu) |
| 839 | { |
| 840 | numa_set_node(cpu, NUMA_NO_NODE); |
| 841 | } |
| 842 | |
| 843 | #ifndef CONFIG_DEBUG_PER_CPU_MAPS |
| 844 | |
| 845 | void __cpuinit numa_add_cpu(int cpu) |
| 846 | { |
Rusty Russell | c032ef60 | 2009-03-13 14:49:53 +1030 | [diff] [blame] | 847 | cpumask_set_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]); |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 848 | } |
| 849 | |
| 850 | void __cpuinit numa_remove_cpu(int cpu) |
| 851 | { |
Rusty Russell | c032ef60 | 2009-03-13 14:49:53 +1030 | [diff] [blame] | 852 | cpumask_clear_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]); |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 853 | } |
| 854 | |
| 855 | #else /* CONFIG_DEBUG_PER_CPU_MAPS */ |
| 856 | |
| 857 | /* |
| 858 | * --------- debug versions of the numa functions --------- |
| 859 | */ |
| 860 | static void __cpuinit numa_set_cpumask(int cpu, int enable) |
| 861 | { |
| 862 | int node = early_cpu_to_node(cpu); |
Rusty Russell | 73e907d | 2009-03-13 14:49:57 +1030 | [diff] [blame] | 863 | struct cpumask *mask; |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 864 | char buf[64]; |
| 865 | |
Rusty Russell | c032ef60 | 2009-03-13 14:49:53 +1030 | [diff] [blame] | 866 | mask = node_to_cpumask_map[node]; |
| 867 | if (mask == NULL) { |
| 868 | printk(KERN_ERR "node_to_cpumask_map[%i] NULL\n", node); |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 869 | dump_stack(); |
| 870 | return; |
| 871 | } |
| 872 | |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 873 | if (enable) |
Rusty Russell | c032ef60 | 2009-03-13 14:49:53 +1030 | [diff] [blame] | 874 | cpumask_set_cpu(cpu, mask); |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 875 | else |
Rusty Russell | c032ef60 | 2009-03-13 14:49:53 +1030 | [diff] [blame] | 876 | cpumask_clear_cpu(cpu, mask); |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 877 | |
| 878 | cpulist_scnprintf(buf, sizeof(buf), mask); |
| 879 | printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n", |
| 880 | enable ? "numa_add_cpu" : "numa_remove_cpu", cpu, node, buf); |
| 881 | } |
| 882 | |
| 883 | void __cpuinit numa_add_cpu(int cpu) |
| 884 | { |
| 885 | numa_set_cpumask(cpu, 1); |
| 886 | } |
| 887 | |
| 888 | void __cpuinit numa_remove_cpu(int cpu) |
| 889 | { |
| 890 | numa_set_cpumask(cpu, 0); |
| 891 | } |
| 892 | |
| 893 | int cpu_to_node(int cpu) |
| 894 | { |
| 895 | if (early_per_cpu_ptr(x86_cpu_to_node_map)) { |
| 896 | printk(KERN_WARNING |
| 897 | "cpu_to_node(%d): usage too early!\n", cpu); |
| 898 | dump_stack(); |
| 899 | return early_per_cpu_ptr(x86_cpu_to_node_map)[cpu]; |
| 900 | } |
| 901 | return per_cpu(x86_cpu_to_node_map, cpu); |
| 902 | } |
| 903 | EXPORT_SYMBOL(cpu_to_node); |
| 904 | |
| 905 | /* |
| 906 | * Same function as cpu_to_node() but used if called before the |
| 907 | * per_cpu areas are setup. |
| 908 | */ |
| 909 | int early_cpu_to_node(int cpu) |
| 910 | { |
| 911 | if (early_per_cpu_ptr(x86_cpu_to_node_map)) |
| 912 | return early_per_cpu_ptr(x86_cpu_to_node_map)[cpu]; |
| 913 | |
Brian Gerst | 44581a2 | 2009-02-08 09:58:40 -0500 | [diff] [blame] | 914 | if (!cpu_possible(cpu)) { |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 915 | printk(KERN_WARNING |
| 916 | "early_cpu_to_node(%d): no per_cpu area!\n", cpu); |
| 917 | dump_stack(); |
| 918 | return NUMA_NO_NODE; |
| 919 | } |
| 920 | return per_cpu(x86_cpu_to_node_map, cpu); |
| 921 | } |
| 922 | |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 923 | /* |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 924 | * --------- end of debug versions of the numa functions --------- |
| 925 | */ |
| 926 | |
| 927 | #endif /* CONFIG_DEBUG_PER_CPU_MAPS */ |