blob: a7bcc23ef96c989f5fef986cbd7816dfd551d20e [file] [log] [blame]
Thomas Gleixnere3cfe522008-01-30 13:30:37 +01001/*
Linus Torvalds1da177e2005-04-16 15:20:36 -07002 * Generic VM initialization for x86-64 NUMA setups.
3 * Copyright 2002,2003 Andi Kleen, SuSE Labs.
Thomas Gleixnere3cfe522008-01-30 13:30:37 +01004 */
Linus Torvalds1da177e2005-04-16 15:20:36 -07005#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.com3cc87e32008-01-30 13:33:11 +010014#include <linux/sched.h>
Linus Torvalds1da177e2005-04-16 15:20:36 -070015
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 Gleixnerc9ff0342008-01-30 13:30:16 +010021#include <asm/k8.h>
Linus Torvalds1da177e2005-04-16 15:20:36 -070022
Ravikiran G Thirumalai6c231b72005-09-06 15:17:45 -070023struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +010024EXPORT_SYMBOL(node_data);
25
Eric Dumazetdcf36bf2006-03-25 16:31:46 +010026struct memnode memnode;
Linus Torvalds1da177e2005-04-16 15:20:36 -070027
travis@sgi.com43238382008-01-30 13:33:25 +010028s16 apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = {
Thomas Gleixnere3cfe522008-01-30 13:30:37 +010029 [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE
Andi Kleen3f098c22005-09-12 18:49:24 +020030};
Thomas Gleixnere3cfe522008-01-30 13:30:37 +010031
Linus Torvalds1da177e2005-04-16 15:20:36 -070032int numa_off __initdata;
Thomas Gleixner864fc312008-05-12 15:43:36 +020033static unsigned long __initdata nodemap_addr;
34static unsigned long __initdata nodemap_size;
Linus Torvalds1da177e2005-04-16 15:20:36 -070035
Brian Gerst6470aff2009-01-27 12:56:47 +090036/*
37 * Map cpu index to node index
38 */
39DEFINE_EARLY_PER_CPU(int, x86_cpu_to_node_map, NUMA_NO_NODE);
40EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_node_map);
41
42/*
Eric Dumazet529a3402005-11-05 17:25:54 +010043 * Given a shift value, try to populate memnodemap[]
44 * Returns :
45 * 1 if OK
46 * 0 if memnodmap[] too small (of shift too small)
47 * -1 if node overlap or lost ram (shift too big)
48 */
Thomas Gleixnere3cfe522008-01-30 13:30:37 +010049static int __init populate_memnodemap(const struct bootnode *nodes,
Suresh Siddha6ec6e0d2008-03-25 10:14:35 -070050 int numnodes, int shift, int *nodeids)
Linus Torvalds1da177e2005-04-16 15:20:36 -070051{
Eric Dumazet529a3402005-11-05 17:25:54 +010052 unsigned long addr, end;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +010053 int i, res = -1;
Keith Manntheyb6846642005-07-28 21:15:38 -070054
travis@sgi.com43238382008-01-30 13:33:25 +010055 memset(memnodemap, 0xff, sizeof(s16)*memnodemapsize);
Eric Dumazet529a3402005-11-05 17:25:54 +010056 for (i = 0; i < numnodes; i++) {
57 addr = nodes[i].start;
58 end = nodes[i].end;
59 if (addr >= end)
60 continue;
Amul Shah076422d22007-02-13 13:26:19 +010061 if ((end >> shift) >= memnodemapsize)
Eric Dumazet529a3402005-11-05 17:25:54 +010062 return 0;
63 do {
travis@sgi.com43238382008-01-30 13:33:25 +010064 if (memnodemap[addr >> shift] != NUMA_NO_NODE)
Eric Dumazet529a3402005-11-05 17:25:54 +010065 return -1;
Suresh Siddha6ec6e0d2008-03-25 10:14:35 -070066
67 if (!nodeids)
68 memnodemap[addr >> shift] = i;
69 else
70 memnodemap[addr >> shift] = nodeids[i];
71
Amul Shah076422d22007-02-13 13:26:19 +010072 addr += (1UL << shift);
Eric Dumazet529a3402005-11-05 17:25:54 +010073 } while (addr < end);
74 res = 1;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +010075 }
Eric Dumazet529a3402005-11-05 17:25:54 +010076 return res;
77}
78
Amul Shah076422d22007-02-13 13:26:19 +010079static int __init allocate_cachealigned_memnodemap(void)
80{
Yinghai Lu24a5da72008-02-01 17:49:41 +010081 unsigned long addr;
Amul Shah076422d22007-02-13 13:26:19 +010082
83 memnodemap = memnode.embedded_map;
travis@sgi.com316390b2008-01-30 13:33:15 +010084 if (memnodemapsize <= ARRAY_SIZE(memnode.embedded_map))
Amul Shah076422d22007-02-13 13:26:19 +010085 return 0;
Amul Shah076422d22007-02-13 13:26:19 +010086
Yinghai Lu24a5da72008-02-01 17:49:41 +010087 addr = 0x8000;
Joerg Roedelbe3e89e2008-07-25 16:48:58 +020088 nodemap_size = roundup(sizeof(s16) * memnodemapsize, L1_CACHE_BYTES);
Yinghai Luc987d122008-06-24 22:14:09 -070089 nodemap_addr = find_e820_area(addr, max_pfn<<PAGE_SHIFT,
Yinghai Lu24a5da72008-02-01 17:49:41 +010090 nodemap_size, L1_CACHE_BYTES);
Amul Shah076422d22007-02-13 13:26:19 +010091 if (nodemap_addr == -1UL) {
92 printk(KERN_ERR
93 "NUMA: Unable to allocate Memory to Node hash map\n");
94 nodemap_addr = nodemap_size = 0;
95 return -1;
96 }
Yinghai Lu24a5da72008-02-01 17:49:41 +010097 memnodemap = phys_to_virt(nodemap_addr);
Yinghai Lu25eff8d2008-02-01 17:49:41 +010098 reserve_early(nodemap_addr, nodemap_addr + nodemap_size, "MEMNODEMAP");
Amul Shah076422d22007-02-13 13:26:19 +010099
100 printk(KERN_DEBUG "NUMA: Allocated memnodemap from %lx - %lx\n",
101 nodemap_addr, nodemap_addr + nodemap_size);
102 return 0;
103}
104
105/*
106 * The LSB of all start and end addresses in the node map is the value of the
107 * maximum possible shift.
108 */
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100109static int __init extract_lsb_from_nodes(const struct bootnode *nodes,
110 int numnodes)
Amul Shah076422d22007-02-13 13:26:19 +0100111{
Amul Shah54413922007-02-13 13:26:20 +0100112 int i, nodes_used = 0;
Amul Shah076422d22007-02-13 13:26:19 +0100113 unsigned long start, end;
114 unsigned long bitfield = 0, memtop = 0;
115
116 for (i = 0; i < numnodes; i++) {
117 start = nodes[i].start;
118 end = nodes[i].end;
119 if (start >= end)
120 continue;
Amul Shah54413922007-02-13 13:26:20 +0100121 bitfield |= start;
122 nodes_used++;
Amul Shah076422d22007-02-13 13:26:19 +0100123 if (end > memtop)
124 memtop = end;
125 }
Amul Shah54413922007-02-13 13:26:20 +0100126 if (nodes_used <= 1)
127 i = 63;
128 else
129 i = find_first_bit(&bitfield, sizeof(unsigned long)*8);
Amul Shah076422d22007-02-13 13:26:19 +0100130 memnodemapsize = (memtop >> i)+1;
131 return i;
132}
133
Suresh Siddha6ec6e0d2008-03-25 10:14:35 -0700134int __init compute_hash_shift(struct bootnode *nodes, int numnodes,
135 int *nodeids)
Eric Dumazet529a3402005-11-05 17:25:54 +0100136{
Amul Shah076422d22007-02-13 13:26:19 +0100137 int shift;
Eric Dumazet529a3402005-11-05 17:25:54 +0100138
Amul Shah076422d22007-02-13 13:26:19 +0100139 shift = extract_lsb_from_nodes(nodes, numnodes);
140 if (allocate_cachealigned_memnodemap())
141 return -1;
Andi Kleen6b050f82006-01-11 22:44:33 +0100142 printk(KERN_DEBUG "NUMA: Using %d for the hash shift.\n",
Eric Dumazet529a3402005-11-05 17:25:54 +0100143 shift);
144
Suresh Siddha6ec6e0d2008-03-25 10:14:35 -0700145 if (populate_memnodemap(nodes, numnodes, shift, nodeids) != 1) {
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100146 printk(KERN_INFO "Your memory is not aligned you need to "
147 "rebuild your kernel with a bigger NODEMAPSIZE "
148 "shift=%d\n", shift);
Eric Dumazet529a3402005-11-05 17:25:54 +0100149 return -1;
150 }
Keith Manntheyb6846642005-07-28 21:15:38 -0700151 return shift;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700152}
153
KAMEZAWA Hiroyukif2dbcfa2009-02-18 14:48:32 -0800154int __meminit __early_pfn_to_nid(unsigned long pfn)
Matt Tolentinobbfceef2005-06-23 00:08:07 -0700155{
156 return phys_to_nid(pfn << PAGE_SHIFT);
157}
Matt Tolentinobbfceef2005-06-23 00:08:07 -0700158
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100159static void * __init early_node_mem(int nodeid, unsigned long start,
Yinghai Lu24a5da72008-02-01 17:49:41 +0100160 unsigned long end, unsigned long size,
161 unsigned long align)
Andi Kleena8062232006-04-07 19:49:21 +0200162{
Yinghai Lucef625e2010-02-10 01:20:18 -0800163 unsigned long mem;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100164
Yinghai Lucef625e2010-02-10 01:20:18 -0800165 /*
166 * put it on high as possible
167 * something will go with NODE_DATA
168 */
169 if (start < (MAX_DMA_PFN<<PAGE_SHIFT))
170 start = MAX_DMA_PFN<<PAGE_SHIFT;
171 if (start < (MAX_DMA32_PFN<<PAGE_SHIFT) &&
172 end > (MAX_DMA32_PFN<<PAGE_SHIFT))
173 start = MAX_DMA32_PFN<<PAGE_SHIFT;
174 mem = find_e820_area(start, end, size, align);
Yinghai Lu9347e0b2008-02-01 17:49:42 +0100175 if (mem != -1L)
Andi Kleena8062232006-04-07 19:49:21 +0200176 return __va(mem);
Yinghai Lu9347e0b2008-02-01 17:49:42 +0100177
Yinghai Lucef625e2010-02-10 01:20:18 -0800178 /* extend the search scope */
179 end = max_pfn_mapped << PAGE_SHIFT;
180 if (end > (MAX_DMA32_PFN<<PAGE_SHIFT))
181 start = MAX_DMA32_PFN<<PAGE_SHIFT;
182 else
183 start = MAX_DMA_PFN<<PAGE_SHIFT;
Yinghai Lu1842f902010-02-10 01:20:15 -0800184 mem = find_e820_area(start, end, size, align);
185 if (mem != -1L)
186 return __va(mem);
187
188 printk(KERN_ERR "Cannot find %lu bytes in node %d\n",
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100189 size, nodeid);
Yinghai Lu1842f902010-02-10 01:20:15 -0800190
191 return NULL;
Andi Kleena8062232006-04-07 19:49:21 +0200192}
193
Linus Torvalds1da177e2005-04-16 15:20:36 -0700194/* Initialize bootmem allocator for a node */
Yinghai Lu7c437692009-05-15 13:59:37 -0700195void __init
196setup_node_bootmem(int nodeid, unsigned long start, unsigned long end)
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100197{
Yinghai Lu08677212010-02-10 01:20:20 -0800198 unsigned long start_pfn, last_pfn, nodedata_phys;
Yinghai Lu7c437692009-05-15 13:59:37 -0700199 const int pgdat_size = roundup(sizeof(pg_data_t), PAGE_SIZE);
Yinghai Lu1a27fc02008-03-18 12:52:37 -0700200 int nid;
Yinghai Lu08677212010-02-10 01:20:20 -0800201#ifndef CONFIG_NO_BOOTMEM
202 unsigned long bootmap_start, bootmap_pages, bootmap_size;
203 void *bootmap;
204#endif
Linus Torvalds1da177e2005-04-16 15:20:36 -0700205
Yinghai Lu4c31e922009-04-22 14:19:27 -0700206 if (!end)
207 return;
208
Yinghai Lu7c437692009-05-15 13:59:37 -0700209 /*
210 * Don't confuse VM with a node that doesn't have the
211 * minimum amount of memory:
212 */
213 if (end && (end - start) < NODE_MIN_SIZE)
214 return;
215
Joerg Roedelbe3e89e2008-07-25 16:48:58 +0200216 start = roundup(start, ZONE_ALIGN);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700217
Yinghai Lu08677212010-02-10 01:20:20 -0800218 printk(KERN_INFO "Initmem setup node %d %016lx-%016lx\n", nodeid,
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100219 start, end);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700220
221 start_pfn = start >> PAGE_SHIFT;
Thomas Gleixner886533a2008-05-12 15:43:36 +0200222 last_pfn = end >> PAGE_SHIFT;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700223
Yinghai Lu24a5da72008-02-01 17:49:41 +0100224 node_data[nodeid] = early_node_mem(nodeid, start, end, pgdat_size,
225 SMP_CACHE_BYTES);
Andi Kleena8062232006-04-07 19:49:21 +0200226 if (node_data[nodeid] == NULL)
227 return;
228 nodedata_phys = __pa(node_data[nodeid]);
Yinghai Lu1842f902010-02-10 01:20:15 -0800229 reserve_early(nodedata_phys, nodedata_phys + pgdat_size, "NODE_DATA");
Yinghai Lu6118f762008-02-04 16:47:56 +0100230 printk(KERN_INFO " NODE_DATA [%016lx - %016lx]\n", nodedata_phys,
231 nodedata_phys + pgdat_size - 1);
Yinghai Lu1842f902010-02-10 01:20:15 -0800232 nid = phys_to_nid(nodedata_phys);
233 if (nid != nodeid)
234 printk(KERN_INFO " NODE_DATA(%d) on node %d\n", nodeid, nid);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700235
Linus Torvalds1da177e2005-04-16 15:20:36 -0700236 memset(NODE_DATA(nodeid), 0, sizeof(pg_data_t));
Yinghai Lu08677212010-02-10 01:20:20 -0800237 NODE_DATA(nodeid)->node_id = nodeid;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700238 NODE_DATA(nodeid)->node_start_pfn = start_pfn;
Thomas Gleixner886533a2008-05-12 15:43:36 +0200239 NODE_DATA(nodeid)->node_spanned_pages = last_pfn - start_pfn;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700240
Yinghai Lu08677212010-02-10 01:20:20 -0800241#ifndef CONFIG_NO_BOOTMEM
242 NODE_DATA(nodeid)->bdata = &bootmem_node_data[nodeid];
243
Yinghai Lu1a27fc02008-03-18 12:52:37 -0700244 /*
245 * Find a place for the bootmem map
246 * nodedata_phys could be on other nodes by alloc_bootmem,
247 * so need to sure bootmap_start not to be small, otherwise
248 * early_node_mem will get that with find_e820_area instead
249 * of alloc_bootmem, that could clash with reserved range
250 */
Thomas Gleixner886533a2008-05-12 15:43:36 +0200251 bootmap_pages = bootmem_bootmap_pages(last_pfn - start_pfn);
Yinghai Lu1842f902010-02-10 01:20:15 -0800252 bootmap_start = roundup(nodedata_phys + pgdat_size, PAGE_SIZE);
Yinghai Lu24a5da72008-02-01 17:49:41 +0100253 /*
Paul Jacksone9197bf2008-05-14 08:15:10 -0700254 * SMP_CACHE_BYTES could be enough, but init_bootmem_node like
Yinghai Lu24a5da72008-02-01 17:49:41 +0100255 * to use that to align to PAGE_SIZE
256 */
Andi Kleena8062232006-04-07 19:49:21 +0200257 bootmap = early_node_mem(nodeid, bootmap_start, end,
Yinghai Lu24a5da72008-02-01 17:49:41 +0100258 bootmap_pages<<PAGE_SHIFT, PAGE_SIZE);
Andi Kleena8062232006-04-07 19:49:21 +0200259 if (bootmap == NULL) {
Yinghai Lu1842f902010-02-10 01:20:15 -0800260 free_early(nodedata_phys, nodedata_phys + pgdat_size);
Andi Kleena8062232006-04-07 19:49:21 +0200261 node_data[nodeid] = NULL;
262 return;
263 }
264 bootmap_start = __pa(bootmap);
Yinghai Lu1842f902010-02-10 01:20:15 -0800265 reserve_early(bootmap_start, bootmap_start+(bootmap_pages<<PAGE_SHIFT),
266 "BOOTMAP");
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100267
Linus Torvalds1da177e2005-04-16 15:20:36 -0700268 bootmap_size = init_bootmem_node(NODE_DATA(nodeid),
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100269 bootmap_start >> PAGE_SHIFT,
Thomas Gleixner886533a2008-05-12 15:43:36 +0200270 start_pfn, last_pfn);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700271
Yinghai Lu6118f762008-02-04 16:47:56 +0100272 printk(KERN_INFO " bootmap [%016lx - %016lx] pages %lx\n",
273 bootmap_start, bootmap_start + bootmap_size - 1,
274 bootmap_pages);
Yinghai Lu1a27fc02008-03-18 12:52:37 -0700275 nid = phys_to_nid(bootmap_start);
276 if (nid != nodeid)
277 printk(KERN_INFO " bootmap(%d) on node %d\n", nodeid, nid);
Yinghai Lu1842f902010-02-10 01:20:15 -0800278
279 free_bootmem_with_active_regions(nodeid, end);
Yinghai Lu08677212010-02-10 01:20:20 -0800280#endif
Yinghai Lu1a27fc02008-03-18 12:52:37 -0700281
Linus Torvalds1da177e2005-04-16 15:20:36 -0700282 node_set_online(nodeid);
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100283}
Linus Torvalds1da177e2005-04-16 15:20:36 -0700284
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100285/*
286 * There are unfortunately some poorly designed mainboards around that
287 * only connect memory to a single CPU. This breaks the 1:1 cpu->node
288 * mapping. To avoid this fill in the mapping for all possible CPUs,
289 * as the number of CPUs is not known yet. We round robin the existing
290 * nodes.
291 */
Linus Torvalds1da177e2005-04-16 15:20:36 -0700292void __init numa_init_array(void)
293{
294 int rr, i;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100295
Ravikiran G Thirumalai85cc5132005-09-30 11:59:22 -0700296 rr = first_node(node_online_map);
Mike Travis168ef542008-12-16 17:34:01 -0800297 for (i = 0; i < nr_cpu_ids; i++) {
travis@sgi.com1ce35712008-01-30 13:33:33 +0100298 if (early_cpu_to_node(i) != NUMA_NO_NODE)
Linus Torvalds1da177e2005-04-16 15:20:36 -0700299 continue;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100300 numa_set_node(i, rr);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700301 rr = next_node(rr, node_online_map);
302 if (rr == MAX_NUMNODES)
303 rr = first_node(node_online_map);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700304 }
Linus Torvalds1da177e2005-04-16 15:20:36 -0700305}
306
307#ifdef CONFIG_NUMA_EMU
Rohit Seth53fee042007-02-13 13:26:22 +0100308/* Numa emulation */
David Rientjesadc19382009-09-25 15:20:09 -0700309static struct bootnode nodes[MAX_NUMNODES] __initdata;
310static struct bootnode physnodes[MAX_NUMNODES] __initdata;
Thomas Gleixner864fc312008-05-12 15:43:36 +0200311static char *cmdline __initdata;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700312
David Rientjesadc19382009-09-25 15:20:09 -0700313static int __init setup_physnodes(unsigned long start, unsigned long end,
314 int acpi, int k8)
315{
316 int nr_nodes = 0;
317 int ret = 0;
318 int i;
319
320#ifdef CONFIG_ACPI_NUMA
321 if (acpi)
322 nr_nodes = acpi_get_nodes(physnodes);
323#endif
324#ifdef CONFIG_K8_NUMA
325 if (k8)
326 nr_nodes = k8_get_nodes(physnodes);
327#endif
328 /*
329 * Basic sanity checking on the physical node map: there may be errors
330 * if the SRAT or K8 incorrectly reported the topology or the mem=
331 * kernel parameter is used.
332 */
333 for (i = 0; i < nr_nodes; i++) {
334 if (physnodes[i].start == physnodes[i].end)
335 continue;
336 if (physnodes[i].start > end) {
337 physnodes[i].end = physnodes[i].start;
338 continue;
339 }
340 if (physnodes[i].end < start) {
341 physnodes[i].start = physnodes[i].end;
342 continue;
343 }
344 if (physnodes[i].start < start)
345 physnodes[i].start = start;
346 if (physnodes[i].end > end)
347 physnodes[i].end = end;
348 }
349
350 /*
351 * Remove all nodes that have no memory or were truncated because of the
352 * limited address range.
353 */
354 for (i = 0; i < nr_nodes; i++) {
355 if (physnodes[i].start == physnodes[i].end)
356 continue;
357 physnodes[ret].start = physnodes[i].start;
358 physnodes[ret].end = physnodes[i].end;
359 ret++;
360 }
361
362 /*
363 * If no physical topology was detected, a single node is faked to cover
364 * the entire address space.
365 */
366 if (!ret) {
367 physnodes[ret].start = start;
368 physnodes[ret].end = end;
369 ret = 1;
370 }
371 return ret;
372}
373
Rohit Seth53fee042007-02-13 13:26:22 +0100374/*
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100375 * Setups up nid to range from addr to addr + size. If the end
376 * boundary is greater than max_addr, then max_addr is used instead.
377 * The return value is 0 if there is additional memory left for
378 * allocation past addr and -1 otherwise. addr is adjusted to be at
379 * the end of the node.
Rohit Seth53fee042007-02-13 13:26:22 +0100380 */
David Rientjesadc19382009-09-25 15:20:09 -0700381static int __init setup_node_range(int nid, u64 *addr, u64 size, u64 max_addr)
Rohit Seth53fee042007-02-13 13:26:22 +0100382{
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200383 int ret = 0;
384 nodes[nid].start = *addr;
385 *addr += size;
386 if (*addr >= max_addr) {
387 *addr = max_addr;
388 ret = -1;
389 }
390 nodes[nid].end = *addr;
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200391 node_set(nid, node_possible_map);
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200392 printk(KERN_INFO "Faking node %d at %016Lx-%016Lx (%LuMB)\n", nid,
393 nodes[nid].start, nodes[nid].end,
394 (nodes[nid].end - nodes[nid].start) >> 20);
395 return ret;
Rohit Seth53fee042007-02-13 13:26:22 +0100396}
397
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200398/*
David Rientjesadc19382009-09-25 15:20:09 -0700399 * Sets up nr_nodes fake nodes interleaved over physical nodes ranging from addr
400 * to max_addr. The return value is the number of nodes allocated.
401 */
402static int __init split_nodes_interleave(u64 addr, u64 max_addr,
403 int nr_phys_nodes, int nr_nodes)
404{
405 nodemask_t physnode_mask = NODE_MASK_NONE;
406 u64 size;
407 int big;
408 int ret = 0;
409 int i;
410
411 if (nr_nodes <= 0)
412 return -1;
413 if (nr_nodes > MAX_NUMNODES) {
414 pr_info("numa=fake=%d too large, reducing to %d\n",
415 nr_nodes, MAX_NUMNODES);
416 nr_nodes = MAX_NUMNODES;
417 }
418
419 size = (max_addr - addr - e820_hole_size(addr, max_addr)) / nr_nodes;
420 /*
421 * Calculate the number of big nodes that can be allocated as a result
422 * of consolidating the remainder.
423 */
David Rientjes68fd1112010-02-15 13:43:25 -0800424 big = ((size & ~FAKE_NODE_MIN_HASH_MASK) * nr_nodes) /
David Rientjesadc19382009-09-25 15:20:09 -0700425 FAKE_NODE_MIN_SIZE;
426
427 size &= FAKE_NODE_MIN_HASH_MASK;
428 if (!size) {
429 pr_err("Not enough memory for each node. "
430 "NUMA emulation disabled.\n");
431 return -1;
432 }
433
434 for (i = 0; i < nr_phys_nodes; i++)
435 if (physnodes[i].start != physnodes[i].end)
436 node_set(i, physnode_mask);
437
438 /*
439 * Continue to fill physical nodes with fake nodes until there is no
440 * memory left on any of them.
441 */
442 while (nodes_weight(physnode_mask)) {
443 for_each_node_mask(i, physnode_mask) {
444 u64 end = physnodes[i].start + size;
445 u64 dma32_end = PFN_PHYS(MAX_DMA32_PFN);
446
447 if (ret < big)
448 end += FAKE_NODE_MIN_SIZE;
449
450 /*
451 * Continue to add memory to this fake node if its
452 * non-reserved memory is less than the per-node size.
453 */
454 while (end - physnodes[i].start -
455 e820_hole_size(physnodes[i].start, end) < size) {
456 end += FAKE_NODE_MIN_SIZE;
457 if (end > physnodes[i].end) {
458 end = physnodes[i].end;
459 break;
460 }
461 }
462
463 /*
464 * If there won't be at least FAKE_NODE_MIN_SIZE of
465 * non-reserved memory in ZONE_DMA32 for the next node,
466 * this one must extend to the boundary.
467 */
468 if (end < dma32_end && dma32_end - end -
469 e820_hole_size(end, dma32_end) < FAKE_NODE_MIN_SIZE)
470 end = dma32_end;
471
472 /*
473 * If there won't be enough non-reserved memory for the
474 * next node, this one must extend to the end of the
475 * physical node.
476 */
477 if (physnodes[i].end - end -
478 e820_hole_size(end, physnodes[i].end) < size)
479 end = physnodes[i].end;
480
481 /*
482 * Avoid allocating more nodes than requested, which can
483 * happen as a result of rounding down each node's size
484 * to FAKE_NODE_MIN_SIZE.
485 */
486 if (nodes_weight(physnode_mask) + ret >= nr_nodes)
487 end = physnodes[i].end;
488
489 if (setup_node_range(ret++, &physnodes[i].start,
490 end - physnodes[i].start,
491 physnodes[i].end) < 0)
492 node_clear(i, physnode_mask);
493 }
494 }
495 return ret;
496}
497
498/*
David Rientjes8df5bb342010-02-15 13:43:30 -0800499 * Returns the end address of a node so that there is at least `size' amount of
500 * non-reserved memory or `max_addr' is reached.
501 */
502static u64 __init find_end_of_node(u64 start, u64 max_addr, u64 size)
503{
504 u64 end = start + size;
505
506 while (end - start - e820_hole_size(start, end) < size) {
507 end += FAKE_NODE_MIN_SIZE;
508 if (end > max_addr) {
509 end = max_addr;
510 break;
511 }
512 }
513 return end;
514}
515
516/*
517 * Sets up fake nodes of `size' interleaved over physical nodes ranging from
518 * `addr' to `max_addr'. The return value is the number of nodes allocated.
519 */
520static int __init split_nodes_size_interleave(u64 addr, u64 max_addr, u64 size)
521{
522 nodemask_t physnode_mask = NODE_MASK_NONE;
523 u64 min_size;
524 int ret = 0;
525 int i;
526
527 if (!size)
528 return -1;
529 /*
530 * The limit on emulated nodes is MAX_NUMNODES, so the size per node is
531 * increased accordingly if the requested size is too small. This
532 * creates a uniform distribution of node sizes across the entire
533 * machine (but not necessarily over physical nodes).
534 */
535 min_size = (max_addr - addr - e820_hole_size(addr, max_addr)) /
536 MAX_NUMNODES;
537 min_size = max(min_size, FAKE_NODE_MIN_SIZE);
538 if ((min_size & FAKE_NODE_MIN_HASH_MASK) < min_size)
539 min_size = (min_size + FAKE_NODE_MIN_SIZE) &
540 FAKE_NODE_MIN_HASH_MASK;
541 if (size < min_size) {
542 pr_err("Fake node size %LuMB too small, increasing to %LuMB\n",
543 size >> 20, min_size >> 20);
544 size = min_size;
545 }
546 size &= FAKE_NODE_MIN_HASH_MASK;
547
548 for (i = 0; i < MAX_NUMNODES; i++)
549 if (physnodes[i].start != physnodes[i].end)
550 node_set(i, physnode_mask);
551 /*
552 * Fill physical nodes with fake nodes of size until there is no memory
553 * left on any of them.
554 */
555 while (nodes_weight(physnode_mask)) {
556 for_each_node_mask(i, physnode_mask) {
557 u64 dma32_end = MAX_DMA32_PFN << PAGE_SHIFT;
558 u64 end;
559
560 end = find_end_of_node(physnodes[i].start,
561 physnodes[i].end, size);
562 /*
563 * If there won't be at least FAKE_NODE_MIN_SIZE of
564 * non-reserved memory in ZONE_DMA32 for the next node,
565 * this one must extend to the boundary.
566 */
567 if (end < dma32_end && dma32_end - end -
568 e820_hole_size(end, dma32_end) < FAKE_NODE_MIN_SIZE)
569 end = dma32_end;
570
571 /*
572 * If there won't be enough non-reserved memory for the
573 * next node, this one must extend to the end of the
574 * physical node.
575 */
576 if (physnodes[i].end - end -
577 e820_hole_size(end, physnodes[i].end) < size)
578 end = physnodes[i].end;
579
580 /*
581 * Setup the fake node that will be allocated as bootmem
582 * later. If setup_node_range() returns non-zero, there
583 * is no more memory available on this physical node.
584 */
585 if (setup_node_range(ret++, &physnodes[i].start,
586 end - physnodes[i].start,
587 physnodes[i].end) < 0)
588 node_clear(i, physnode_mask);
589 }
590 }
591 return ret;
592}
593
594/*
Thomas Gleixner886533a2008-05-12 15:43:36 +0200595 * Sets up the system RAM area from start_pfn to last_pfn according to the
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200596 * numa=fake command-line option.
597 */
David Rientjesadc19382009-09-25 15:20:09 -0700598static int __init numa_emulation(unsigned long start_pfn,
599 unsigned long last_pfn, int acpi, int k8)
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200600{
David Rientjesca2107c2010-02-15 13:43:33 -0800601 u64 addr = start_pfn << PAGE_SHIFT;
Thomas Gleixner886533a2008-05-12 15:43:36 +0200602 u64 max_addr = last_pfn << PAGE_SHIFT;
David Rientjesadc19382009-09-25 15:20:09 -0700603 int num_phys_nodes;
David Rientjesca2107c2010-02-15 13:43:33 -0800604 int num_nodes;
605 int i;
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200606
David Rientjesadc19382009-09-25 15:20:09 -0700607 num_phys_nodes = setup_physnodes(addr, max_addr, acpi, k8);
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200608 /*
David Rientjes8df5bb342010-02-15 13:43:30 -0800609 * If the numa=fake command-line contains a 'M' or 'G', it represents
David Rientjesca2107c2010-02-15 13:43:33 -0800610 * the fixed node size. Otherwise, if it is just a single number N,
611 * split the system RAM into N fake nodes.
David Rientjes8df5bb342010-02-15 13:43:30 -0800612 */
613 if (strchr(cmdline, 'M') || strchr(cmdline, 'G')) {
David Rientjesca2107c2010-02-15 13:43:33 -0800614 u64 size;
615
David Rientjes8df5bb342010-02-15 13:43:30 -0800616 size = memparse(cmdline, &cmdline);
617 num_nodes = split_nodes_size_interleave(addr, max_addr, size);
David Rientjesca2107c2010-02-15 13:43:33 -0800618 } else {
619 unsigned long n;
620
621 n = simple_strtoul(cmdline, NULL, 0);
622 num_nodes = split_nodes_interleave(addr, max_addr, num_phys_nodes, n);
David Rientjes8df5bb342010-02-15 13:43:30 -0800623 }
624
David Rientjesca2107c2010-02-15 13:43:33 -0800625 if (num_nodes < 0)
626 return num_nodes;
Suresh Siddha6ec6e0d2008-03-25 10:14:35 -0700627 memnode_shift = compute_hash_shift(nodes, num_nodes, NULL);
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200628 if (memnode_shift < 0) {
629 memnode_shift = 0;
630 printk(KERN_ERR "No NUMA hash function found. NUMA emulation "
631 "disabled.\n");
632 return -1;
633 }
634
635 /*
David Rientjesadc19382009-09-25 15:20:09 -0700636 * We need to vacate all active ranges that may have been registered for
637 * the e820 memory map.
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200638 */
639 remove_all_active_ranges();
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200640 for_each_node_mask(i, node_possible_map) {
Mel Gorman5cb248a2006-09-27 01:49:52 -0700641 e820_register_active_regions(i, nodes[i].start >> PAGE_SHIFT,
642 nodes[i].end >> PAGE_SHIFT);
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100643 setup_node_bootmem(i, nodes[i].start, nodes[i].end);
Mel Gorman5cb248a2006-09-27 01:49:52 -0700644 }
David Rientjes3484d792007-07-21 17:10:32 +0200645 acpi_fake_nodes(nodes, num_nodes);
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100646 numa_init_array();
647 return 0;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700648}
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200649#endif /* CONFIG_NUMA_EMU */
Linus Torvalds1da177e2005-04-16 15:20:36 -0700650
David Rientjes8ee2deb2009-09-25 15:20:00 -0700651void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn,
652 int acpi, int k8)
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100653{
Linus Torvalds1da177e2005-04-16 15:20:36 -0700654 int i;
655
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200656 nodes_clear(node_possible_map);
Yinghai Lub7ad1492008-02-17 02:02:21 -0800657 nodes_clear(node_online_map);
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200658
Linus Torvalds1da177e2005-04-16 15:20:36 -0700659#ifdef CONFIG_NUMA_EMU
David Rientjesadc19382009-09-25 15:20:09 -0700660 if (cmdline && !numa_emulation(start_pfn, last_pfn, acpi, k8))
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100661 return;
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200662 nodes_clear(node_possible_map);
Yinghai Lub7ad1492008-02-17 02:02:21 -0800663 nodes_clear(node_online_map);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700664#endif
665
666#ifdef CONFIG_ACPI_NUMA
David Rientjes87162732009-09-25 15:20:04 -0700667 if (!numa_off && acpi && !acpi_scan_nodes(start_pfn << PAGE_SHIFT,
668 last_pfn << PAGE_SHIFT))
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100669 return;
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200670 nodes_clear(node_possible_map);
Yinghai Lub7ad1492008-02-17 02:02:21 -0800671 nodes_clear(node_online_map);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700672#endif
673
674#ifdef CONFIG_K8_NUMA
David Rientjes8ee2deb2009-09-25 15:20:00 -0700675 if (!numa_off && k8 && !k8_scan_nodes())
Linus Torvalds1da177e2005-04-16 15:20:36 -0700676 return;
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200677 nodes_clear(node_possible_map);
Yinghai Lub7ad1492008-02-17 02:02:21 -0800678 nodes_clear(node_online_map);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700679#endif
680 printk(KERN_INFO "%s\n",
681 numa_off ? "NUMA turned off" : "No NUMA configuration found");
682
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100683 printk(KERN_INFO "Faking a node at %016lx-%016lx\n",
Linus Torvalds1da177e2005-04-16 15:20:36 -0700684 start_pfn << PAGE_SHIFT,
Thomas Gleixner886533a2008-05-12 15:43:36 +0200685 last_pfn << PAGE_SHIFT);
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100686 /* setup dummy node covering all memory */
687 memnode_shift = 63;
Amul Shah076422d22007-02-13 13:26:19 +0100688 memnodemap = memnode.embedded_map;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700689 memnodemap[0] = 0;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700690 node_set_online(0);
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200691 node_set(0, node_possible_map);
Mike Travis168ef542008-12-16 17:34:01 -0800692 for (i = 0; i < nr_cpu_ids; i++)
Andi Kleen69d81fc2005-11-05 17:25:53 +0100693 numa_set_node(i, 0);
Thomas Gleixner886533a2008-05-12 15:43:36 +0200694 e820_register_active_regions(0, start_pfn, last_pfn);
695 setup_node_bootmem(0, start_pfn << PAGE_SHIFT, last_pfn << PAGE_SHIFT);
Andi Kleen69d81fc2005-11-05 17:25:53 +0100696}
697
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100698unsigned long __init numa_free_all_bootmem(void)
699{
Linus Torvalds1da177e2005-04-16 15:20:36 -0700700 unsigned long pages = 0;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100701 int i;
702
703 for_each_online_node(i)
Linus Torvalds1da177e2005-04-16 15:20:36 -0700704 pages += free_all_bootmem_node(NODE_DATA(i));
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100705
Yinghai Lu08677212010-02-10 01:20:20 -0800706#ifdef CONFIG_NO_BOOTMEM
707 pages += free_all_memory_core_early(MAX_NUMNODES);
708#endif
709
Linus Torvalds1da177e2005-04-16 15:20:36 -0700710 return pages;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100711}
Linus Torvalds1da177e2005-04-16 15:20:36 -0700712
Andi Kleen2c8c0e62006-09-26 10:52:32 +0200713static __init int numa_setup(char *opt)
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100714{
Andi Kleen2c8c0e62006-09-26 10:52:32 +0200715 if (!opt)
716 return -EINVAL;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100717 if (!strncmp(opt, "off", 3))
Linus Torvalds1da177e2005-04-16 15:20:36 -0700718 numa_off = 1;
719#ifdef CONFIG_NUMA_EMU
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200720 if (!strncmp(opt, "fake=", 5))
721 cmdline = opt + 5;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700722#endif
723#ifdef CONFIG_ACPI_NUMA
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100724 if (!strncmp(opt, "noacpi", 6))
725 acpi_numa = -1;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700726#endif
Andi Kleen2c8c0e62006-09-26 10:52:32 +0200727 return 0;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100728}
Andi Kleen2c8c0e62006-09-26 10:52:32 +0200729early_param("numa", numa_setup);
730
Mike Travis23ca4bb2008-05-12 21:21:12 +0200731#ifdef CONFIG_NUMA
Yinghai Lud9c2d5a2009-11-21 00:23:37 -0800732
733static __init int find_near_online_node(int node)
734{
735 int n, val;
736 int min_val = INT_MAX;
737 int best_node = -1;
738
739 for_each_online_node(n) {
740 val = node_distance(node, n);
741
742 if (val < min_val) {
743 min_val = val;
744 best_node = n;
745 }
746 }
747
748 return best_node;
749}
750
Ravikiran Thirumalai05b3cbd2006-01-11 22:45:36 +0100751/*
752 * Setup early cpu_to_node.
753 *
754 * Populate cpu_to_node[] only if x86_cpu_to_apicid[],
755 * and apicid_to_node[] tables have valid entries for a CPU.
756 * This means we skip cpu_to_node[] initialisation for NUMA
757 * emulation and faking node case (when running a kernel compiled
758 * for NUMA on a non NUMA box), which is OK as cpu_to_node[]
759 * is already initialized in a round robin manner at numa_init_array,
760 * prior to this call, and this initialization is good enough
761 * for the fake NUMA cases.
Mike Travis23ca4bb2008-05-12 21:21:12 +0200762 *
763 * Called before the per_cpu areas are setup.
Ravikiran Thirumalai05b3cbd2006-01-11 22:45:36 +0100764 */
765void __init init_cpu_to_node(void)
766{
Mike Travis23ca4bb2008-05-12 21:21:12 +0200767 int cpu;
768 u16 *cpu_to_apicid = early_per_cpu_ptr(x86_cpu_to_apicid);
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100769
Mike Travis23ca4bb2008-05-12 21:21:12 +0200770 BUG_ON(cpu_to_apicid == NULL);
771
772 for_each_possible_cpu(cpu) {
Yinghai Lu7c9e92b2008-02-19 15:35:54 -0800773 int node;
Mike Travis23ca4bb2008-05-12 21:21:12 +0200774 u16 apicid = cpu_to_apicid[cpu];
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100775
Ravikiran Thirumalai05b3cbd2006-01-11 22:45:36 +0100776 if (apicid == BAD_APICID)
777 continue;
Yinghai Lu7c9e92b2008-02-19 15:35:54 -0800778 node = apicid_to_node[apicid];
779 if (node == NUMA_NO_NODE)
Ravikiran Thirumalai05b3cbd2006-01-11 22:45:36 +0100780 continue;
Yinghai Lu7c9e92b2008-02-19 15:35:54 -0800781 if (!node_online(node))
Yinghai Lud9c2d5a2009-11-21 00:23:37 -0800782 node = find_near_online_node(node);
Mike Travis23ca4bb2008-05-12 21:21:12 +0200783 numa_set_node(cpu, node);
Ravikiran Thirumalai05b3cbd2006-01-11 22:45:36 +0100784 }
785}
Mike Travis23ca4bb2008-05-12 21:21:12 +0200786#endif
Ravikiran Thirumalai05b3cbd2006-01-11 22:45:36 +0100787
Andi Kleencf050132006-01-11 22:46:27 +0100788
Brian Gerst6470aff2009-01-27 12:56:47 +0900789void __cpuinit numa_set_node(int cpu, int node)
790{
791 int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map);
792
793 /* early setting, no percpu area yet */
794 if (cpu_to_node_map) {
795 cpu_to_node_map[cpu] = node;
796 return;
797 }
798
799#ifdef CONFIG_DEBUG_PER_CPU_MAPS
Brian Gerst44581a22009-02-08 09:58:40 -0500800 if (cpu >= nr_cpu_ids || !cpu_possible(cpu)) {
Brian Gerst6470aff2009-01-27 12:56:47 +0900801 printk(KERN_ERR "numa_set_node: invalid cpu# (%d)\n", cpu);
802 dump_stack();
803 return;
804 }
805#endif
806 per_cpu(x86_cpu_to_node_map, cpu) = node;
807
808 if (node != NUMA_NO_NODE)
Lee Schermerhorne534c7c2010-05-26 14:44:58 -0700809 set_cpu_numa_node(cpu, node);
Brian Gerst6470aff2009-01-27 12:56:47 +0900810}
811
812void __cpuinit numa_clear_node(int cpu)
813{
814 numa_set_node(cpu, NUMA_NO_NODE);
815}
816
817#ifndef CONFIG_DEBUG_PER_CPU_MAPS
818
819void __cpuinit numa_add_cpu(int cpu)
820{
Rusty Russellc032ef602009-03-13 14:49:53 +1030821 cpumask_set_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
Brian Gerst6470aff2009-01-27 12:56:47 +0900822}
823
824void __cpuinit numa_remove_cpu(int cpu)
825{
Rusty Russellc032ef602009-03-13 14:49:53 +1030826 cpumask_clear_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
Brian Gerst6470aff2009-01-27 12:56:47 +0900827}
828
829#else /* CONFIG_DEBUG_PER_CPU_MAPS */
830
831/*
832 * --------- debug versions of the numa functions ---------
833 */
834static void __cpuinit numa_set_cpumask(int cpu, int enable)
835{
836 int node = early_cpu_to_node(cpu);
Rusty Russell73e907d2009-03-13 14:49:57 +1030837 struct cpumask *mask;
Brian Gerst6470aff2009-01-27 12:56:47 +0900838 char buf[64];
839
Rusty Russellc032ef602009-03-13 14:49:53 +1030840 mask = node_to_cpumask_map[node];
841 if (mask == NULL) {
842 printk(KERN_ERR "node_to_cpumask_map[%i] NULL\n", node);
Brian Gerst6470aff2009-01-27 12:56:47 +0900843 dump_stack();
844 return;
845 }
846
Brian Gerst6470aff2009-01-27 12:56:47 +0900847 if (enable)
Rusty Russellc032ef602009-03-13 14:49:53 +1030848 cpumask_set_cpu(cpu, mask);
Brian Gerst6470aff2009-01-27 12:56:47 +0900849 else
Rusty Russellc032ef602009-03-13 14:49:53 +1030850 cpumask_clear_cpu(cpu, mask);
Brian Gerst6470aff2009-01-27 12:56:47 +0900851
852 cpulist_scnprintf(buf, sizeof(buf), mask);
853 printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n",
854 enable ? "numa_add_cpu" : "numa_remove_cpu", cpu, node, buf);
855}
856
857void __cpuinit numa_add_cpu(int cpu)
858{
859 numa_set_cpumask(cpu, 1);
860}
861
862void __cpuinit numa_remove_cpu(int cpu)
863{
864 numa_set_cpumask(cpu, 0);
865}
866
Lee Schermerhorne534c7c2010-05-26 14:44:58 -0700867int __cpu_to_node(int cpu)
Brian Gerst6470aff2009-01-27 12:56:47 +0900868{
869 if (early_per_cpu_ptr(x86_cpu_to_node_map)) {
870 printk(KERN_WARNING
871 "cpu_to_node(%d): usage too early!\n", cpu);
872 dump_stack();
873 return early_per_cpu_ptr(x86_cpu_to_node_map)[cpu];
874 }
875 return per_cpu(x86_cpu_to_node_map, cpu);
876}
Lee Schermerhorne534c7c2010-05-26 14:44:58 -0700877EXPORT_SYMBOL(__cpu_to_node);
Brian Gerst6470aff2009-01-27 12:56:47 +0900878
879/*
880 * Same function as cpu_to_node() but used if called before the
881 * per_cpu areas are setup.
882 */
883int early_cpu_to_node(int cpu)
884{
885 if (early_per_cpu_ptr(x86_cpu_to_node_map))
886 return early_per_cpu_ptr(x86_cpu_to_node_map)[cpu];
887
Brian Gerst44581a22009-02-08 09:58:40 -0500888 if (!cpu_possible(cpu)) {
Brian Gerst6470aff2009-01-27 12:56:47 +0900889 printk(KERN_WARNING
890 "early_cpu_to_node(%d): no per_cpu area!\n", cpu);
891 dump_stack();
892 return NUMA_NO_NODE;
893 }
894 return per_cpu(x86_cpu_to_node_map, cpu);
895}
896
Brian Gerst6470aff2009-01-27 12:56:47 +0900897/*
Brian Gerst6470aff2009-01-27 12:56:47 +0900898 * --------- end of debug versions of the numa functions ---------
899 */
900
901#endif /* CONFIG_DEBUG_PER_CPU_MAPS */