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> |
Yinghai Lu | 72d7c3b | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 10 | #include <linux/memblock.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 11 | #include <linux/mmzone.h> |
| 12 | #include <linux/ctype.h> |
| 13 | #include <linux/module.h> |
| 14 | #include <linux/nodemask.h> |
travis@sgi.com | 3cc87e3 | 2008-01-30 13:33:11 +0100 | [diff] [blame] | 15 | #include <linux/sched.h> |
Tejun Heo | d8fc3af | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 16 | #include <linux/acpi.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 17 | |
| 18 | #include <asm/e820.h> |
| 19 | #include <asm/proto.h> |
| 20 | #include <asm/dma.h> |
| 21 | #include <asm/numa.h> |
| 22 | #include <asm/acpi.h> |
Andreas Herrmann | 23ac4ae | 2010-09-17 18:03:43 +0200 | [diff] [blame] | 23 | #include <asm/amd_nb.h> |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 24 | |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 25 | struct numa_memblk { |
| 26 | u64 start; |
| 27 | u64 end; |
| 28 | int nid; |
| 29 | }; |
| 30 | |
| 31 | struct numa_meminfo { |
| 32 | int nr_blks; |
| 33 | struct numa_memblk blk[NR_NODE_MEMBLKS]; |
| 34 | }; |
| 35 | |
Ravikiran G Thirumalai | 6c231b7 | 2005-09-06 15:17:45 -0700 | [diff] [blame] | 36 | struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 37 | EXPORT_SYMBOL(node_data); |
| 38 | |
Tejun Heo | ec8cf29b | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 39 | nodemask_t cpu_nodes_parsed __initdata; |
| 40 | nodemask_t mem_nodes_parsed __initdata; |
| 41 | |
Eric Dumazet | dcf36bf | 2006-03-25 16:31:46 +0100 | [diff] [blame] | 42 | struct memnode memnode; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 43 | |
Thomas Gleixner | 864fc31 | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 44 | static unsigned long __initdata nodemap_addr; |
| 45 | static unsigned long __initdata nodemap_size; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 46 | |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 47 | static struct numa_meminfo numa_meminfo __initdata; |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 48 | |
Tejun Heo | 206e420 | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 49 | struct bootnode numa_nodes[MAX_NUMNODES] __initdata; |
| 50 | |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 51 | /* |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 52 | * Given a shift value, try to populate memnodemap[] |
| 53 | * Returns : |
| 54 | * 1 if OK |
| 55 | * 0 if memnodmap[] too small (of shift too small) |
| 56 | * -1 if node overlap or lost ram (shift too big) |
| 57 | */ |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 58 | static int __init populate_memnodemap(const struct numa_meminfo *mi, int shift) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 59 | { |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 60 | unsigned long addr, end; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 61 | int i, res = -1; |
Keith Mannthey | b684664 | 2005-07-28 21:15:38 -0700 | [diff] [blame] | 62 | |
travis@sgi.com | 4323838 | 2008-01-30 13:33:25 +0100 | [diff] [blame] | 63 | memset(memnodemap, 0xff, sizeof(s16)*memnodemapsize); |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 64 | for (i = 0; i < mi->nr_blks; i++) { |
| 65 | addr = mi->blk[i].start; |
| 66 | end = mi->blk[i].end; |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 67 | if (addr >= end) |
| 68 | continue; |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 69 | if ((end >> shift) >= memnodemapsize) |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 70 | return 0; |
| 71 | do { |
travis@sgi.com | 4323838 | 2008-01-30 13:33:25 +0100 | [diff] [blame] | 72 | if (memnodemap[addr >> shift] != NUMA_NO_NODE) |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 73 | return -1; |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 74 | memnodemap[addr >> shift] = mi->blk[i].nid; |
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 | dbef7b5 | 2010-12-27 16:48:08 -0800 | [diff] [blame] | 92 | nodemap_addr = memblock_find_in_range(addr, get_max_mapped(), |
Yinghai Lu | 24a5da7 | 2008-02-01 17:49:41 +0100 | [diff] [blame] | 93 | nodemap_size, L1_CACHE_BYTES); |
Yinghai Lu | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 94 | if (nodemap_addr == MEMBLOCK_ERROR) { |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 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 | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 101 | memblock_x86_reserve_range(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 | */ |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 112 | static int __init extract_lsb_from_nodes(const struct numa_meminfo *mi) |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 113 | { |
Amul Shah | 5441392 | 2007-02-13 13:26:20 +0100 | [diff] [blame] | 114 | int i, nodes_used = 0; |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 115 | unsigned long start, end; |
| 116 | unsigned long bitfield = 0, memtop = 0; |
| 117 | |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 118 | for (i = 0; i < mi->nr_blks; i++) { |
| 119 | start = mi->blk[i].start; |
| 120 | end = mi->blk[i].end; |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 121 | if (start >= end) |
| 122 | continue; |
Amul Shah | 5441392 | 2007-02-13 13:26:20 +0100 | [diff] [blame] | 123 | bitfield |= start; |
| 124 | nodes_used++; |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 125 | if (end > memtop) |
| 126 | memtop = end; |
| 127 | } |
Amul Shah | 5441392 | 2007-02-13 13:26:20 +0100 | [diff] [blame] | 128 | if (nodes_used <= 1) |
| 129 | i = 63; |
| 130 | else |
| 131 | i = find_first_bit(&bitfield, sizeof(unsigned long)*8); |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 132 | memnodemapsize = (memtop >> i)+1; |
| 133 | return i; |
| 134 | } |
| 135 | |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 136 | static int __init compute_hash_shift(const struct numa_meminfo *mi) |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 137 | { |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 138 | int shift; |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 139 | |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 140 | shift = extract_lsb_from_nodes(mi); |
Amul Shah | 076422d | 2007-02-13 13:26:19 +0100 | [diff] [blame] | 141 | if (allocate_cachealigned_memnodemap()) |
| 142 | return -1; |
Andi Kleen | 6b050f8 | 2006-01-11 22:44:33 +0100 | [diff] [blame] | 143 | printk(KERN_DEBUG "NUMA: Using %d for the hash shift.\n", |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 144 | shift); |
| 145 | |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 146 | if (populate_memnodemap(mi, shift) != 1) { |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 147 | printk(KERN_INFO "Your memory is not aligned you need to " |
| 148 | "rebuild your kernel with a bigger NODEMAPSIZE " |
| 149 | "shift=%d\n", shift); |
Eric Dumazet | 529a340 | 2005-11-05 17:25:54 +0100 | [diff] [blame] | 150 | return -1; |
| 151 | } |
Keith Mannthey | b684664 | 2005-07-28 21:15:38 -0700 | [diff] [blame] | 152 | return shift; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 153 | } |
| 154 | |
KAMEZAWA Hiroyuki | f2dbcfa | 2009-02-18 14:48:32 -0800 | [diff] [blame] | 155 | int __meminit __early_pfn_to_nid(unsigned long pfn) |
Matt Tolentino | bbfceef | 2005-06-23 00:08:07 -0700 | [diff] [blame] | 156 | { |
| 157 | return phys_to_nid(pfn << PAGE_SHIFT); |
| 158 | } |
Matt Tolentino | bbfceef | 2005-06-23 00:08:07 -0700 | [diff] [blame] | 159 | |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 160 | static void * __init early_node_mem(int nodeid, unsigned long start, |
Yinghai Lu | 24a5da7 | 2008-02-01 17:49:41 +0100 | [diff] [blame] | 161 | unsigned long end, unsigned long size, |
| 162 | unsigned long align) |
Andi Kleen | a806223 | 2006-04-07 19:49:21 +0200 | [diff] [blame] | 163 | { |
Yinghai Lu | cef625e | 2010-02-10 01:20:18 -0800 | [diff] [blame] | 164 | unsigned long mem; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 165 | |
Yinghai Lu | cef625e | 2010-02-10 01:20:18 -0800 | [diff] [blame] | 166 | /* |
| 167 | * put it on high as possible |
| 168 | * something will go with NODE_DATA |
| 169 | */ |
| 170 | if (start < (MAX_DMA_PFN<<PAGE_SHIFT)) |
| 171 | start = MAX_DMA_PFN<<PAGE_SHIFT; |
| 172 | if (start < (MAX_DMA32_PFN<<PAGE_SHIFT) && |
| 173 | end > (MAX_DMA32_PFN<<PAGE_SHIFT)) |
| 174 | start = MAX_DMA32_PFN<<PAGE_SHIFT; |
Yinghai Lu | 72d7c3b | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 175 | mem = memblock_x86_find_in_range_node(nodeid, start, end, size, align); |
| 176 | if (mem != MEMBLOCK_ERROR) |
Andi Kleen | a806223 | 2006-04-07 19:49:21 +0200 | [diff] [blame] | 177 | return __va(mem); |
Yinghai Lu | 9347e0b | 2008-02-01 17:49:42 +0100 | [diff] [blame] | 178 | |
Yinghai Lu | cef625e | 2010-02-10 01:20:18 -0800 | [diff] [blame] | 179 | /* extend the search scope */ |
| 180 | end = max_pfn_mapped << PAGE_SHIFT; |
Yinghai Lu | 419db27 | 2010-10-28 09:50:17 -0700 | [diff] [blame] | 181 | start = MAX_DMA_PFN << PAGE_SHIFT; |
| 182 | mem = memblock_find_in_range(start, end, size, align); |
Yinghai Lu | 72d7c3b | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 183 | if (mem != MEMBLOCK_ERROR) |
Yinghai Lu | 1842f90 | 2010-02-10 01:20:15 -0800 | [diff] [blame] | 184 | return __va(mem); |
| 185 | |
| 186 | printk(KERN_ERR "Cannot find %lu bytes in node %d\n", |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 187 | size, nodeid); |
Yinghai Lu | 1842f90 | 2010-02-10 01:20:15 -0800 | [diff] [blame] | 188 | |
| 189 | return NULL; |
Andi Kleen | a806223 | 2006-04-07 19:49:21 +0200 | [diff] [blame] | 190 | } |
| 191 | |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 192 | static __init int conflicting_memblks(unsigned long start, unsigned long end) |
| 193 | { |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 194 | struct numa_meminfo *mi = &numa_meminfo; |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 195 | int i; |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 196 | |
| 197 | for (i = 0; i < mi->nr_blks; i++) { |
| 198 | struct numa_memblk *blk = &mi->blk[i]; |
| 199 | |
| 200 | if (blk->start == blk->end) |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 201 | continue; |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 202 | if (blk->end > start && blk->start < end) |
| 203 | return blk->nid; |
| 204 | if (blk->end == end && blk->start == start) |
| 205 | return blk->nid; |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 206 | } |
| 207 | return -1; |
| 208 | } |
| 209 | |
| 210 | int __init numa_add_memblk(int nid, u64 start, u64 end) |
| 211 | { |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 212 | struct numa_meminfo *mi = &numa_meminfo; |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 213 | int i; |
| 214 | |
| 215 | i = conflicting_memblks(start, end); |
| 216 | if (i == nid) { |
| 217 | printk(KERN_WARNING "NUMA: Warning: node %d (%Lx-%Lx) overlaps with itself (%Lx-%Lx)\n", |
| 218 | nid, start, end, numa_nodes[i].start, numa_nodes[i].end); |
| 219 | } else if (i >= 0) { |
| 220 | printk(KERN_ERR "NUMA: node %d (%Lx-%Lx) overlaps with node %d (%Lx-%Lx)\n", |
| 221 | nid, start, end, i, |
| 222 | numa_nodes[i].start, numa_nodes[i].end); |
| 223 | return -EINVAL; |
| 224 | } |
| 225 | |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 226 | mi->blk[mi->nr_blks].start = start; |
| 227 | mi->blk[mi->nr_blks].end = end; |
| 228 | mi->blk[mi->nr_blks].nid = nid; |
| 229 | mi->nr_blks++; |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 230 | return 0; |
| 231 | } |
| 232 | |
Tejun Heo | 206e420 | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 233 | static __init void cutoff_node(int i, unsigned long start, unsigned long end) |
| 234 | { |
| 235 | struct bootnode *nd = &numa_nodes[i]; |
| 236 | |
| 237 | if (nd->start < start) { |
| 238 | nd->start = start; |
| 239 | if (nd->end < nd->start) |
| 240 | nd->start = nd->end; |
| 241 | } |
| 242 | if (nd->end > end) { |
| 243 | nd->end = end; |
| 244 | if (nd->start > nd->end) |
| 245 | nd->start = nd->end; |
| 246 | } |
| 247 | } |
| 248 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 249 | /* Initialize bootmem allocator for a node */ |
Yinghai Lu | 7c43769 | 2009-05-15 13:59:37 -0700 | [diff] [blame] | 250 | void __init |
| 251 | setup_node_bootmem(int nodeid, unsigned long start, unsigned long end) |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 252 | { |
Yinghai Lu | 0867721 | 2010-02-10 01:20:20 -0800 | [diff] [blame] | 253 | unsigned long start_pfn, last_pfn, nodedata_phys; |
Yinghai Lu | 7c43769 | 2009-05-15 13:59:37 -0700 | [diff] [blame] | 254 | const int pgdat_size = roundup(sizeof(pg_data_t), PAGE_SIZE); |
Yinghai Lu | 1a27fc0 | 2008-03-18 12:52:37 -0700 | [diff] [blame] | 255 | int nid; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 256 | |
Yinghai Lu | 4c31e92 | 2009-04-22 14:19:27 -0700 | [diff] [blame] | 257 | if (!end) |
| 258 | return; |
| 259 | |
Yinghai Lu | 7c43769 | 2009-05-15 13:59:37 -0700 | [diff] [blame] | 260 | /* |
| 261 | * Don't confuse VM with a node that doesn't have the |
| 262 | * minimum amount of memory: |
| 263 | */ |
| 264 | if (end && (end - start) < NODE_MIN_SIZE) |
| 265 | return; |
| 266 | |
Joerg Roedel | be3e89e | 2008-07-25 16:48:58 +0200 | [diff] [blame] | 267 | start = roundup(start, ZONE_ALIGN); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 268 | |
Yinghai Lu | 0867721 | 2010-02-10 01:20:20 -0800 | [diff] [blame] | 269 | printk(KERN_INFO "Initmem setup node %d %016lx-%016lx\n", nodeid, |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 270 | start, end); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 271 | |
| 272 | start_pfn = start >> PAGE_SHIFT; |
Thomas Gleixner | 886533a | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 273 | last_pfn = end >> PAGE_SHIFT; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 274 | |
Yinghai Lu | 24a5da7 | 2008-02-01 17:49:41 +0100 | [diff] [blame] | 275 | node_data[nodeid] = early_node_mem(nodeid, start, end, pgdat_size, |
| 276 | SMP_CACHE_BYTES); |
Andi Kleen | a806223 | 2006-04-07 19:49:21 +0200 | [diff] [blame] | 277 | if (node_data[nodeid] == NULL) |
| 278 | return; |
| 279 | nodedata_phys = __pa(node_data[nodeid]); |
Yinghai Lu | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 280 | memblock_x86_reserve_range(nodedata_phys, nodedata_phys + pgdat_size, "NODE_DATA"); |
Yinghai Lu | 6118f76 | 2008-02-04 16:47:56 +0100 | [diff] [blame] | 281 | printk(KERN_INFO " NODE_DATA [%016lx - %016lx]\n", nodedata_phys, |
| 282 | nodedata_phys + pgdat_size - 1); |
Yinghai Lu | 1842f90 | 2010-02-10 01:20:15 -0800 | [diff] [blame] | 283 | nid = phys_to_nid(nodedata_phys); |
| 284 | if (nid != nodeid) |
| 285 | printk(KERN_INFO " NODE_DATA(%d) on node %d\n", nodeid, nid); |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 286 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 287 | memset(NODE_DATA(nodeid), 0, sizeof(pg_data_t)); |
Yinghai Lu | 0867721 | 2010-02-10 01:20:20 -0800 | [diff] [blame] | 288 | NODE_DATA(nodeid)->node_id = nodeid; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 289 | NODE_DATA(nodeid)->node_start_pfn = start_pfn; |
Thomas Gleixner | 886533a | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 290 | NODE_DATA(nodeid)->node_spanned_pages = last_pfn - start_pfn; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 291 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 292 | node_set_online(nodeid); |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 293 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 294 | |
Tejun Heo | fd0435d | 2011-02-16 17:11:08 +0100 | [diff] [blame] | 295 | /* |
| 296 | * Sanity check to catch more bad NUMA configurations (they are amazingly |
| 297 | * common). Make sure the nodes cover all memory. |
| 298 | */ |
| 299 | static int __init nodes_cover_memory(const struct bootnode *nodes) |
| 300 | { |
| 301 | unsigned long numaram, e820ram; |
| 302 | int i; |
| 303 | |
| 304 | numaram = 0; |
| 305 | for_each_node_mask(i, mem_nodes_parsed) { |
| 306 | unsigned long s = nodes[i].start >> PAGE_SHIFT; |
| 307 | unsigned long e = nodes[i].end >> PAGE_SHIFT; |
| 308 | numaram += e - s; |
| 309 | numaram -= __absent_pages_in_range(i, s, e); |
| 310 | if ((long)numaram < 0) |
| 311 | numaram = 0; |
| 312 | } |
| 313 | |
| 314 | e820ram = max_pfn - |
| 315 | (memblock_x86_hole_size(0, max_pfn<<PAGE_SHIFT) >> PAGE_SHIFT); |
| 316 | /* We seem to lose 3 pages somewhere. Allow 1M of slack. */ |
| 317 | if ((long)(e820ram - numaram) >= (1<<(20 - PAGE_SHIFT))) { |
| 318 | printk(KERN_ERR "NUMA: nodes only cover %luMB of your %luMB e820 RAM. Not used.\n", |
| 319 | (numaram << PAGE_SHIFT) >> 20, |
| 320 | (e820ram << PAGE_SHIFT) >> 20); |
| 321 | return 0; |
| 322 | } |
| 323 | return 1; |
| 324 | } |
| 325 | |
Tejun Heo | 43a662f | 2011-02-16 17:11:08 +0100 | [diff] [blame] | 326 | static int __init numa_register_memblks(void) |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 327 | { |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 328 | struct numa_meminfo *mi = &numa_meminfo; |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 329 | int i; |
| 330 | |
| 331 | /* |
| 332 | * Join together blocks on the same node, holes between |
| 333 | * which don't overlap with memory on other nodes. |
| 334 | */ |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 335 | for (i = 0; i < mi->nr_blks; ++i) { |
| 336 | struct numa_memblk *bi = &mi->blk[i]; |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 337 | int j, k; |
| 338 | |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 339 | for (j = i + 1; j < mi->nr_blks; ++j) { |
| 340 | struct numa_memblk *bj = &mi->blk[j]; |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 341 | unsigned long start, end; |
| 342 | |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 343 | if (bi->nid != bj->nid) |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 344 | continue; |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 345 | start = min(bi->end, bj->end); |
| 346 | end = max(bi->start, bj->start); |
| 347 | for (k = 0; k < mi->nr_blks; ++k) { |
| 348 | struct numa_memblk *bk = &mi->blk[k]; |
| 349 | |
| 350 | if (bi->nid == bk->nid) |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 351 | continue; |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 352 | if (start < bk->end && end > bk->start) |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 353 | break; |
| 354 | } |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 355 | if (k < mi->nr_blks) |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 356 | continue; |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 357 | start = min(bi->start, bj->start); |
| 358 | end = max(bi->end, bj->end); |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 359 | printk(KERN_INFO "NUMA: Node %d [%Lx,%Lx) + [%Lx,%Lx) -> [%lx,%lx)\n", |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 360 | bi->nid, bi->start, bi->end, bj->start, bj->end, |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 361 | start, end); |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 362 | bi->start = start; |
| 363 | bi->end = end; |
| 364 | k = --mi->nr_blks - j; |
| 365 | memmove(mi->blk + j, mi->blk + j + 1, |
| 366 | k * sizeof(mi->blk[0])); |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 367 | --j; |
| 368 | } |
| 369 | } |
| 370 | |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 371 | memnode_shift = compute_hash_shift(mi); |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 372 | if (memnode_shift < 0) { |
| 373 | printk(KERN_ERR "NUMA: No NUMA node hash function found. Contact maintainer\n"); |
| 374 | return -EINVAL; |
| 375 | } |
| 376 | |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 377 | for (i = 0; i < mi->nr_blks; i++) |
| 378 | memblock_x86_register_active_regions(mi->blk[i].nid, |
| 379 | mi->blk[i].start >> PAGE_SHIFT, |
| 380 | mi->blk[i].end >> PAGE_SHIFT); |
Tejun Heo | fd0435d | 2011-02-16 17:11:08 +0100 | [diff] [blame] | 381 | |
| 382 | /* for out of order entries */ |
| 383 | sort_node_map(); |
| 384 | if (!nodes_cover_memory(numa_nodes)) |
| 385 | return -EINVAL; |
| 386 | |
| 387 | init_memory_mapping_high(); |
| 388 | |
| 389 | /* Finally register nodes. */ |
| 390 | for_each_node_mask(i, node_possible_map) |
| 391 | setup_node_bootmem(i, numa_nodes[i].start, numa_nodes[i].end); |
| 392 | |
| 393 | /* |
| 394 | * Try again in case setup_node_bootmem missed one due to missing |
| 395 | * bootmem. |
| 396 | */ |
| 397 | for_each_node_mask(i, node_possible_map) |
| 398 | if (!node_online(i)) |
| 399 | setup_node_bootmem(i, numa_nodes[i].start, |
| 400 | numa_nodes[i].end); |
| 401 | |
Tejun Heo | ef396ec | 2011-02-16 17:11:07 +0100 | [diff] [blame] | 402 | return 0; |
| 403 | } |
| 404 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 405 | #ifdef CONFIG_NUMA_EMU |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 406 | /* Numa emulation */ |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 407 | static struct bootnode nodes[MAX_NUMNODES] __initdata; |
David Rientjes | c1c3443 | 2010-12-22 17:23:54 -0800 | [diff] [blame] | 408 | static struct bootnode physnodes[MAX_NUMNODES] __cpuinitdata; |
Thomas Gleixner | 864fc31 | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 409 | static char *cmdline __initdata; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 410 | |
Jan Beulich | 9032160 | 2011-01-19 08:57:21 +0000 | [diff] [blame] | 411 | void __init numa_emu_cmdline(char *str) |
| 412 | { |
| 413 | cmdline = str; |
| 414 | } |
| 415 | |
Tejun Heo | 19095548 | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 416 | static int __init setup_physnodes(unsigned long start, unsigned long end) |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 417 | { |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 418 | int ret = 0; |
| 419 | int i; |
| 420 | |
David Rientjes | c1c3443 | 2010-12-22 17:23:54 -0800 | [diff] [blame] | 421 | memset(physnodes, 0, sizeof(physnodes)); |
Tejun Heo | 19095548 | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 422 | |
| 423 | for_each_node_mask(i, mem_nodes_parsed) { |
| 424 | physnodes[i].start = numa_nodes[i].start; |
| 425 | physnodes[i].end = numa_nodes[i].end; |
| 426 | } |
| 427 | |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 428 | /* |
| 429 | * Basic sanity checking on the physical node map: there may be errors |
Hans Rosenfeld | eec1d4f | 2010-10-29 17:14:30 +0200 | [diff] [blame] | 430 | * if the SRAT or AMD code incorrectly reported the topology or the mem= |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 431 | * kernel parameter is used. |
| 432 | */ |
David Rientjes | a387e95 | 2010-12-22 17:23:56 -0800 | [diff] [blame] | 433 | for (i = 0; i < MAX_NUMNODES; i++) { |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 434 | if (physnodes[i].start == physnodes[i].end) |
| 435 | continue; |
| 436 | if (physnodes[i].start > end) { |
| 437 | physnodes[i].end = physnodes[i].start; |
| 438 | continue; |
| 439 | } |
| 440 | if (physnodes[i].end < start) { |
| 441 | physnodes[i].start = physnodes[i].end; |
| 442 | continue; |
| 443 | } |
| 444 | if (physnodes[i].start < start) |
| 445 | physnodes[i].start = start; |
| 446 | if (physnodes[i].end > end) |
| 447 | physnodes[i].end = end; |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 448 | ret++; |
| 449 | } |
| 450 | |
| 451 | /* |
| 452 | * If no physical topology was detected, a single node is faked to cover |
| 453 | * the entire address space. |
| 454 | */ |
| 455 | if (!ret) { |
| 456 | physnodes[ret].start = start; |
| 457 | physnodes[ret].end = end; |
| 458 | ret = 1; |
| 459 | } |
| 460 | return ret; |
| 461 | } |
| 462 | |
David Rientjes | f51bf30 | 2010-12-22 17:23:51 -0800 | [diff] [blame] | 463 | static void __init fake_physnodes(int acpi, int amd, int nr_nodes) |
| 464 | { |
| 465 | int i; |
| 466 | |
| 467 | BUG_ON(acpi && amd); |
| 468 | #ifdef CONFIG_ACPI_NUMA |
| 469 | if (acpi) |
| 470 | acpi_fake_nodes(nodes, nr_nodes); |
| 471 | #endif |
| 472 | #ifdef CONFIG_AMD_NUMA |
| 473 | if (amd) |
| 474 | amd_fake_nodes(nodes, nr_nodes); |
| 475 | #endif |
| 476 | if (!acpi && !amd) |
| 477 | for (i = 0; i < nr_cpu_ids; i++) |
| 478 | numa_set_node(i, 0); |
| 479 | } |
| 480 | |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 481 | /* |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 482 | * Setups up nid to range from addr to addr + size. If the end |
| 483 | * boundary is greater than max_addr, then max_addr is used instead. |
| 484 | * The return value is 0 if there is additional memory left for |
| 485 | * allocation past addr and -1 otherwise. addr is adjusted to be at |
| 486 | * the end of the node. |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 487 | */ |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 488 | 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] | 489 | { |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 490 | int ret = 0; |
| 491 | nodes[nid].start = *addr; |
| 492 | *addr += size; |
| 493 | if (*addr >= max_addr) { |
| 494 | *addr = max_addr; |
| 495 | ret = -1; |
| 496 | } |
| 497 | nodes[nid].end = *addr; |
Suresh Siddha | e3f1cae | 2007-05-02 19:27:20 +0200 | [diff] [blame] | 498 | node_set(nid, node_possible_map); |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 499 | printk(KERN_INFO "Faking node %d at %016Lx-%016Lx (%LuMB)\n", nid, |
| 500 | nodes[nid].start, nodes[nid].end, |
| 501 | (nodes[nid].end - nodes[nid].start) >> 20); |
| 502 | return ret; |
Rohit Seth | 53fee04 | 2007-02-13 13:26:22 +0100 | [diff] [blame] | 503 | } |
| 504 | |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 505 | /* |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 506 | * Sets up nr_nodes fake nodes interleaved over physical nodes ranging from addr |
| 507 | * to max_addr. The return value is the number of nodes allocated. |
| 508 | */ |
David Rientjes | c1c3443 | 2010-12-22 17:23:54 -0800 | [diff] [blame] | 509 | static int __init split_nodes_interleave(u64 addr, u64 max_addr, int nr_nodes) |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 510 | { |
| 511 | nodemask_t physnode_mask = NODE_MASK_NONE; |
| 512 | u64 size; |
| 513 | int big; |
| 514 | int ret = 0; |
| 515 | int i; |
| 516 | |
| 517 | if (nr_nodes <= 0) |
| 518 | return -1; |
| 519 | if (nr_nodes > MAX_NUMNODES) { |
| 520 | pr_info("numa=fake=%d too large, reducing to %d\n", |
| 521 | nr_nodes, MAX_NUMNODES); |
| 522 | nr_nodes = MAX_NUMNODES; |
| 523 | } |
| 524 | |
Yinghai Lu | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 525 | size = (max_addr - addr - memblock_x86_hole_size(addr, max_addr)) / nr_nodes; |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 526 | /* |
| 527 | * Calculate the number of big nodes that can be allocated as a result |
| 528 | * of consolidating the remainder. |
| 529 | */ |
David Rientjes | 68fd111 | 2010-02-15 13:43:25 -0800 | [diff] [blame] | 530 | big = ((size & ~FAKE_NODE_MIN_HASH_MASK) * nr_nodes) / |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 531 | FAKE_NODE_MIN_SIZE; |
| 532 | |
| 533 | size &= FAKE_NODE_MIN_HASH_MASK; |
| 534 | if (!size) { |
| 535 | pr_err("Not enough memory for each node. " |
| 536 | "NUMA emulation disabled.\n"); |
| 537 | return -1; |
| 538 | } |
| 539 | |
David Rientjes | c1c3443 | 2010-12-22 17:23:54 -0800 | [diff] [blame] | 540 | for (i = 0; i < MAX_NUMNODES; i++) |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 541 | if (physnodes[i].start != physnodes[i].end) |
| 542 | node_set(i, physnode_mask); |
| 543 | |
| 544 | /* |
| 545 | * Continue to fill physical nodes with fake nodes until there is no |
| 546 | * memory left on any of them. |
| 547 | */ |
| 548 | while (nodes_weight(physnode_mask)) { |
| 549 | for_each_node_mask(i, physnode_mask) { |
| 550 | u64 end = physnodes[i].start + size; |
| 551 | u64 dma32_end = PFN_PHYS(MAX_DMA32_PFN); |
| 552 | |
| 553 | if (ret < big) |
| 554 | end += FAKE_NODE_MIN_SIZE; |
| 555 | |
| 556 | /* |
| 557 | * Continue to add memory to this fake node if its |
| 558 | * non-reserved memory is less than the per-node size. |
| 559 | */ |
| 560 | while (end - physnodes[i].start - |
Yinghai Lu | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 561 | memblock_x86_hole_size(physnodes[i].start, end) < size) { |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 562 | end += FAKE_NODE_MIN_SIZE; |
| 563 | if (end > physnodes[i].end) { |
| 564 | end = physnodes[i].end; |
| 565 | break; |
| 566 | } |
| 567 | } |
| 568 | |
| 569 | /* |
| 570 | * If there won't be at least FAKE_NODE_MIN_SIZE of |
| 571 | * non-reserved memory in ZONE_DMA32 for the next node, |
| 572 | * this one must extend to the boundary. |
| 573 | */ |
| 574 | if (end < dma32_end && dma32_end - end - |
Yinghai Lu | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 575 | memblock_x86_hole_size(end, dma32_end) < FAKE_NODE_MIN_SIZE) |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 576 | end = dma32_end; |
| 577 | |
| 578 | /* |
| 579 | * If there won't be enough non-reserved memory for the |
| 580 | * next node, this one must extend to the end of the |
| 581 | * physical node. |
| 582 | */ |
| 583 | if (physnodes[i].end - end - |
Yinghai Lu | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 584 | memblock_x86_hole_size(end, physnodes[i].end) < size) |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 585 | end = physnodes[i].end; |
| 586 | |
| 587 | /* |
| 588 | * Avoid allocating more nodes than requested, which can |
| 589 | * happen as a result of rounding down each node's size |
| 590 | * to FAKE_NODE_MIN_SIZE. |
| 591 | */ |
| 592 | if (nodes_weight(physnode_mask) + ret >= nr_nodes) |
| 593 | end = physnodes[i].end; |
| 594 | |
| 595 | if (setup_node_range(ret++, &physnodes[i].start, |
| 596 | end - physnodes[i].start, |
| 597 | physnodes[i].end) < 0) |
| 598 | node_clear(i, physnode_mask); |
| 599 | } |
| 600 | } |
| 601 | return ret; |
| 602 | } |
| 603 | |
| 604 | /* |
David Rientjes | 8df5bb34 | 2010-02-15 13:43:30 -0800 | [diff] [blame] | 605 | * Returns the end address of a node so that there is at least `size' amount of |
| 606 | * non-reserved memory or `max_addr' is reached. |
| 607 | */ |
| 608 | static u64 __init find_end_of_node(u64 start, u64 max_addr, u64 size) |
| 609 | { |
| 610 | u64 end = start + size; |
| 611 | |
Yinghai Lu | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 612 | while (end - start - memblock_x86_hole_size(start, end) < size) { |
David Rientjes | 8df5bb34 | 2010-02-15 13:43:30 -0800 | [diff] [blame] | 613 | end += FAKE_NODE_MIN_SIZE; |
| 614 | if (end > max_addr) { |
| 615 | end = max_addr; |
| 616 | break; |
| 617 | } |
| 618 | } |
| 619 | return end; |
| 620 | } |
| 621 | |
| 622 | /* |
| 623 | * Sets up fake nodes of `size' interleaved over physical nodes ranging from |
| 624 | * `addr' to `max_addr'. The return value is the number of nodes allocated. |
| 625 | */ |
| 626 | static int __init split_nodes_size_interleave(u64 addr, u64 max_addr, u64 size) |
| 627 | { |
| 628 | nodemask_t physnode_mask = NODE_MASK_NONE; |
| 629 | u64 min_size; |
| 630 | int ret = 0; |
| 631 | int i; |
| 632 | |
| 633 | if (!size) |
| 634 | return -1; |
| 635 | /* |
| 636 | * The limit on emulated nodes is MAX_NUMNODES, so the size per node is |
| 637 | * increased accordingly if the requested size is too small. This |
| 638 | * creates a uniform distribution of node sizes across the entire |
| 639 | * machine (but not necessarily over physical nodes). |
| 640 | */ |
Yinghai Lu | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 641 | min_size = (max_addr - addr - memblock_x86_hole_size(addr, max_addr)) / |
David Rientjes | 8df5bb34 | 2010-02-15 13:43:30 -0800 | [diff] [blame] | 642 | MAX_NUMNODES; |
| 643 | min_size = max(min_size, FAKE_NODE_MIN_SIZE); |
| 644 | if ((min_size & FAKE_NODE_MIN_HASH_MASK) < min_size) |
| 645 | min_size = (min_size + FAKE_NODE_MIN_SIZE) & |
| 646 | FAKE_NODE_MIN_HASH_MASK; |
| 647 | if (size < min_size) { |
| 648 | pr_err("Fake node size %LuMB too small, increasing to %LuMB\n", |
| 649 | size >> 20, min_size >> 20); |
| 650 | size = min_size; |
| 651 | } |
| 652 | size &= FAKE_NODE_MIN_HASH_MASK; |
| 653 | |
| 654 | for (i = 0; i < MAX_NUMNODES; i++) |
| 655 | if (physnodes[i].start != physnodes[i].end) |
| 656 | node_set(i, physnode_mask); |
| 657 | /* |
| 658 | * Fill physical nodes with fake nodes of size until there is no memory |
| 659 | * left on any of them. |
| 660 | */ |
| 661 | while (nodes_weight(physnode_mask)) { |
| 662 | for_each_node_mask(i, physnode_mask) { |
| 663 | u64 dma32_end = MAX_DMA32_PFN << PAGE_SHIFT; |
| 664 | u64 end; |
| 665 | |
| 666 | end = find_end_of_node(physnodes[i].start, |
| 667 | physnodes[i].end, size); |
| 668 | /* |
| 669 | * If there won't be at least FAKE_NODE_MIN_SIZE of |
| 670 | * non-reserved memory in ZONE_DMA32 for the next node, |
| 671 | * this one must extend to the boundary. |
| 672 | */ |
| 673 | if (end < dma32_end && dma32_end - end - |
Yinghai Lu | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 674 | memblock_x86_hole_size(end, dma32_end) < FAKE_NODE_MIN_SIZE) |
David Rientjes | 8df5bb34 | 2010-02-15 13:43:30 -0800 | [diff] [blame] | 675 | end = dma32_end; |
| 676 | |
| 677 | /* |
| 678 | * If there won't be enough non-reserved memory for the |
| 679 | * next node, this one must extend to the end of the |
| 680 | * physical node. |
| 681 | */ |
| 682 | if (physnodes[i].end - end - |
Yinghai Lu | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 683 | memblock_x86_hole_size(end, physnodes[i].end) < size) |
David Rientjes | 8df5bb34 | 2010-02-15 13:43:30 -0800 | [diff] [blame] | 684 | end = physnodes[i].end; |
| 685 | |
| 686 | /* |
| 687 | * Setup the fake node that will be allocated as bootmem |
| 688 | * later. If setup_node_range() returns non-zero, there |
| 689 | * is no more memory available on this physical node. |
| 690 | */ |
| 691 | if (setup_node_range(ret++, &physnodes[i].start, |
| 692 | end - physnodes[i].start, |
| 693 | physnodes[i].end) < 0) |
| 694 | node_clear(i, physnode_mask); |
| 695 | } |
| 696 | } |
| 697 | return ret; |
| 698 | } |
| 699 | |
| 700 | /* |
Thomas Gleixner | 886533a | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 701 | * 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] | 702 | * numa=fake command-line option. |
| 703 | */ |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 704 | static int __init numa_emulation(unsigned long start_pfn, |
Hans Rosenfeld | eec1d4f | 2010-10-29 17:14:30 +0200 | [diff] [blame] | 705 | unsigned long last_pfn, int acpi, int amd) |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 706 | { |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 707 | static struct numa_meminfo ei __initdata; |
David Rientjes | ca2107c | 2010-02-15 13:43:33 -0800 | [diff] [blame] | 708 | u64 addr = start_pfn << PAGE_SHIFT; |
Thomas Gleixner | 886533a | 2008-05-12 15:43:36 +0200 | [diff] [blame] | 709 | u64 max_addr = last_pfn << PAGE_SHIFT; |
David Rientjes | ca2107c | 2010-02-15 13:43:33 -0800 | [diff] [blame] | 710 | int num_nodes; |
| 711 | int i; |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 712 | |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 713 | /* |
David Rientjes | 8df5bb34 | 2010-02-15 13:43:30 -0800 | [diff] [blame] | 714 | * If the numa=fake command-line contains a 'M' or 'G', it represents |
David Rientjes | ca2107c | 2010-02-15 13:43:33 -0800 | [diff] [blame] | 715 | * the fixed node size. Otherwise, if it is just a single number N, |
| 716 | * split the system RAM into N fake nodes. |
David Rientjes | 8df5bb34 | 2010-02-15 13:43:30 -0800 | [diff] [blame] | 717 | */ |
| 718 | if (strchr(cmdline, 'M') || strchr(cmdline, 'G')) { |
David Rientjes | ca2107c | 2010-02-15 13:43:33 -0800 | [diff] [blame] | 719 | u64 size; |
| 720 | |
David Rientjes | 8df5bb34 | 2010-02-15 13:43:30 -0800 | [diff] [blame] | 721 | size = memparse(cmdline, &cmdline); |
| 722 | num_nodes = split_nodes_size_interleave(addr, max_addr, size); |
David Rientjes | ca2107c | 2010-02-15 13:43:33 -0800 | [diff] [blame] | 723 | } else { |
| 724 | unsigned long n; |
| 725 | |
| 726 | n = simple_strtoul(cmdline, NULL, 0); |
David Rientjes | c1c3443 | 2010-12-22 17:23:54 -0800 | [diff] [blame] | 727 | num_nodes = split_nodes_interleave(addr, max_addr, n); |
David Rientjes | 8df5bb34 | 2010-02-15 13:43:30 -0800 | [diff] [blame] | 728 | } |
| 729 | |
David Rientjes | ca2107c | 2010-02-15 13:43:33 -0800 | [diff] [blame] | 730 | if (num_nodes < 0) |
| 731 | return num_nodes; |
Tejun Heo | 8968dab | 2011-02-16 17:11:08 +0100 | [diff] [blame] | 732 | |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 733 | ei.nr_blks = num_nodes; |
| 734 | for (i = 0; i < ei.nr_blks; i++) { |
| 735 | ei.blk[i].start = nodes[i].start; |
| 736 | ei.blk[i].end = nodes[i].end; |
| 737 | ei.blk[i].nid = i; |
| 738 | } |
Tejun Heo | 8968dab | 2011-02-16 17:11:08 +0100 | [diff] [blame] | 739 | |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 740 | memnode_shift = compute_hash_shift(&ei); |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 741 | if (memnode_shift < 0) { |
| 742 | memnode_shift = 0; |
| 743 | printk(KERN_ERR "No NUMA hash function found. NUMA emulation " |
| 744 | "disabled.\n"); |
| 745 | return -1; |
| 746 | } |
| 747 | |
| 748 | /* |
David Rientjes | adc1938 | 2009-09-25 15:20:09 -0700 | [diff] [blame] | 749 | * We need to vacate all active ranges that may have been registered for |
| 750 | * the e820 memory map. |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 751 | */ |
| 752 | remove_all_active_ranges(); |
Yinghai Lu | 1411e0e | 2010-12-27 16:48:17 -0800 | [diff] [blame] | 753 | for_each_node_mask(i, node_possible_map) |
Yinghai Lu | a9ce6bc | 2010-08-25 13:39:17 -0700 | [diff] [blame] | 754 | memblock_x86_register_active_regions(i, nodes[i].start >> PAGE_SHIFT, |
Mel Gorman | 5cb248a | 2006-09-27 01:49:52 -0700 | [diff] [blame] | 755 | nodes[i].end >> PAGE_SHIFT); |
Yinghai Lu | 1411e0e | 2010-12-27 16:48:17 -0800 | [diff] [blame] | 756 | init_memory_mapping_high(); |
| 757 | for_each_node_mask(i, node_possible_map) |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 758 | setup_node_bootmem(i, nodes[i].start, nodes[i].end); |
Tejun Heo | 19095548 | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 759 | setup_physnodes(addr, max_addr); |
David Rientjes | f51bf30 | 2010-12-22 17:23:51 -0800 | [diff] [blame] | 760 | fake_physnodes(acpi, amd, num_nodes); |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 761 | numa_init_array(); |
| 762 | return 0; |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 763 | } |
David Rientjes | 8b8ca80e | 2007-05-02 19:27:09 +0200 | [diff] [blame] | 764 | #endif /* CONFIG_NUMA_EMU */ |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 765 | |
Tejun Heo | ffe77a4 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 766 | static int dummy_numa_init(void) |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 767 | { |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 768 | printk(KERN_INFO "%s\n", |
| 769 | numa_off ? "NUMA turned off" : "No NUMA configuration found"); |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 770 | printk(KERN_INFO "Faking a node at %016lx-%016lx\n", |
Tejun Heo | 86ef4db | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 771 | 0LU, max_pfn << PAGE_SHIFT); |
Tejun Heo | ffe77a4 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 772 | |
Tejun Heo | ec8cf29b | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 773 | node_set(0, cpu_nodes_parsed); |
| 774 | node_set(0, mem_nodes_parsed); |
Tejun Heo | 43a662f | 2011-02-16 17:11:08 +0100 | [diff] [blame] | 775 | numa_add_memblk(0, 0, (u64)max_pfn << PAGE_SHIFT); |
Tejun Heo | fd0435d | 2011-02-16 17:11:08 +0100 | [diff] [blame] | 776 | numa_nodes[0].start = 0; |
| 777 | numa_nodes[0].end = (u64)max_pfn << PAGE_SHIFT; |
Tejun Heo | ec8cf29b | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 778 | |
| 779 | return 0; |
| 780 | } |
| 781 | |
Tejun Heo | ffe77a4 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 782 | void __init initmem_init(void) |
| 783 | { |
| 784 | int (*numa_init[])(void) = { [2] = dummy_numa_init }; |
Tejun Heo | ffe77a4 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 785 | int i, j; |
| 786 | |
| 787 | if (!numa_off) { |
| 788 | #ifdef CONFIG_ACPI_NUMA |
| 789 | numa_init[0] = x86_acpi_numa_init; |
Tejun Heo | ffe77a4 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 790 | #endif |
| 791 | #ifdef CONFIG_AMD_NUMA |
| 792 | numa_init[1] = amd_numa_init; |
Tejun Heo | ffe77a4 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 793 | #endif |
| 794 | } |
| 795 | |
| 796 | for (i = 0; i < ARRAY_SIZE(numa_init); i++) { |
| 797 | if (!numa_init[i]) |
| 798 | continue; |
| 799 | |
| 800 | for (j = 0; j < MAX_LOCAL_APIC; j++) |
| 801 | set_apicid_to_node(j, NUMA_NO_NODE); |
| 802 | |
Tejun Heo | ec8cf29b | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 803 | nodes_clear(cpu_nodes_parsed); |
| 804 | nodes_clear(mem_nodes_parsed); |
Tejun Heo | ffe77a4 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 805 | nodes_clear(node_possible_map); |
| 806 | nodes_clear(node_online_map); |
Tejun Heo | 97e7b78 | 2011-02-16 17:11:08 +0100 | [diff] [blame^] | 807 | memset(&numa_meminfo, 0, sizeof(numa_meminfo)); |
Tejun Heo | 206e420 | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 808 | memset(numa_nodes, 0, sizeof(numa_nodes)); |
Tejun Heo | fd0435d | 2011-02-16 17:11:08 +0100 | [diff] [blame] | 809 | remove_all_active_ranges(); |
Tejun Heo | ffe77a4 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 810 | |
| 811 | if (numa_init[i]() < 0) |
| 812 | continue; |
Tejun Heo | 206e420 | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 813 | |
| 814 | /* clean up the node list */ |
| 815 | for (j = 0; j < MAX_NUMNODES; j++) |
| 816 | cutoff_node(j, 0, max_pfn << PAGE_SHIFT); |
| 817 | |
Tejun Heo | ffe77a4 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 818 | #ifdef CONFIG_NUMA_EMU |
Tejun Heo | 19095548 | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 819 | setup_physnodes(0, max_pfn << PAGE_SHIFT); |
Tejun Heo | ffe77a4 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 820 | if (cmdline && !numa_emulation(0, max_pfn, i == 0, i == 1)) |
| 821 | return; |
Tejun Heo | 19095548 | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 822 | setup_physnodes(0, max_pfn << PAGE_SHIFT); |
Tejun Heo | ffe77a4 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 823 | nodes_clear(node_possible_map); |
| 824 | nodes_clear(node_online_map); |
| 825 | #endif |
Tejun Heo | ec8cf29b | 2011-02-16 12:13:07 +0100 | [diff] [blame] | 826 | /* Account for nodes with cpus and no memory */ |
| 827 | nodes_or(node_possible_map, mem_nodes_parsed, cpu_nodes_parsed); |
| 828 | if (WARN_ON(nodes_empty(node_possible_map))) |
| 829 | continue; |
| 830 | |
Tejun Heo | 43a662f | 2011-02-16 17:11:08 +0100 | [diff] [blame] | 831 | if (numa_register_memblks() < 0) |
| 832 | continue; |
| 833 | |
Tejun Heo | fd0435d | 2011-02-16 17:11:08 +0100 | [diff] [blame] | 834 | for (j = 0; j < nr_cpu_ids; j++) { |
| 835 | int nid = early_cpu_to_node(j); |
| 836 | |
| 837 | if (nid == NUMA_NO_NODE) |
| 838 | continue; |
| 839 | if (!node_online(nid)) |
| 840 | numa_clear_node(j); |
| 841 | } |
| 842 | numa_init_array(); |
| 843 | return; |
Tejun Heo | ffe77a4 | 2011-02-16 12:13:06 +0100 | [diff] [blame] | 844 | } |
| 845 | BUG(); |
Andi Kleen | 69d81fc | 2005-11-05 17:25:53 +0100 | [diff] [blame] | 846 | } |
| 847 | |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 848 | unsigned long __init numa_free_all_bootmem(void) |
| 849 | { |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 850 | unsigned long pages = 0; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 851 | int i; |
| 852 | |
| 853 | for_each_online_node(i) |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 854 | pages += free_all_bootmem_node(NODE_DATA(i)); |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 855 | |
Yinghai Lu | 0867721 | 2010-02-10 01:20:20 -0800 | [diff] [blame] | 856 | pages += free_all_memory_core_early(MAX_NUMNODES); |
Yinghai Lu | 0867721 | 2010-02-10 01:20:20 -0800 | [diff] [blame] | 857 | |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 858 | return pages; |
Thomas Gleixner | e3cfe52 | 2008-01-30 13:30:37 +0100 | [diff] [blame] | 859 | } |
Linus Torvalds | 1da177e | 2005-04-16 15:20:36 -0700 | [diff] [blame] | 860 | |
Tejun Heo | bbc9e2f | 2011-01-23 14:37:39 +0100 | [diff] [blame] | 861 | int __cpuinit numa_cpu_node(int cpu) |
Yinghai Lu | d9c2d5a | 2009-11-21 00:23:37 -0800 | [diff] [blame] | 862 | { |
Tejun Heo | bbc9e2f | 2011-01-23 14:37:39 +0100 | [diff] [blame] | 863 | int apicid = early_per_cpu(x86_cpu_to_apicid, cpu); |
Yinghai Lu | d9c2d5a | 2009-11-21 00:23:37 -0800 | [diff] [blame] | 864 | |
Tejun Heo | bbc9e2f | 2011-01-23 14:37:39 +0100 | [diff] [blame] | 865 | if (apicid != BAD_APICID) |
| 866 | return __apicid_to_node[apicid]; |
| 867 | return NUMA_NO_NODE; |
Yinghai Lu | d9c2d5a | 2009-11-21 00:23:37 -0800 | [diff] [blame] | 868 | } |
| 869 | |
Ravikiran Thirumalai | 05b3cbd | 2006-01-11 22:45:36 +0100 | [diff] [blame] | 870 | /* |
Tejun Heo | de2d944 | 2011-01-23 14:37:41 +0100 | [diff] [blame] | 871 | * UGLINESS AHEAD: Currently, CONFIG_NUMA_EMU is 64bit only and makes use |
| 872 | * of 64bit specific data structures. The distinction is artificial and |
| 873 | * should be removed. numa_{add|remove}_cpu() are implemented in numa.c |
| 874 | * for both 32 and 64bit when CONFIG_NUMA_EMU is disabled but here when |
| 875 | * enabled. |
Ravikiran Thirumalai | 05b3cbd | 2006-01-11 22:45:36 +0100 | [diff] [blame] | 876 | * |
Tejun Heo | de2d944 | 2011-01-23 14:37:41 +0100 | [diff] [blame] | 877 | * NUMA emulation is planned to be made generic and the following and other |
| 878 | * related code should be moved to numa.c. |
Ravikiran Thirumalai | 05b3cbd | 2006-01-11 22:45:36 +0100 | [diff] [blame] | 879 | */ |
Tejun Heo | de2d944 | 2011-01-23 14:37:41 +0100 | [diff] [blame] | 880 | #ifdef CONFIG_NUMA_EMU |
| 881 | # ifndef CONFIG_DEBUG_PER_CPU_MAPS |
David Rientjes | c1c3443 | 2010-12-22 17:23:54 -0800 | [diff] [blame] | 882 | void __cpuinit numa_add_cpu(int cpu) |
| 883 | { |
| 884 | unsigned long addr; |
Tejun Heo | bbc9e2f | 2011-01-23 14:37:39 +0100 | [diff] [blame] | 885 | int physnid, nid; |
David Rientjes | c1c3443 | 2010-12-22 17:23:54 -0800 | [diff] [blame] | 886 | |
Tejun Heo | bbc9e2f | 2011-01-23 14:37:39 +0100 | [diff] [blame] | 887 | nid = numa_cpu_node(cpu); |
David Rientjes | c1c3443 | 2010-12-22 17:23:54 -0800 | [diff] [blame] | 888 | if (nid == NUMA_NO_NODE) |
| 889 | nid = early_cpu_to_node(cpu); |
| 890 | BUG_ON(nid == NUMA_NO_NODE || !node_online(nid)); |
| 891 | |
| 892 | /* |
| 893 | * Use the starting address of the emulated node to find which physical |
| 894 | * node it is allocated on. |
| 895 | */ |
| 896 | addr = node_start_pfn(nid) << PAGE_SHIFT; |
| 897 | for (physnid = 0; physnid < MAX_NUMNODES; physnid++) |
| 898 | if (addr >= physnodes[physnid].start && |
| 899 | addr < physnodes[physnid].end) |
| 900 | break; |
| 901 | |
| 902 | /* |
| 903 | * Map the cpu to each emulated node that is allocated on the physical |
| 904 | * node of the cpu's apic id. |
| 905 | */ |
| 906 | for_each_online_node(nid) { |
| 907 | addr = node_start_pfn(nid) << PAGE_SHIFT; |
| 908 | if (addr >= physnodes[physnid].start && |
| 909 | addr < physnodes[physnid].end) |
| 910 | cpumask_set_cpu(cpu, node_to_cpumask_map[nid]); |
| 911 | } |
| 912 | } |
| 913 | |
| 914 | void __cpuinit numa_remove_cpu(int cpu) |
| 915 | { |
| 916 | int i; |
| 917 | |
| 918 | for_each_online_node(i) |
| 919 | cpumask_clear_cpu(cpu, node_to_cpumask_map[i]); |
| 920 | } |
Tejun Heo | de2d944 | 2011-01-23 14:37:41 +0100 | [diff] [blame] | 921 | # else /* !CONFIG_DEBUG_PER_CPU_MAPS */ |
David Rientjes | d906f0e | 2010-12-30 10:54:16 -0800 | [diff] [blame] | 922 | static void __cpuinit numa_set_cpumask(int cpu, int enable) |
| 923 | { |
| 924 | int node = early_cpu_to_node(cpu); |
| 925 | struct cpumask *mask; |
David Rientjes | c1c3443 | 2010-12-22 17:23:54 -0800 | [diff] [blame] | 926 | int i; |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 927 | |
David Rientjes | 14392fd | 2011-02-07 14:08:53 -0800 | [diff] [blame] | 928 | if (node == NUMA_NO_NODE) { |
| 929 | /* early_cpu_to_node() already emits a warning and trace */ |
| 930 | return; |
| 931 | } |
David Rientjes | c1c3443 | 2010-12-22 17:23:54 -0800 | [diff] [blame] | 932 | for_each_online_node(i) { |
| 933 | unsigned long addr; |
| 934 | |
| 935 | addr = node_start_pfn(i) << PAGE_SHIFT; |
| 936 | if (addr < physnodes[node].start || |
| 937 | addr >= physnodes[node].end) |
| 938 | continue; |
David Rientjes | d906f0e | 2010-12-30 10:54:16 -0800 | [diff] [blame] | 939 | mask = debug_cpumask_set_cpu(cpu, enable); |
| 940 | if (!mask) |
David Rientjes | c1c3443 | 2010-12-22 17:23:54 -0800 | [diff] [blame] | 941 | return; |
David Rientjes | c1c3443 | 2010-12-22 17:23:54 -0800 | [diff] [blame] | 942 | |
| 943 | if (enable) |
| 944 | cpumask_set_cpu(cpu, mask); |
| 945 | else |
| 946 | cpumask_clear_cpu(cpu, mask); |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 947 | } |
Brian Gerst | 6470aff | 2009-01-27 12:56:47 +0900 | [diff] [blame] | 948 | } |
| 949 | |
| 950 | void __cpuinit numa_add_cpu(int cpu) |
| 951 | { |
| 952 | numa_set_cpumask(cpu, 1); |
| 953 | } |
| 954 | |
| 955 | void __cpuinit numa_remove_cpu(int cpu) |
| 956 | { |
| 957 | numa_set_cpumask(cpu, 0); |
| 958 | } |
Tejun Heo | de2d944 | 2011-01-23 14:37:41 +0100 | [diff] [blame] | 959 | # endif /* !CONFIG_DEBUG_PER_CPU_MAPS */ |
| 960 | #endif /* CONFIG_NUMA_EMU */ |