*start_pfn = 0;
}
-static void __cpuinit map_cpu_to_node(int cpu, int node)
+static inline void map_cpu_to_node(int cpu, int node)
{
numa_cpu_lookup_table[cpu] = node;
- dbg("adding cpu %d to node %d\n", cpu, node);
-
if (!(cpu_isset(cpu, numa_cpumask_lookup_table[node])))
cpu_set(cpu, numa_cpumask_lookup_table[node]);
}
}
#endif /* CONFIG_HOTPLUG_CPU */
-static struct device_node * __cpuinit find_cpu_node(unsigned int cpu)
+static struct device_node *find_cpu_node(unsigned int cpu)
{
unsigned int hw_cpuid = get_hard_smp_processor_id(cpu);
struct device_node *cpu_node = NULL;
return (unsigned int *)get_property(dev, "ibm,associativity", NULL);
}
-/* Returns nid in the range [0..MAX_NUMNODES-1], or -1 if no useful numa
- * info is found.
- */
-static int of_node_to_nid_single(struct device_node *device)
+static int of_node_numa_domain(struct device_node *device)
{
- int nid = -1;
+ int numa_domain;
unsigned int *tmp;
if (min_common_depth == -1)
- goto out;
+ return 0;
tmp = of_get_associativity(device);
- if (!tmp)
- goto out;
-
- if (tmp[0] >= min_common_depth)
- nid = tmp[min_common_depth];
-
- /* POWER4 LPAR uses 0xffff as invalid node */
- if (nid == 0xffff || nid >= MAX_NUMNODES)
- nid = -1;
-out:
- return nid;
-}
-
-/* Walk the device tree upwards, looking for an associativity id */
-int of_node_to_nid(struct device_node *device)
-{
- struct device_node *tmp;
- int nid = -1;
-
- of_node_get(device);
- while (device) {
- nid = of_node_to_nid_single(device);
- if (nid != -1)
- break;
-
- tmp = device;
- device = of_get_parent(tmp);
- of_node_put(tmp);
+ if (tmp && (tmp[0] >= min_common_depth)) {
+ numa_domain = tmp[min_common_depth];
+ } else {
+ dbg("WARNING: no NUMA information for %s\n",
+ device->full_name);
+ numa_domain = 0;
}
- of_node_put(device);
-
- return nid;
+ return numa_domain;
}
-EXPORT_SYMBOL_GPL(of_node_to_nid);
/*
* In theory, the "ibm,associativity" property may contain multiple
if ((len >= 1) && ref_points) {
depth = ref_points[1];
} else {
- dbg("NUMA: ibm,associativity-reference-points not found.\n");
+ dbg("WARNING: could not find NUMA "
+ "associativity reference point\n");
depth = -1;
}
of_node_put(rtas_root);
* Figure out to which domain a cpu belongs and stick it there.
* Return the id of the domain used.
*/
-static int __cpuinit numa_setup_cpu(unsigned long lcpu)
+static int numa_setup_cpu(unsigned long lcpu)
{
- int nid = 0;
+ int numa_domain = 0;
struct device_node *cpu = find_cpu_node(lcpu);
if (!cpu) {
goto out;
}
- nid = of_node_to_nid_single(cpu);
+ numa_domain = of_node_numa_domain(cpu);
- if (nid < 0 || !node_online(nid))
- nid = any_online_node(NODE_MASK_ALL);
+ if (numa_domain >= num_online_nodes()) {
+ /*
+ * POWER4 LPAR uses 0xffff as invalid node,
+ * dont warn in this case.
+ */
+ if (numa_domain != 0xffff)
+ printk(KERN_ERR "WARNING: cpu %ld "
+ "maps to invalid NUMA node %d\n",
+ lcpu, numa_domain);
+ numa_domain = 0;
+ }
out:
- map_cpu_to_node(lcpu, nid);
+ node_set_online(numa_domain);
+
+ map_cpu_to_node(lcpu, numa_domain);
of_node_put(cpu);
- return nid;
+ return numa_domain;
}
-static int __cpuinit cpu_numa_callback(struct notifier_block *nfb,
+static int cpu_numa_callback(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
{
switch (action) {
case CPU_UP_PREPARE:
- numa_setup_cpu(lcpu);
+ if (min_common_depth == -1 || !numa_enabled)
+ map_cpu_to_node(lcpu, 0);
+ else
+ numa_setup_cpu(lcpu);
ret = NOTIFY_OK;
break;
#ifdef CONFIG_HOTPLUG_CPU
{
struct device_node *cpu = NULL;
struct device_node *memory = NULL;
- int default_nid = 0;
+ int max_domain;
unsigned long i;
if (numa_enabled == 0) {
min_common_depth = find_min_common_depth();
+ dbg("NUMA associativity depth for CPU/Memory: %d\n", min_common_depth);
if (min_common_depth < 0)
return min_common_depth;
- dbg("NUMA associativity depth for CPU/Memory: %d\n", min_common_depth);
+ max_domain = numa_setup_cpu(boot_cpuid);
/*
- * Even though we connect cpus to numa domains later in SMP
- * init, we need to know the node ids now. This is because
- * each node to be onlined must have NODE_DATA etc backing it.
+ * Even though we connect cpus to numa domains later in SMP init,
+ * we need to know the maximum node id now. This is because each
+ * node id must have NODE_DATA etc backing it.
+ * As a result of hotplug we could still have cpus appear later on
+ * with larger node ids. In that case we force the cpu into node 0.
*/
- for_each_present_cpu(i) {
- int nid;
+ for_each_cpu(i) {
+ int numa_domain;
cpu = find_cpu_node(i);
- BUG_ON(!cpu);
- nid = of_node_to_nid_single(cpu);
- of_node_put(cpu);
- /*
- * Don't fall back to default_nid yet -- we will plug
- * cpus into nodes once the memory scan has discovered
- * the topology.
- */
- if (nid < 0)
- continue;
- node_set_online(nid);
+ if (cpu) {
+ numa_domain = of_node_numa_domain(cpu);
+ of_node_put(cpu);
+
+ if (numa_domain < MAX_NUMNODES &&
+ max_domain < numa_domain)
+ max_domain = numa_domain;
+ }
}
get_n_mem_cells(&n_mem_addr_cells, &n_mem_size_cells);
while ((memory = of_find_node_by_type(memory, "memory")) != NULL) {
unsigned long start;
unsigned long size;
- int nid;
+ int numa_domain;
int ranges;
unsigned int *memcell_buf;
unsigned int len;
start = read_n_cells(n_mem_addr_cells, &memcell_buf);
size = read_n_cells(n_mem_size_cells, &memcell_buf);
- /*
- * Assumption: either all memory nodes or none will
- * have associativity properties. If none, then
- * everything goes to default_nid.
- */
- nid = of_node_to_nid_single(memory);
- if (nid < 0)
- nid = default_nid;
- node_set_online(nid);
+ numa_domain = of_node_numa_domain(memory);
+
+ if (numa_domain >= MAX_NUMNODES) {
+ if (numa_domain != 0xffff)
+ printk(KERN_ERR "WARNING: memory at %lx maps "
+ "to invalid NUMA node %d\n", start,
+ numa_domain);
+ numa_domain = 0;
+ }
+
+ if (max_domain < numa_domain)
+ max_domain = numa_domain;
if (!(size = numa_enforce_memory_limit(start, size))) {
if (--ranges)
continue;
}
- add_region(nid, start >> PAGE_SHIFT,
+ add_region(numa_domain, start >> PAGE_SHIFT,
size >> PAGE_SHIFT);
if (--ranges)
goto new_range;
}
+ for (i = 0; i <= max_domain; i++)
+ node_set_online(i);
+
return 0;
}
unsigned long total_ram = lmb_phys_mem_size();
unsigned int i;
- printk(KERN_DEBUG "Top of RAM: 0x%lx, Total RAM: 0x%lx\n",
+ printk(KERN_INFO "Top of RAM: 0x%lx, Total RAM: 0x%lx\n",
top_of_ram, total_ram);
- printk(KERN_DEBUG "Memory hole size: %ldMB\n",
+ printk(KERN_INFO "Memory hole size: %ldMB\n",
(top_of_ram - total_ram) >> 20);
+ map_cpu_to_node(boot_cpuid, 0);
for (i = 0; i < lmb.memory.cnt; ++i)
add_region(0, lmb.memory.region[i].base >> PAGE_SHIFT,
lmb_size_pages(&lmb.memory, i));
return;
for_each_online_node(node) {
- printk(KERN_DEBUG "Node %d CPUs:", node);
+ printk(KERN_INFO "Node %d CPUs:", node);
count = 0;
/*
for_each_online_node(node) {
unsigned long i;
- printk(KERN_DEBUG "Node %d Memory:", node);
+ printk(KERN_INFO "Node %d Memory:", node);
count = 0;
unsigned long end_pfn)
{
int new_nid;
- unsigned long ret = __lmb_alloc_base(size, align, end_pfn << PAGE_SHIFT);
+ unsigned long ret = lmb_alloc_base(size, align, end_pfn << PAGE_SHIFT);
/* retry over all memory */
if (!ret)
- ret = __lmb_alloc_base(size, align, lmb_end_of_DRAM());
+ ret = lmb_alloc_base(size, align, lmb_end_of_DRAM());
if (!ret)
panic("numa.c: cannot allocate %lu bytes on node %d",
return (void *)ret;
}
-static struct notifier_block __cpuinitdata ppc64_numa_nb = {
- .notifier_call = cpu_numa_callback,
- .priority = 1 /* Must run before sched domains notifier. */
-};
-
void __init do_init_bootmem(void)
{
int nid;
unsigned int i;
+ static struct notifier_block ppc64_numa_nb = {
+ .notifier_call = cpu_numa_callback,
+ .priority = 1 /* Must run before sched domains notifier. */
+ };
min_low_pfn = 0;
max_low_pfn = lmb_end_of_DRAM() >> PAGE_SHIFT;
dump_numa_memory_topology();
register_cpu_notifier(&ppc64_numa_nb);
- cpu_numa_callback(&ppc64_numa_nb, CPU_UP_PREPARE,
- (void *)(unsigned long)boot_cpuid);
for_each_online_node(nid) {
unsigned long start_pfn, end_pfn, pages_present;
{
struct device_node *memory = NULL;
nodemask_t nodes;
- int default_nid = any_online_node(NODE_MASK_ALL);
- int nid;
+ int numa_domain = 0;
if (!numa_enabled || (min_common_depth < 0))
- return default_nid;
+ return numa_domain;
while ((memory = of_find_node_by_type(memory, "memory")) != NULL) {
unsigned long start, size;
ha_new_range:
start = read_n_cells(n_mem_addr_cells, &memcell_buf);
size = read_n_cells(n_mem_size_cells, &memcell_buf);
- nid = of_node_to_nid_single(memory);
+ numa_domain = of_node_numa_domain(memory);
/* Domains not present at boot default to 0 */
- if (nid < 0 || !node_online(nid))
- nid = default_nid;
+ if (!node_online(numa_domain))
+ numa_domain = any_online_node(NODE_MASK_ALL);
if ((scn_addr >= start) && (scn_addr < (start + size))) {
of_node_put(memory);
- goto got_nid;
+ goto got_numa_domain;
}
if (--ranges) /* process all ranges in cell */
goto ha_new_range;
}
BUG(); /* section address should be found above */
- return 0;
/* Temporary code to ensure that returned node is not empty */
-got_nid:
+got_numa_domain:
nodes_setall(nodes);
- while (NODE_DATA(nid)->node_spanned_pages == 0) {
- node_clear(nid, nodes);
- nid = any_online_node(nodes);
+ while (NODE_DATA(numa_domain)->node_spanned_pages == 0) {
+ node_clear(numa_domain, nodes);
+ numa_domain = any_online_node(nodes);
}
- return nid;
+ return numa_domain;
}
#endif /* CONFIG_MEMORY_HOTPLUG */
git://git.onelab.eu / linux-2.6.git / blobdiff