blob: 8948f47fde056f9e723640c7791732fe4e68ae63 [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 +090036DEFINE_PER_CPU(int, node_number) = 0;
37EXPORT_PER_CPU_SYMBOL(node_number);
38
39/*
40 * Map cpu index to node index
41 */
42DEFINE_EARLY_PER_CPU(int, x86_cpu_to_node_map, NUMA_NO_NODE);
43EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_node_map);
44
45/*
Eric Dumazet529a3402005-11-05 17:25:54 +010046 * Given a shift value, try to populate memnodemap[]
47 * Returns :
48 * 1 if OK
49 * 0 if memnodmap[] too small (of shift too small)
50 * -1 if node overlap or lost ram (shift too big)
51 */
Thomas Gleixnere3cfe522008-01-30 13:30:37 +010052static int __init populate_memnodemap(const struct bootnode *nodes,
Suresh Siddha6ec6e0d2008-03-25 10:14:35 -070053 int numnodes, int shift, int *nodeids)
Linus Torvalds1da177e2005-04-16 15:20:36 -070054{
Eric Dumazet529a3402005-11-05 17:25:54 +010055 unsigned long addr, end;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +010056 int i, res = -1;
Keith Manntheyb6846642005-07-28 21:15:38 -070057
travis@sgi.com43238382008-01-30 13:33:25 +010058 memset(memnodemap, 0xff, sizeof(s16)*memnodemapsize);
Eric Dumazet529a3402005-11-05 17:25:54 +010059 for (i = 0; i < numnodes; i++) {
60 addr = nodes[i].start;
61 end = nodes[i].end;
62 if (addr >= end)
63 continue;
Amul Shah076422d2007-02-13 13:26:19 +010064 if ((end >> shift) >= memnodemapsize)
Eric Dumazet529a3402005-11-05 17:25:54 +010065 return 0;
66 do {
travis@sgi.com43238382008-01-30 13:33:25 +010067 if (memnodemap[addr >> shift] != NUMA_NO_NODE)
Eric Dumazet529a3402005-11-05 17:25:54 +010068 return -1;
Suresh Siddha6ec6e0d2008-03-25 10:14:35 -070069
70 if (!nodeids)
71 memnodemap[addr >> shift] = i;
72 else
73 memnodemap[addr >> shift] = nodeids[i];
74
Amul Shah076422d2007-02-13 13:26:19 +010075 addr += (1UL << shift);
Eric Dumazet529a3402005-11-05 17:25:54 +010076 } while (addr < end);
77 res = 1;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +010078 }
Eric Dumazet529a3402005-11-05 17:25:54 +010079 return res;
80}
81
Amul Shah076422d2007-02-13 13:26:19 +010082static int __init allocate_cachealigned_memnodemap(void)
83{
Yinghai Lu24a5da72008-02-01 17:49:41 +010084 unsigned long addr;
Amul Shah076422d2007-02-13 13:26:19 +010085
86 memnodemap = memnode.embedded_map;
travis@sgi.com316390b2008-01-30 13:33:15 +010087 if (memnodemapsize <= ARRAY_SIZE(memnode.embedded_map))
Amul Shah076422d2007-02-13 13:26:19 +010088 return 0;
Amul Shah076422d2007-02-13 13:26:19 +010089
Yinghai Lu24a5da72008-02-01 17:49:41 +010090 addr = 0x8000;
Joerg Roedelbe3e89e2008-07-25 16:48:58 +020091 nodemap_size = roundup(sizeof(s16) * memnodemapsize, L1_CACHE_BYTES);
Yinghai Luc987d122008-06-24 22:14:09 -070092 nodemap_addr = find_e820_area(addr, max_pfn<<PAGE_SHIFT,
Yinghai Lu24a5da72008-02-01 17:49:41 +010093 nodemap_size, L1_CACHE_BYTES);
Amul Shah076422d2007-02-13 13:26:19 +010094 if (nodemap_addr == -1UL) {
95 printk(KERN_ERR
96 "NUMA: Unable to allocate Memory to Node hash map\n");
97 nodemap_addr = nodemap_size = 0;
98 return -1;
99 }
Yinghai Lu24a5da72008-02-01 17:49:41 +0100100 memnodemap = phys_to_virt(nodemap_addr);
Yinghai Lu25eff8d2008-02-01 17:49:41 +0100101 reserve_early(nodemap_addr, nodemap_addr + nodemap_size, "MEMNODEMAP");
Amul Shah076422d2007-02-13 13:26:19 +0100102
103 printk(KERN_DEBUG "NUMA: Allocated memnodemap from %lx - %lx\n",
104 nodemap_addr, nodemap_addr + nodemap_size);
105 return 0;
106}
107
108/*
109 * The LSB of all start and end addresses in the node map is the value of the
110 * maximum possible shift.
111 */
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100112static int __init extract_lsb_from_nodes(const struct bootnode *nodes,
113 int numnodes)
Amul Shah076422d2007-02-13 13:26:19 +0100114{
Amul Shah54413922007-02-13 13:26:20 +0100115 int i, nodes_used = 0;
Amul Shah076422d2007-02-13 13:26:19 +0100116 unsigned long start, end;
117 unsigned long bitfield = 0, memtop = 0;
118
119 for (i = 0; i < numnodes; i++) {
120 start = nodes[i].start;
121 end = nodes[i].end;
122 if (start >= end)
123 continue;
Amul Shah54413922007-02-13 13:26:20 +0100124 bitfield |= start;
125 nodes_used++;
Amul Shah076422d2007-02-13 13:26:19 +0100126 if (end > memtop)
127 memtop = end;
128 }
Amul Shah54413922007-02-13 13:26:20 +0100129 if (nodes_used <= 1)
130 i = 63;
131 else
132 i = find_first_bit(&bitfield, sizeof(unsigned long)*8);
Amul Shah076422d2007-02-13 13:26:19 +0100133 memnodemapsize = (memtop >> i)+1;
134 return i;
135}
136
Suresh Siddha6ec6e0d2008-03-25 10:14:35 -0700137int __init compute_hash_shift(struct bootnode *nodes, int numnodes,
138 int *nodeids)
Eric Dumazet529a3402005-11-05 17:25:54 +0100139{
Amul Shah076422d2007-02-13 13:26:19 +0100140 int shift;
Eric Dumazet529a3402005-11-05 17:25:54 +0100141
Amul Shah076422d2007-02-13 13:26:19 +0100142 shift = extract_lsb_from_nodes(nodes, numnodes);
143 if (allocate_cachealigned_memnodemap())
144 return -1;
Andi Kleen6b050f82006-01-11 22:44:33 +0100145 printk(KERN_DEBUG "NUMA: Using %d for the hash shift.\n",
Eric Dumazet529a3402005-11-05 17:25:54 +0100146 shift);
147
Suresh Siddha6ec6e0d2008-03-25 10:14:35 -0700148 if (populate_memnodemap(nodes, numnodes, shift, nodeids) != 1) {
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100149 printk(KERN_INFO "Your memory is not aligned you need to "
150 "rebuild your kernel with a bigger NODEMAPSIZE "
151 "shift=%d\n", shift);
Eric Dumazet529a3402005-11-05 17:25:54 +0100152 return -1;
153 }
Keith Manntheyb6846642005-07-28 21:15:38 -0700154 return shift;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700155}
156
KAMEZAWA Hiroyukif2dbcfa2009-02-18 14:48:32 -0800157int __meminit __early_pfn_to_nid(unsigned long pfn)
Matt Tolentinobbfceef2005-06-23 00:08:07 -0700158{
159 return phys_to_nid(pfn << PAGE_SHIFT);
160}
Matt Tolentinobbfceef2005-06-23 00:08:07 -0700161
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100162static void * __init early_node_mem(int nodeid, unsigned long start,
Yinghai Lu24a5da72008-02-01 17:49:41 +0100163 unsigned long end, unsigned long size,
164 unsigned long align)
Andi Kleena8062232006-04-07 19:49:21 +0200165{
Yinghai Lucef625e2010-02-10 01:20:18 -0800166 unsigned long mem;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100167
Yinghai Lucef625e2010-02-10 01:20:18 -0800168 /*
169 * put it on high as possible
170 * something will go with NODE_DATA
171 */
172 if (start < (MAX_DMA_PFN<<PAGE_SHIFT))
173 start = MAX_DMA_PFN<<PAGE_SHIFT;
174 if (start < (MAX_DMA32_PFN<<PAGE_SHIFT) &&
175 end > (MAX_DMA32_PFN<<PAGE_SHIFT))
176 start = MAX_DMA32_PFN<<PAGE_SHIFT;
177 mem = find_e820_area(start, end, size, align);
Yinghai Lu9347e0b2008-02-01 17:49:42 +0100178 if (mem != -1L)
Andi Kleena8062232006-04-07 19:49:21 +0200179 return __va(mem);
Yinghai Lu9347e0b2008-02-01 17:49:42 +0100180
Yinghai Lucef625e2010-02-10 01:20:18 -0800181 /* extend the search scope */
182 end = max_pfn_mapped << PAGE_SHIFT;
183 if (end > (MAX_DMA32_PFN<<PAGE_SHIFT))
184 start = MAX_DMA32_PFN<<PAGE_SHIFT;
185 else
186 start = MAX_DMA_PFN<<PAGE_SHIFT;
Yinghai Lu1842f902010-02-10 01:20:15 -0800187 mem = find_e820_area(start, end, size, align);
188 if (mem != -1L)
189 return __va(mem);
190
191 printk(KERN_ERR "Cannot find %lu bytes in node %d\n",
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100192 size, nodeid);
Yinghai Lu1842f902010-02-10 01:20:15 -0800193
194 return NULL;
Andi Kleena8062232006-04-07 19:49:21 +0200195}
196
Linus Torvalds1da177e2005-04-16 15:20:36 -0700197/* Initialize bootmem allocator for a node */
Yinghai Lu7c437692009-05-15 13:59:37 -0700198void __init
199setup_node_bootmem(int nodeid, unsigned long start, unsigned long end)
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100200{
Yinghai Lu08677212010-02-10 01:20:20 -0800201 unsigned long start_pfn, last_pfn, nodedata_phys;
Yinghai Lu7c437692009-05-15 13:59:37 -0700202 const int pgdat_size = roundup(sizeof(pg_data_t), PAGE_SIZE);
Yinghai Lu1a27fc02008-03-18 12:52:37 -0700203 int nid;
Yinghai Lu08677212010-02-10 01:20:20 -0800204#ifndef CONFIG_NO_BOOTMEM
205 unsigned long bootmap_start, bootmap_pages, bootmap_size;
206 void *bootmap;
207#endif
Linus Torvalds1da177e2005-04-16 15:20:36 -0700208
Yinghai Lu4c31e922009-04-22 14:19:27 -0700209 if (!end)
210 return;
211
Yinghai Lu7c437692009-05-15 13:59:37 -0700212 /*
213 * Don't confuse VM with a node that doesn't have the
214 * minimum amount of memory:
215 */
216 if (end && (end - start) < NODE_MIN_SIZE)
217 return;
218
Joerg Roedelbe3e89e2008-07-25 16:48:58 +0200219 start = roundup(start, ZONE_ALIGN);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700220
Yinghai Lu08677212010-02-10 01:20:20 -0800221 printk(KERN_INFO "Initmem setup node %d %016lx-%016lx\n", nodeid,
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100222 start, end);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700223
224 start_pfn = start >> PAGE_SHIFT;
Thomas Gleixner886533a2008-05-12 15:43:36 +0200225 last_pfn = end >> PAGE_SHIFT;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700226
Yinghai Lu24a5da72008-02-01 17:49:41 +0100227 node_data[nodeid] = early_node_mem(nodeid, start, end, pgdat_size,
228 SMP_CACHE_BYTES);
Andi Kleena8062232006-04-07 19:49:21 +0200229 if (node_data[nodeid] == NULL)
230 return;
231 nodedata_phys = __pa(node_data[nodeid]);
Yinghai Lu1842f902010-02-10 01:20:15 -0800232 reserve_early(nodedata_phys, nodedata_phys + pgdat_size, "NODE_DATA");
Yinghai Lu6118f762008-02-04 16:47:56 +0100233 printk(KERN_INFO " NODE_DATA [%016lx - %016lx]\n", nodedata_phys,
234 nodedata_phys + pgdat_size - 1);
Yinghai Lu1842f902010-02-10 01:20:15 -0800235 nid = phys_to_nid(nodedata_phys);
236 if (nid != nodeid)
237 printk(KERN_INFO " NODE_DATA(%d) on node %d\n", nodeid, nid);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700238
Linus Torvalds1da177e2005-04-16 15:20:36 -0700239 memset(NODE_DATA(nodeid), 0, sizeof(pg_data_t));
Yinghai Lu08677212010-02-10 01:20:20 -0800240 NODE_DATA(nodeid)->node_id = nodeid;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700241 NODE_DATA(nodeid)->node_start_pfn = start_pfn;
Thomas Gleixner886533a2008-05-12 15:43:36 +0200242 NODE_DATA(nodeid)->node_spanned_pages = last_pfn - start_pfn;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700243
Yinghai Lu08677212010-02-10 01:20:20 -0800244#ifndef CONFIG_NO_BOOTMEM
245 NODE_DATA(nodeid)->bdata = &bootmem_node_data[nodeid];
246
Yinghai Lu1a27fc02008-03-18 12:52:37 -0700247 /*
248 * Find a place for the bootmem map
249 * nodedata_phys could be on other nodes by alloc_bootmem,
250 * so need to sure bootmap_start not to be small, otherwise
251 * early_node_mem will get that with find_e820_area instead
252 * of alloc_bootmem, that could clash with reserved range
253 */
Thomas Gleixner886533a2008-05-12 15:43:36 +0200254 bootmap_pages = bootmem_bootmap_pages(last_pfn - start_pfn);
Yinghai Lu1842f902010-02-10 01:20:15 -0800255 bootmap_start = roundup(nodedata_phys + pgdat_size, PAGE_SIZE);
Yinghai Lu24a5da72008-02-01 17:49:41 +0100256 /*
Paul Jacksone9197bf2008-05-14 08:15:10 -0700257 * SMP_CACHE_BYTES could be enough, but init_bootmem_node like
Yinghai Lu24a5da72008-02-01 17:49:41 +0100258 * to use that to align to PAGE_SIZE
259 */
Andi Kleena8062232006-04-07 19:49:21 +0200260 bootmap = early_node_mem(nodeid, bootmap_start, end,
Yinghai Lu24a5da72008-02-01 17:49:41 +0100261 bootmap_pages<<PAGE_SHIFT, PAGE_SIZE);
Andi Kleena8062232006-04-07 19:49:21 +0200262 if (bootmap == NULL) {
Yinghai Lu1842f902010-02-10 01:20:15 -0800263 free_early(nodedata_phys, nodedata_phys + pgdat_size);
Andi Kleena8062232006-04-07 19:49:21 +0200264 node_data[nodeid] = NULL;
265 return;
266 }
267 bootmap_start = __pa(bootmap);
Yinghai Lu1842f902010-02-10 01:20:15 -0800268 reserve_early(bootmap_start, bootmap_start+(bootmap_pages<<PAGE_SHIFT),
269 "BOOTMAP");
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100270
Linus Torvalds1da177e2005-04-16 15:20:36 -0700271 bootmap_size = init_bootmem_node(NODE_DATA(nodeid),
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100272 bootmap_start >> PAGE_SHIFT,
Thomas Gleixner886533a2008-05-12 15:43:36 +0200273 start_pfn, last_pfn);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700274
Yinghai Lu6118f762008-02-04 16:47:56 +0100275 printk(KERN_INFO " bootmap [%016lx - %016lx] pages %lx\n",
276 bootmap_start, bootmap_start + bootmap_size - 1,
277 bootmap_pages);
Yinghai Lu1a27fc02008-03-18 12:52:37 -0700278 nid = phys_to_nid(bootmap_start);
279 if (nid != nodeid)
280 printk(KERN_INFO " bootmap(%d) on node %d\n", nodeid, nid);
Yinghai Lu1842f902010-02-10 01:20:15 -0800281
282 free_bootmem_with_active_regions(nodeid, end);
Yinghai Lu08677212010-02-10 01:20:20 -0800283#endif
Yinghai Lu1a27fc02008-03-18 12:52:37 -0700284
Linus Torvalds1da177e2005-04-16 15:20:36 -0700285 node_set_online(nodeid);
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100286}
Linus Torvalds1da177e2005-04-16 15:20:36 -0700287
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100288/*
289 * There are unfortunately some poorly designed mainboards around that
290 * only connect memory to a single CPU. This breaks the 1:1 cpu->node
291 * mapping. To avoid this fill in the mapping for all possible CPUs,
292 * as the number of CPUs is not known yet. We round robin the existing
293 * nodes.
294 */
Linus Torvalds1da177e2005-04-16 15:20:36 -0700295void __init numa_init_array(void)
296{
297 int rr, i;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100298
Ravikiran G Thirumalai85cc5132005-09-30 11:59:22 -0700299 rr = first_node(node_online_map);
Mike Travis168ef542008-12-16 17:34:01 -0800300 for (i = 0; i < nr_cpu_ids; i++) {
travis@sgi.com1ce35712008-01-30 13:33:33 +0100301 if (early_cpu_to_node(i) != NUMA_NO_NODE)
Linus Torvalds1da177e2005-04-16 15:20:36 -0700302 continue;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100303 numa_set_node(i, rr);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700304 rr = next_node(rr, node_online_map);
305 if (rr == MAX_NUMNODES)
306 rr = first_node(node_online_map);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700307 }
Linus Torvalds1da177e2005-04-16 15:20:36 -0700308}
309
310#ifdef CONFIG_NUMA_EMU
Rohit Seth53fee042007-02-13 13:26:22 +0100311/* Numa emulation */
David Rientjesadc19382009-09-25 15:20:09 -0700312static struct bootnode nodes[MAX_NUMNODES] __initdata;
313static struct bootnode physnodes[MAX_NUMNODES] __initdata;
Thomas Gleixner864fc312008-05-12 15:43:36 +0200314static char *cmdline __initdata;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700315
David Rientjesadc19382009-09-25 15:20:09 -0700316static int __init setup_physnodes(unsigned long start, unsigned long end,
317 int acpi, int k8)
318{
319 int nr_nodes = 0;
320 int ret = 0;
321 int i;
322
323#ifdef CONFIG_ACPI_NUMA
324 if (acpi)
325 nr_nodes = acpi_get_nodes(physnodes);
326#endif
327#ifdef CONFIG_K8_NUMA
328 if (k8)
329 nr_nodes = k8_get_nodes(physnodes);
330#endif
331 /*
332 * Basic sanity checking on the physical node map: there may be errors
333 * if the SRAT or K8 incorrectly reported the topology or the mem=
334 * kernel parameter is used.
335 */
336 for (i = 0; i < nr_nodes; i++) {
337 if (physnodes[i].start == physnodes[i].end)
338 continue;
339 if (physnodes[i].start > end) {
340 physnodes[i].end = physnodes[i].start;
341 continue;
342 }
343 if (physnodes[i].end < start) {
344 physnodes[i].start = physnodes[i].end;
345 continue;
346 }
347 if (physnodes[i].start < start)
348 physnodes[i].start = start;
349 if (physnodes[i].end > end)
350 physnodes[i].end = end;
351 }
352
353 /*
354 * Remove all nodes that have no memory or were truncated because of the
355 * limited address range.
356 */
357 for (i = 0; i < nr_nodes; i++) {
358 if (physnodes[i].start == physnodes[i].end)
359 continue;
360 physnodes[ret].start = physnodes[i].start;
361 physnodes[ret].end = physnodes[i].end;
362 ret++;
363 }
364
365 /*
366 * If no physical topology was detected, a single node is faked to cover
367 * the entire address space.
368 */
369 if (!ret) {
370 physnodes[ret].start = start;
371 physnodes[ret].end = end;
372 ret = 1;
373 }
374 return ret;
375}
376
Rohit Seth53fee042007-02-13 13:26:22 +0100377/*
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100378 * Setups up nid to range from addr to addr + size. If the end
379 * boundary is greater than max_addr, then max_addr is used instead.
380 * The return value is 0 if there is additional memory left for
381 * allocation past addr and -1 otherwise. addr is adjusted to be at
382 * the end of the node.
Rohit Seth53fee042007-02-13 13:26:22 +0100383 */
David Rientjesadc19382009-09-25 15:20:09 -0700384static int __init setup_node_range(int nid, u64 *addr, u64 size, u64 max_addr)
Rohit Seth53fee042007-02-13 13:26:22 +0100385{
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200386 int ret = 0;
387 nodes[nid].start = *addr;
388 *addr += size;
389 if (*addr >= max_addr) {
390 *addr = max_addr;
391 ret = -1;
392 }
393 nodes[nid].end = *addr;
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200394 node_set(nid, node_possible_map);
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200395 printk(KERN_INFO "Faking node %d at %016Lx-%016Lx (%LuMB)\n", nid,
396 nodes[nid].start, nodes[nid].end,
397 (nodes[nid].end - nodes[nid].start) >> 20);
398 return ret;
Rohit Seth53fee042007-02-13 13:26:22 +0100399}
400
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200401/*
David Rientjesadc19382009-09-25 15:20:09 -0700402 * Sets up nr_nodes fake nodes interleaved over physical nodes ranging from addr
403 * to max_addr. The return value is the number of nodes allocated.
404 */
405static int __init split_nodes_interleave(u64 addr, u64 max_addr,
406 int nr_phys_nodes, int nr_nodes)
407{
408 nodemask_t physnode_mask = NODE_MASK_NONE;
409 u64 size;
410 int big;
411 int ret = 0;
412 int i;
413
414 if (nr_nodes <= 0)
415 return -1;
416 if (nr_nodes > MAX_NUMNODES) {
417 pr_info("numa=fake=%d too large, reducing to %d\n",
418 nr_nodes, MAX_NUMNODES);
419 nr_nodes = MAX_NUMNODES;
420 }
421
422 size = (max_addr - addr - e820_hole_size(addr, max_addr)) / nr_nodes;
423 /*
424 * Calculate the number of big nodes that can be allocated as a result
425 * of consolidating the remainder.
426 */
David Rientjes68fd1112010-02-15 13:43:25 -0800427 big = ((size & ~FAKE_NODE_MIN_HASH_MASK) * nr_nodes) /
David Rientjesadc19382009-09-25 15:20:09 -0700428 FAKE_NODE_MIN_SIZE;
429
430 size &= FAKE_NODE_MIN_HASH_MASK;
431 if (!size) {
432 pr_err("Not enough memory for each node. "
433 "NUMA emulation disabled.\n");
434 return -1;
435 }
436
437 for (i = 0; i < nr_phys_nodes; i++)
438 if (physnodes[i].start != physnodes[i].end)
439 node_set(i, physnode_mask);
440
441 /*
442 * Continue to fill physical nodes with fake nodes until there is no
443 * memory left on any of them.
444 */
445 while (nodes_weight(physnode_mask)) {
446 for_each_node_mask(i, physnode_mask) {
447 u64 end = physnodes[i].start + size;
448 u64 dma32_end = PFN_PHYS(MAX_DMA32_PFN);
449
450 if (ret < big)
451 end += FAKE_NODE_MIN_SIZE;
452
453 /*
454 * Continue to add memory to this fake node if its
455 * non-reserved memory is less than the per-node size.
456 */
457 while (end - physnodes[i].start -
458 e820_hole_size(physnodes[i].start, end) < size) {
459 end += FAKE_NODE_MIN_SIZE;
460 if (end > physnodes[i].end) {
461 end = physnodes[i].end;
462 break;
463 }
464 }
465
466 /*
467 * If there won't be at least FAKE_NODE_MIN_SIZE of
468 * non-reserved memory in ZONE_DMA32 for the next node,
469 * this one must extend to the boundary.
470 */
471 if (end < dma32_end && dma32_end - end -
472 e820_hole_size(end, dma32_end) < FAKE_NODE_MIN_SIZE)
473 end = dma32_end;
474
475 /*
476 * If there won't be enough non-reserved memory for the
477 * next node, this one must extend to the end of the
478 * physical node.
479 */
480 if (physnodes[i].end - end -
481 e820_hole_size(end, physnodes[i].end) < size)
482 end = physnodes[i].end;
483
484 /*
485 * Avoid allocating more nodes than requested, which can
486 * happen as a result of rounding down each node's size
487 * to FAKE_NODE_MIN_SIZE.
488 */
489 if (nodes_weight(physnode_mask) + ret >= nr_nodes)
490 end = physnodes[i].end;
491
492 if (setup_node_range(ret++, &physnodes[i].start,
493 end - physnodes[i].start,
494 physnodes[i].end) < 0)
495 node_clear(i, physnode_mask);
496 }
497 }
498 return ret;
499}
500
501/*
David Rientjes8df5bb32010-02-15 13:43:30 -0800502 * Returns the end address of a node so that there is at least `size' amount of
503 * non-reserved memory or `max_addr' is reached.
504 */
505static u64 __init find_end_of_node(u64 start, u64 max_addr, u64 size)
506{
507 u64 end = start + size;
508
509 while (end - start - e820_hole_size(start, end) < size) {
510 end += FAKE_NODE_MIN_SIZE;
511 if (end > max_addr) {
512 end = max_addr;
513 break;
514 }
515 }
516 return end;
517}
518
519/*
520 * Sets up fake nodes of `size' interleaved over physical nodes ranging from
521 * `addr' to `max_addr'. The return value is the number of nodes allocated.
522 */
523static int __init split_nodes_size_interleave(u64 addr, u64 max_addr, u64 size)
524{
525 nodemask_t physnode_mask = NODE_MASK_NONE;
526 u64 min_size;
527 int ret = 0;
528 int i;
529
530 if (!size)
531 return -1;
532 /*
533 * The limit on emulated nodes is MAX_NUMNODES, so the size per node is
534 * increased accordingly if the requested size is too small. This
535 * creates a uniform distribution of node sizes across the entire
536 * machine (but not necessarily over physical nodes).
537 */
538 min_size = (max_addr - addr - e820_hole_size(addr, max_addr)) /
539 MAX_NUMNODES;
540 min_size = max(min_size, FAKE_NODE_MIN_SIZE);
541 if ((min_size & FAKE_NODE_MIN_HASH_MASK) < min_size)
542 min_size = (min_size + FAKE_NODE_MIN_SIZE) &
543 FAKE_NODE_MIN_HASH_MASK;
544 if (size < min_size) {
545 pr_err("Fake node size %LuMB too small, increasing to %LuMB\n",
546 size >> 20, min_size >> 20);
547 size = min_size;
548 }
549 size &= FAKE_NODE_MIN_HASH_MASK;
550
551 for (i = 0; i < MAX_NUMNODES; i++)
552 if (physnodes[i].start != physnodes[i].end)
553 node_set(i, physnode_mask);
554 /*
555 * Fill physical nodes with fake nodes of size until there is no memory
556 * left on any of them.
557 */
558 while (nodes_weight(physnode_mask)) {
559 for_each_node_mask(i, physnode_mask) {
560 u64 dma32_end = MAX_DMA32_PFN << PAGE_SHIFT;
561 u64 end;
562
563 end = find_end_of_node(physnodes[i].start,
564 physnodes[i].end, size);
565 /*
566 * If there won't be at least FAKE_NODE_MIN_SIZE of
567 * non-reserved memory in ZONE_DMA32 for the next node,
568 * this one must extend to the boundary.
569 */
570 if (end < dma32_end && dma32_end - end -
571 e820_hole_size(end, dma32_end) < FAKE_NODE_MIN_SIZE)
572 end = dma32_end;
573
574 /*
575 * If there won't be enough non-reserved memory for the
576 * next node, this one must extend to the end of the
577 * physical node.
578 */
579 if (physnodes[i].end - end -
580 e820_hole_size(end, physnodes[i].end) < size)
581 end = physnodes[i].end;
582
583 /*
584 * Setup the fake node that will be allocated as bootmem
585 * later. If setup_node_range() returns non-zero, there
586 * is no more memory available on this physical node.
587 */
588 if (setup_node_range(ret++, &physnodes[i].start,
589 end - physnodes[i].start,
590 physnodes[i].end) < 0)
591 node_clear(i, physnode_mask);
592 }
593 }
594 return ret;
595}
596
597/*
Thomas Gleixner886533a2008-05-12 15:43:36 +0200598 * Sets up the system RAM area from start_pfn to last_pfn according to the
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200599 * numa=fake command-line option.
600 */
David Rientjesadc19382009-09-25 15:20:09 -0700601static int __init numa_emulation(unsigned long start_pfn,
602 unsigned long last_pfn, int acpi, int k8)
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200603{
David Rientjesca2107c2010-02-15 13:43:33 -0800604 u64 addr = start_pfn << PAGE_SHIFT;
Thomas Gleixner886533a2008-05-12 15:43:36 +0200605 u64 max_addr = last_pfn << PAGE_SHIFT;
David Rientjesadc19382009-09-25 15:20:09 -0700606 int num_phys_nodes;
David Rientjesca2107c2010-02-15 13:43:33 -0800607 int num_nodes;
608 int i;
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200609
David Rientjesadc19382009-09-25 15:20:09 -0700610 num_phys_nodes = setup_physnodes(addr, max_addr, acpi, k8);
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200611 /*
David Rientjes8df5bb32010-02-15 13:43:30 -0800612 * If the numa=fake command-line contains a 'M' or 'G', it represents
David Rientjesca2107c2010-02-15 13:43:33 -0800613 * the fixed node size. Otherwise, if it is just a single number N,
614 * split the system RAM into N fake nodes.
David Rientjes8df5bb32010-02-15 13:43:30 -0800615 */
616 if (strchr(cmdline, 'M') || strchr(cmdline, 'G')) {
David Rientjesca2107c2010-02-15 13:43:33 -0800617 u64 size;
618
David Rientjes8df5bb32010-02-15 13:43:30 -0800619 size = memparse(cmdline, &cmdline);
620 num_nodes = split_nodes_size_interleave(addr, max_addr, size);
David Rientjesca2107c2010-02-15 13:43:33 -0800621 } else {
622 unsigned long n;
623
624 n = simple_strtoul(cmdline, NULL, 0);
625 num_nodes = split_nodes_interleave(addr, max_addr, num_phys_nodes, n);
David Rientjes8df5bb32010-02-15 13:43:30 -0800626 }
627
David Rientjesca2107c2010-02-15 13:43:33 -0800628 if (num_nodes < 0)
629 return num_nodes;
Suresh Siddha6ec6e0d2008-03-25 10:14:35 -0700630 memnode_shift = compute_hash_shift(nodes, num_nodes, NULL);
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200631 if (memnode_shift < 0) {
632 memnode_shift = 0;
633 printk(KERN_ERR "No NUMA hash function found. NUMA emulation "
634 "disabled.\n");
635 return -1;
636 }
637
638 /*
David Rientjesadc19382009-09-25 15:20:09 -0700639 * We need to vacate all active ranges that may have been registered for
640 * the e820 memory map.
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200641 */
642 remove_all_active_ranges();
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200643 for_each_node_mask(i, node_possible_map) {
Mel Gorman5cb248a2006-09-27 01:49:52 -0700644 e820_register_active_regions(i, nodes[i].start >> PAGE_SHIFT,
645 nodes[i].end >> PAGE_SHIFT);
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100646 setup_node_bootmem(i, nodes[i].start, nodes[i].end);
Mel Gorman5cb248a2006-09-27 01:49:52 -0700647 }
David Rientjes3484d792007-07-21 17:10:32 +0200648 acpi_fake_nodes(nodes, num_nodes);
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100649 numa_init_array();
650 return 0;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700651}
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200652#endif /* CONFIG_NUMA_EMU */
Linus Torvalds1da177e2005-04-16 15:20:36 -0700653
David Rientjes8ee2deb2009-09-25 15:20:00 -0700654void __init initmem_init(unsigned long start_pfn, unsigned long last_pfn,
655 int acpi, int k8)
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100656{
Linus Torvalds1da177e2005-04-16 15:20:36 -0700657 int i;
658
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200659 nodes_clear(node_possible_map);
Yinghai Lub7ad1492008-02-17 02:02:21 -0800660 nodes_clear(node_online_map);
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200661
Linus Torvalds1da177e2005-04-16 15:20:36 -0700662#ifdef CONFIG_NUMA_EMU
David Rientjesadc19382009-09-25 15:20:09 -0700663 if (cmdline && !numa_emulation(start_pfn, last_pfn, acpi, k8))
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100664 return;
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200665 nodes_clear(node_possible_map);
Yinghai Lub7ad1492008-02-17 02:02:21 -0800666 nodes_clear(node_online_map);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700667#endif
668
669#ifdef CONFIG_ACPI_NUMA
David Rientjes87162732009-09-25 15:20:04 -0700670 if (!numa_off && acpi && !acpi_scan_nodes(start_pfn << PAGE_SHIFT,
671 last_pfn << PAGE_SHIFT))
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100672 return;
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200673 nodes_clear(node_possible_map);
Yinghai Lub7ad1492008-02-17 02:02:21 -0800674 nodes_clear(node_online_map);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700675#endif
676
677#ifdef CONFIG_K8_NUMA
David Rientjes8ee2deb2009-09-25 15:20:00 -0700678 if (!numa_off && k8 && !k8_scan_nodes())
Linus Torvalds1da177e2005-04-16 15:20:36 -0700679 return;
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200680 nodes_clear(node_possible_map);
Yinghai Lub7ad1492008-02-17 02:02:21 -0800681 nodes_clear(node_online_map);
Linus Torvalds1da177e2005-04-16 15:20:36 -0700682#endif
683 printk(KERN_INFO "%s\n",
684 numa_off ? "NUMA turned off" : "No NUMA configuration found");
685
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100686 printk(KERN_INFO "Faking a node at %016lx-%016lx\n",
Linus Torvalds1da177e2005-04-16 15:20:36 -0700687 start_pfn << PAGE_SHIFT,
Thomas Gleixner886533a2008-05-12 15:43:36 +0200688 last_pfn << PAGE_SHIFT);
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100689 /* setup dummy node covering all memory */
690 memnode_shift = 63;
Amul Shah076422d2007-02-13 13:26:19 +0100691 memnodemap = memnode.embedded_map;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700692 memnodemap[0] = 0;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700693 node_set_online(0);
Suresh Siddhae3f1cae2007-05-02 19:27:20 +0200694 node_set(0, node_possible_map);
Mike Travis168ef542008-12-16 17:34:01 -0800695 for (i = 0; i < nr_cpu_ids; i++)
Andi Kleen69d81fc2005-11-05 17:25:53 +0100696 numa_set_node(i, 0);
Thomas Gleixner886533a2008-05-12 15:43:36 +0200697 e820_register_active_regions(0, start_pfn, last_pfn);
698 setup_node_bootmem(0, start_pfn << PAGE_SHIFT, last_pfn << PAGE_SHIFT);
Andi Kleen69d81fc2005-11-05 17:25:53 +0100699}
700
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100701unsigned long __init numa_free_all_bootmem(void)
702{
Linus Torvalds1da177e2005-04-16 15:20:36 -0700703 unsigned long pages = 0;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100704 int i;
705
706 for_each_online_node(i)
Linus Torvalds1da177e2005-04-16 15:20:36 -0700707 pages += free_all_bootmem_node(NODE_DATA(i));
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100708
Yinghai Lu08677212010-02-10 01:20:20 -0800709#ifdef CONFIG_NO_BOOTMEM
710 pages += free_all_memory_core_early(MAX_NUMNODES);
711#endif
712
Linus Torvalds1da177e2005-04-16 15:20:36 -0700713 return pages;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100714}
Linus Torvalds1da177e2005-04-16 15:20:36 -0700715
Andi Kleen2c8c0e62006-09-26 10:52:32 +0200716static __init int numa_setup(char *opt)
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100717{
Andi Kleen2c8c0e62006-09-26 10:52:32 +0200718 if (!opt)
719 return -EINVAL;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100720 if (!strncmp(opt, "off", 3))
Linus Torvalds1da177e2005-04-16 15:20:36 -0700721 numa_off = 1;
722#ifdef CONFIG_NUMA_EMU
David Rientjes8b8ca80e2007-05-02 19:27:09 +0200723 if (!strncmp(opt, "fake=", 5))
724 cmdline = opt + 5;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700725#endif
726#ifdef CONFIG_ACPI_NUMA
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100727 if (!strncmp(opt, "noacpi", 6))
728 acpi_numa = -1;
Linus Torvalds1da177e2005-04-16 15:20:36 -0700729#endif
Andi Kleen2c8c0e62006-09-26 10:52:32 +0200730 return 0;
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100731}
Andi Kleen2c8c0e62006-09-26 10:52:32 +0200732early_param("numa", numa_setup);
733
Mike Travis23ca4bb2008-05-12 21:21:12 +0200734#ifdef CONFIG_NUMA
Yinghai Lud9c2d5a2009-11-21 00:23:37 -0800735
736static __init int find_near_online_node(int node)
737{
738 int n, val;
739 int min_val = INT_MAX;
740 int best_node = -1;
741
742 for_each_online_node(n) {
743 val = node_distance(node, n);
744
745 if (val < min_val) {
746 min_val = val;
747 best_node = n;
748 }
749 }
750
751 return best_node;
752}
753
Ravikiran Thirumalai05b3cbd2006-01-11 22:45:36 +0100754/*
755 * Setup early cpu_to_node.
756 *
757 * Populate cpu_to_node[] only if x86_cpu_to_apicid[],
758 * and apicid_to_node[] tables have valid entries for a CPU.
759 * This means we skip cpu_to_node[] initialisation for NUMA
760 * emulation and faking node case (when running a kernel compiled
761 * for NUMA on a non NUMA box), which is OK as cpu_to_node[]
762 * is already initialized in a round robin manner at numa_init_array,
763 * prior to this call, and this initialization is good enough
764 * for the fake NUMA cases.
Mike Travis23ca4bb2008-05-12 21:21:12 +0200765 *
766 * Called before the per_cpu areas are setup.
Ravikiran Thirumalai05b3cbd2006-01-11 22:45:36 +0100767 */
768void __init init_cpu_to_node(void)
769{
Mike Travis23ca4bb2008-05-12 21:21:12 +0200770 int cpu;
771 u16 *cpu_to_apicid = early_per_cpu_ptr(x86_cpu_to_apicid);
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100772
Mike Travis23ca4bb2008-05-12 21:21:12 +0200773 BUG_ON(cpu_to_apicid == NULL);
774
775 for_each_possible_cpu(cpu) {
Yinghai Lu7c9e92b2008-02-19 15:35:54 -0800776 int node;
Mike Travis23ca4bb2008-05-12 21:21:12 +0200777 u16 apicid = cpu_to_apicid[cpu];
Thomas Gleixnere3cfe522008-01-30 13:30:37 +0100778
Ravikiran Thirumalai05b3cbd2006-01-11 22:45:36 +0100779 if (apicid == BAD_APICID)
780 continue;
Yinghai Lu7c9e92b2008-02-19 15:35:54 -0800781 node = apicid_to_node[apicid];
782 if (node == NUMA_NO_NODE)
Ravikiran Thirumalai05b3cbd2006-01-11 22:45:36 +0100783 continue;
Yinghai Lu7c9e92b2008-02-19 15:35:54 -0800784 if (!node_online(node))
Yinghai Lud9c2d5a2009-11-21 00:23:37 -0800785 node = find_near_online_node(node);
Mike Travis23ca4bb2008-05-12 21:21:12 +0200786 numa_set_node(cpu, node);
Ravikiran Thirumalai05b3cbd2006-01-11 22:45:36 +0100787 }
788}
Mike Travis23ca4bb2008-05-12 21:21:12 +0200789#endif
Ravikiran Thirumalai05b3cbd2006-01-11 22:45:36 +0100790
Andi Kleencf050132006-01-11 22:46:27 +0100791
Brian Gerst6470aff2009-01-27 12:56:47 +0900792void __cpuinit numa_set_node(int cpu, int node)
793{
794 int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map);
795
796 /* early setting, no percpu area yet */
797 if (cpu_to_node_map) {
798 cpu_to_node_map[cpu] = node;
799 return;
800 }
801
802#ifdef CONFIG_DEBUG_PER_CPU_MAPS
Brian Gerst44581a22009-02-08 09:58:40 -0500803 if (cpu >= nr_cpu_ids || !cpu_possible(cpu)) {
Brian Gerst6470aff2009-01-27 12:56:47 +0900804 printk(KERN_ERR "numa_set_node: invalid cpu# (%d)\n", cpu);
805 dump_stack();
806 return;
807 }
808#endif
809 per_cpu(x86_cpu_to_node_map, cpu) = node;
810
811 if (node != NUMA_NO_NODE)
812 per_cpu(node_number, cpu) = node;
813}
814
815void __cpuinit numa_clear_node(int cpu)
816{
817 numa_set_node(cpu, NUMA_NO_NODE);
818}
819
820#ifndef CONFIG_DEBUG_PER_CPU_MAPS
821
822void __cpuinit numa_add_cpu(int cpu)
823{
Rusty Russellc032ef602009-03-13 14:49:53 +1030824 cpumask_set_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
Brian Gerst6470aff2009-01-27 12:56:47 +0900825}
826
827void __cpuinit numa_remove_cpu(int cpu)
828{
Rusty Russellc032ef602009-03-13 14:49:53 +1030829 cpumask_clear_cpu(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]);
Brian Gerst6470aff2009-01-27 12:56:47 +0900830}
831
832#else /* CONFIG_DEBUG_PER_CPU_MAPS */
833
834/*
835 * --------- debug versions of the numa functions ---------
836 */
837static void __cpuinit numa_set_cpumask(int cpu, int enable)
838{
839 int node = early_cpu_to_node(cpu);
Rusty Russell73e907d2009-03-13 14:49:57 +1030840 struct cpumask *mask;
Brian Gerst6470aff2009-01-27 12:56:47 +0900841 char buf[64];
842
Rusty Russellc032ef602009-03-13 14:49:53 +1030843 mask = node_to_cpumask_map[node];
844 if (mask == NULL) {
845 printk(KERN_ERR "node_to_cpumask_map[%i] NULL\n", node);
Brian Gerst6470aff2009-01-27 12:56:47 +0900846 dump_stack();
847 return;
848 }
849
Brian Gerst6470aff2009-01-27 12:56:47 +0900850 if (enable)
Rusty Russellc032ef602009-03-13 14:49:53 +1030851 cpumask_set_cpu(cpu, mask);
Brian Gerst6470aff2009-01-27 12:56:47 +0900852 else
Rusty Russellc032ef602009-03-13 14:49:53 +1030853 cpumask_clear_cpu(cpu, mask);
Brian Gerst6470aff2009-01-27 12:56:47 +0900854
855 cpulist_scnprintf(buf, sizeof(buf), mask);
856 printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n",
857 enable ? "numa_add_cpu" : "numa_remove_cpu", cpu, node, buf);
858}
859
860void __cpuinit numa_add_cpu(int cpu)
861{
862 numa_set_cpumask(cpu, 1);
863}
864
865void __cpuinit numa_remove_cpu(int cpu)
866{
867 numa_set_cpumask(cpu, 0);
868}
869
870int cpu_to_node(int cpu)
871{
872 if (early_per_cpu_ptr(x86_cpu_to_node_map)) {
873 printk(KERN_WARNING
874 "cpu_to_node(%d): usage too early!\n", cpu);
875 dump_stack();
876 return early_per_cpu_ptr(x86_cpu_to_node_map)[cpu];
877 }
878 return per_cpu(x86_cpu_to_node_map, cpu);
879}
880EXPORT_SYMBOL(cpu_to_node);
881
882/*
883 * Same function as cpu_to_node() but used if called before the
884 * per_cpu areas are setup.
885 */
886int early_cpu_to_node(int cpu)
887{
888 if (early_per_cpu_ptr(x86_cpu_to_node_map))
889 return early_per_cpu_ptr(x86_cpu_to_node_map)[cpu];
890
Brian Gerst44581a22009-02-08 09:58:40 -0500891 if (!cpu_possible(cpu)) {
Brian Gerst6470aff2009-01-27 12:56:47 +0900892 printk(KERN_WARNING
893 "early_cpu_to_node(%d): no per_cpu area!\n", cpu);
894 dump_stack();
895 return NUMA_NO_NODE;
896 }
897 return per_cpu(x86_cpu_to_node_map, cpu);
898}
899
Brian Gerst6470aff2009-01-27 12:56:47 +0900900/*
Brian Gerst6470aff2009-01-27 12:56:47 +0900901 * --------- end of debug versions of the numa functions ---------
902 */
903
904#endif /* CONFIG_DEBUG_PER_CPU_MAPS */