2005-04-16 22:20:36 +00:00
|
|
|
/*
|
|
|
|
* ACPI 3.0 based NUMA setup
|
|
|
|
* Copyright 2004 Andi Kleen, SuSE Labs.
|
|
|
|
*
|
|
|
|
* Reads the ACPI SRAT table to figure out what memory belongs to which CPUs.
|
|
|
|
*
|
|
|
|
* Called from acpi_numa_init while reading the SRAT and SLIT tables.
|
|
|
|
* Assumes all memory regions belonging to a single proximity domain
|
|
|
|
* are in one chunk. Holes between them will be included in the node.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/acpi.h>
|
|
|
|
#include <linux/mmzone.h>
|
|
|
|
#include <linux/bitmap.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/topology.h>
|
2006-04-07 17:49:18 +00:00
|
|
|
#include <linux/bootmem.h>
|
2010-08-25 20:39:17 +00:00
|
|
|
#include <linux/memblock.h>
|
2006-04-07 17:49:18 +00:00
|
|
|
#include <linux/mm.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
#include <asm/proto.h>
|
|
|
|
#include <asm/numa.h>
|
2006-01-11 21:44:39 +00:00
|
|
|
#include <asm/e820.h>
|
2009-02-17 12:58:15 +00:00
|
|
|
#include <asm/apic.h>
|
2009-01-21 09:24:27 +00:00
|
|
|
#include <asm/uv/uv.h>
|
2005-04-16 22:20:36 +00:00
|
|
|
|
2006-09-26 08:52:33 +00:00
|
|
|
int acpi_numa __initdata;
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
static struct acpi_table_slit *acpi_slit;
|
|
|
|
|
2006-10-01 06:27:06 +00:00
|
|
|
static struct bootnode nodes_add[MAX_NUMNODES];
|
2005-04-16 22:20:36 +00:00
|
|
|
|
|
|
|
static __init int setup_node(int pxm)
|
|
|
|
{
|
2006-06-23 09:03:19 +00:00
|
|
|
return acpi_map_pxm_to_node(pxm);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static __init void bad_srat(void)
|
|
|
|
{
|
2005-09-12 16:49:25 +00:00
|
|
|
int i;
|
2005-04-16 22:20:36 +00:00
|
|
|
printk(KERN_ERR "SRAT: SRAT not used.\n");
|
|
|
|
acpi_numa = -1;
|
2009-07-18 06:56:57 +00:00
|
|
|
for (i = 0; i < MAX_NUMNODES; i++) {
|
2011-02-16 11:13:07 +00:00
|
|
|
numa_nodes[i].start = numa_nodes[i].end = 0;
|
2009-07-18 06:56:57 +00:00
|
|
|
nodes_add[i].start = nodes_add[i].end = 0;
|
|
|
|
}
|
2006-09-27 08:49:52 +00:00
|
|
|
remove_all_active_ranges();
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static __init inline int srat_disabled(void)
|
|
|
|
{
|
2011-02-16 11:13:06 +00:00
|
|
|
return acpi_numa < 0;
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Callback for SLIT parsing */
|
|
|
|
void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
|
|
|
|
{
|
2008-07-11 03:36:37 +00:00
|
|
|
unsigned length;
|
|
|
|
unsigned long phys;
|
|
|
|
|
|
|
|
length = slit->header.length;
|
2010-08-25 20:39:17 +00:00
|
|
|
phys = memblock_find_in_range(0, max_pfn_mapped<<PAGE_SHIFT, length,
|
2008-07-11 03:36:37 +00:00
|
|
|
PAGE_SIZE);
|
|
|
|
|
2010-08-25 20:39:17 +00:00
|
|
|
if (phys == MEMBLOCK_ERROR)
|
2008-07-11 03:36:37 +00:00
|
|
|
panic(" Can not save slit!\n");
|
|
|
|
|
|
|
|
acpi_slit = __va(phys);
|
|
|
|
memcpy(acpi_slit, slit, length);
|
2010-08-25 20:39:17 +00:00
|
|
|
memblock_x86_reserve_range(phys, phys + length, "ACPI SLIT");
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2009-03-30 21:55:30 +00:00
|
|
|
/* Callback for Proximity Domain -> x2APIC mapping */
|
|
|
|
void __init
|
|
|
|
acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa)
|
|
|
|
{
|
|
|
|
int pxm, node;
|
|
|
|
int apic_id;
|
|
|
|
|
|
|
|
if (srat_disabled())
|
|
|
|
return;
|
|
|
|
if (pa->header.length < sizeof(struct acpi_srat_x2apic_cpu_affinity)) {
|
|
|
|
bad_srat();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
|
|
|
|
return;
|
|
|
|
pxm = pa->proximity_domain;
|
|
|
|
node = setup_node(pxm);
|
|
|
|
if (node < 0) {
|
|
|
|
printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
|
|
|
|
bad_srat();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
apic_id = pa->apic_id;
|
2010-12-17 03:09:58 +00:00
|
|
|
if (apic_id >= MAX_LOCAL_APIC) {
|
|
|
|
printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
|
|
|
|
return;
|
|
|
|
}
|
2011-01-23 13:37:39 +00:00
|
|
|
set_apicid_to_node(apic_id, node);
|
2009-04-17 14:22:42 +00:00
|
|
|
node_set(node, cpu_nodes_parsed);
|
2009-03-30 21:55:30 +00:00
|
|
|
acpi_numa = 1;
|
2009-11-21 08:23:37 +00:00
|
|
|
printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%04x -> Node %u\n",
|
2009-03-30 21:55:30 +00:00
|
|
|
pxm, apic_id, node);
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Callback for Proximity Domain -> LAPIC mapping */
|
|
|
|
void __init
|
2007-02-02 16:48:22 +00:00
|
|
|
acpi_numa_processor_affinity_init(struct acpi_srat_cpu_affinity *pa)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
int pxm, node;
|
2008-01-30 12:33:10 +00:00
|
|
|
int apic_id;
|
|
|
|
|
2006-02-03 20:51:26 +00:00
|
|
|
if (srat_disabled())
|
|
|
|
return;
|
2007-02-02 16:48:22 +00:00
|
|
|
if (pa->header.length != sizeof(struct acpi_srat_cpu_affinity)) {
|
2006-05-15 16:19:44 +00:00
|
|
|
bad_srat();
|
2006-02-03 20:51:26 +00:00
|
|
|
return;
|
|
|
|
}
|
2007-02-02 16:48:22 +00:00
|
|
|
if ((pa->flags & ACPI_SRAT_CPU_ENABLED) == 0)
|
2005-04-16 22:20:36 +00:00
|
|
|
return;
|
2007-02-02 16:48:22 +00:00
|
|
|
pxm = pa->proximity_domain_lo;
|
2005-04-16 22:20:36 +00:00
|
|
|
node = setup_node(pxm);
|
|
|
|
if (node < 0) {
|
|
|
|
printk(KERN_ERR "SRAT: Too many proximity domains %x\n", pxm);
|
|
|
|
bad_srat();
|
|
|
|
return;
|
|
|
|
}
|
2008-02-17 07:00:22 +00:00
|
|
|
|
2008-09-23 20:37:13 +00:00
|
|
|
if (get_uv_system_type() >= UV_X2APIC)
|
2008-03-28 19:12:08 +00:00
|
|
|
apic_id = (pa->apic_id << 8) | pa->local_sapic_eid;
|
|
|
|
else
|
|
|
|
apic_id = pa->apic_id;
|
2010-12-17 03:09:58 +00:00
|
|
|
|
|
|
|
if (apic_id >= MAX_LOCAL_APIC) {
|
|
|
|
printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u skipped apicid that is too big\n", pxm, apic_id, node);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2011-01-23 13:37:39 +00:00
|
|
|
set_apicid_to_node(apic_id, node);
|
2009-04-17 14:22:42 +00:00
|
|
|
node_set(node, cpu_nodes_parsed);
|
2005-04-16 22:20:36 +00:00
|
|
|
acpi_numa = 1;
|
2009-11-21 08:23:37 +00:00
|
|
|
printk(KERN_INFO "SRAT: PXM %u -> APIC 0x%02x -> Node %u\n",
|
2008-01-30 12:33:10 +00:00
|
|
|
pxm, apic_id, node);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-10-01 06:27:05 +00:00
|
|
|
#ifdef CONFIG_MEMORY_HOTPLUG_SPARSE
|
|
|
|
static inline int save_add_info(void) {return 1;}
|
|
|
|
#else
|
|
|
|
static inline int save_add_info(void) {return 0;}
|
|
|
|
#endif
|
2006-04-07 17:49:18 +00:00
|
|
|
/*
|
2009-05-15 20:59:37 +00:00
|
|
|
* Update nodes_add[]
|
|
|
|
* This code supports one contiguous hot add area per node
|
2006-04-07 17:49:18 +00:00
|
|
|
*/
|
2009-05-15 20:59:37 +00:00
|
|
|
static void __init
|
|
|
|
update_nodes_add(int node, unsigned long start, unsigned long end)
|
2006-04-07 17:49:18 +00:00
|
|
|
{
|
|
|
|
unsigned long s_pfn = start >> PAGE_SHIFT;
|
|
|
|
unsigned long e_pfn = end >> PAGE_SHIFT;
|
2009-05-15 20:59:37 +00:00
|
|
|
int changed = 0;
|
2006-04-07 17:49:18 +00:00
|
|
|
struct bootnode *nd = &nodes_add[node];
|
|
|
|
|
|
|
|
/* I had some trouble with strange memory hotadd regions breaking
|
|
|
|
the boot. Be very strict here and reject anything unexpected.
|
|
|
|
If you want working memory hotadd write correct SRATs.
|
|
|
|
|
|
|
|
The node size check is a basic sanity check to guard against
|
|
|
|
mistakes */
|
|
|
|
if ((signed long)(end - start) < NODE_MIN_SIZE) {
|
|
|
|
printk(KERN_ERR "SRAT: Hotplug area too small\n");
|
2009-05-15 20:59:37 +00:00
|
|
|
return;
|
2006-04-07 17:49:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* This check might be a bit too strict, but I'm keeping it for now. */
|
2006-09-27 08:49:52 +00:00
|
|
|
if (absent_pages_in_range(s_pfn, e_pfn) != e_pfn - s_pfn) {
|
2006-09-27 08:49:58 +00:00
|
|
|
printk(KERN_ERR
|
|
|
|
"SRAT: Hotplug area %lu -> %lu has existing memory\n",
|
|
|
|
s_pfn, e_pfn);
|
2009-05-15 20:59:37 +00:00
|
|
|
return;
|
2006-04-07 17:49:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Looks good */
|
|
|
|
|
|
|
|
if (nd->start == nd->end) {
|
2007-02-02 16:48:22 +00:00
|
|
|
nd->start = start;
|
|
|
|
nd->end = end;
|
2006-04-07 17:49:18 +00:00
|
|
|
changed = 1;
|
2007-02-02 16:48:22 +00:00
|
|
|
} else {
|
|
|
|
if (nd->start == end) {
|
|
|
|
nd->start = start;
|
2006-04-07 17:49:18 +00:00
|
|
|
changed = 1;
|
|
|
|
}
|
2007-02-02 16:48:22 +00:00
|
|
|
if (nd->end == start) {
|
|
|
|
nd->end = end;
|
2006-04-07 17:49:18 +00:00
|
|
|
changed = 1;
|
|
|
|
}
|
|
|
|
if (!changed)
|
|
|
|
printk(KERN_ERR "SRAT: Hotplug zone not continuous. Partly ignored\n");
|
2007-02-02 16:48:22 +00:00
|
|
|
}
|
2006-04-07 17:49:18 +00:00
|
|
|
|
2010-01-20 20:10:47 +00:00
|
|
|
if (changed) {
|
|
|
|
node_set(node, cpu_nodes_parsed);
|
2009-05-15 20:59:37 +00:00
|
|
|
printk(KERN_INFO "SRAT: hot plug zone found %Lx - %Lx\n",
|
|
|
|
nd->start, nd->end);
|
2010-01-20 20:10:47 +00:00
|
|
|
}
|
2006-04-07 17:49:18 +00:00
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
|
|
|
|
void __init
|
2007-02-02 16:48:22 +00:00
|
|
|
acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
2011-02-16 11:13:06 +00:00
|
|
|
struct bootnode *nd;
|
2005-04-16 22:20:36 +00:00
|
|
|
unsigned long start, end;
|
|
|
|
int node, pxm;
|
|
|
|
|
2006-02-03 20:51:26 +00:00
|
|
|
if (srat_disabled())
|
2005-04-16 22:20:36 +00:00
|
|
|
return;
|
2007-02-02 16:48:22 +00:00
|
|
|
if (ma->header.length != sizeof(struct acpi_srat_mem_affinity)) {
|
2006-02-03 20:51:26 +00:00
|
|
|
bad_srat();
|
|
|
|
return;
|
|
|
|
}
|
2007-02-02 16:48:22 +00:00
|
|
|
if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)
|
2006-02-03 20:51:26 +00:00
|
|
|
return;
|
2007-02-02 16:48:22 +00:00
|
|
|
|
|
|
|
if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())
|
2006-04-07 17:49:18 +00:00
|
|
|
return;
|
2007-02-02 16:48:22 +00:00
|
|
|
start = ma->base_address;
|
|
|
|
end = start + ma->length;
|
2005-04-16 22:20:36 +00:00
|
|
|
pxm = ma->proximity_domain;
|
|
|
|
node = setup_node(pxm);
|
|
|
|
if (node < 0) {
|
|
|
|
printk(KERN_ERR "SRAT: Too many proximity domains.\n");
|
|
|
|
bad_srat();
|
|
|
|
return;
|
|
|
|
}
|
2011-02-16 16:11:07 +00:00
|
|
|
|
|
|
|
if (numa_add_memblk(node, start, end) < 0) {
|
2005-04-16 22:20:36 +00:00
|
|
|
bad_srat();
|
|
|
|
return;
|
|
|
|
}
|
2006-04-07 17:49:18 +00:00
|
|
|
|
2008-03-25 17:14:35 +00:00
|
|
|
printk(KERN_INFO "SRAT: Node %u PXM %u %lx-%lx\n", node, pxm,
|
|
|
|
start, end);
|
2006-04-07 17:49:18 +00:00
|
|
|
|
2011-02-16 11:13:06 +00:00
|
|
|
if (!(ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE)) {
|
2011-02-16 11:13:07 +00:00
|
|
|
nd = &numa_nodes[node];
|
2011-02-16 11:13:07 +00:00
|
|
|
if (!node_test_and_set(node, mem_nodes_parsed)) {
|
2011-02-16 11:13:06 +00:00
|
|
|
nd->start = start;
|
|
|
|
nd->end = end;
|
|
|
|
} else {
|
|
|
|
if (start < nd->start)
|
|
|
|
nd->start = start;
|
|
|
|
if (nd->end < end)
|
|
|
|
nd->end = end;
|
|
|
|
}
|
|
|
|
} else
|
2009-05-15 20:59:37 +00:00
|
|
|
update_nodes_add(node, start, end);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
|
2006-01-11 21:44:39 +00:00
|
|
|
/* Sanity check to catch more bad SRATs (they are amazingly common).
|
|
|
|
Make sure the PXMs cover all memory. */
|
2007-07-21 15:10:32 +00:00
|
|
|
static int __init nodes_cover_memory(const struct bootnode *nodes)
|
2006-01-11 21:44:39 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
unsigned long pxmram, e820ram;
|
|
|
|
|
|
|
|
pxmram = 0;
|
2011-02-16 11:13:07 +00:00
|
|
|
for_each_node_mask(i, mem_nodes_parsed) {
|
2006-01-11 21:44:39 +00:00
|
|
|
unsigned long s = nodes[i].start >> PAGE_SHIFT;
|
|
|
|
unsigned long e = nodes[i].end >> PAGE_SHIFT;
|
|
|
|
pxmram += e - s;
|
x86: Fix checking of SRAT when node 0 ram is not from 0
Found one system that boot from socket1 instead of socket0, SRAT get rejected...
[ 0.000000] SRAT: Node 1 PXM 0 0-a0000
[ 0.000000] SRAT: Node 1 PXM 0 100000-80000000
[ 0.000000] SRAT: Node 1 PXM 0 100000000-2080000000
[ 0.000000] SRAT: Node 0 PXM 1 2080000000-4080000000
[ 0.000000] SRAT: Node 2 PXM 2 4080000000-6080000000
[ 0.000000] SRAT: Node 3 PXM 3 6080000000-8080000000
[ 0.000000] SRAT: Node 4 PXM 4 8080000000-a080000000
[ 0.000000] SRAT: Node 5 PXM 5 a080000000-c080000000
[ 0.000000] SRAT: Node 6 PXM 6 c080000000-e080000000
[ 0.000000] SRAT: Node 7 PXM 7 e080000000-10080000000
...
[ 0.000000] NUMA: Allocated memnodemap from 500000 - 701040
[ 0.000000] NUMA: Using 20 for the hash shift.
[ 0.000000] Adding active range (0, 0x2080000, 0x4080000) 0 entries of 3200 used
[ 0.000000] Adding active range (1, 0x0, 0x96) 1 entries of 3200 used
[ 0.000000] Adding active range (1, 0x100, 0x7f750) 2 entries of 3200 used
[ 0.000000] Adding active range (1, 0x100000, 0x2080000) 3 entries of 3200 used
[ 0.000000] Adding active range (2, 0x4080000, 0x6080000) 4 entries of 3200 used
[ 0.000000] Adding active range (3, 0x6080000, 0x8080000) 5 entries of 3200 used
[ 0.000000] Adding active range (4, 0x8080000, 0xa080000) 6 entries of 3200 used
[ 0.000000] Adding active range (5, 0xa080000, 0xc080000) 7 entries of 3200 used
[ 0.000000] Adding active range (6, 0xc080000, 0xe080000) 8 entries of 3200 used
[ 0.000000] Adding active range (7, 0xe080000, 0x10080000) 9 entries of 3200 used
[ 0.000000] SRAT: PXMs only cover 917504MB of your 1048566MB e820 RAM. Not used.
[ 0.000000] SRAT: SRAT not used.
the early_node_map is not sorted because node0 with non zero start come first.
so try to sort it right away after all regions are registered.
also fixs refression by 8716273c (x86: Export srat physical topology)
-v2: make it more solid to handle cross node case like node0 [0,4g), [8,12g) and node1 [4g, 8g), [12g, 16g)
-v3: update comments.
Reported-and-tested-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4B2579D2.3010201@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-12-16 01:59:02 +00:00
|
|
|
pxmram -= __absent_pages_in_range(i, s, e);
|
2006-04-07 17:49:18 +00:00
|
|
|
if ((long)pxmram < 0)
|
|
|
|
pxmram = 0;
|
2006-01-11 21:44:39 +00:00
|
|
|
}
|
|
|
|
|
2010-08-25 20:39:17 +00:00
|
|
|
e820ram = max_pfn - (memblock_x86_hole_size(0, max_pfn<<PAGE_SHIFT)>>PAGE_SHIFT);
|
2009-05-08 07:37:34 +00:00
|
|
|
/* We seem to lose 3 pages somewhere. Allow 1M of slack. */
|
|
|
|
if ((long)(e820ram - pxmram) >= (1<<(20 - PAGE_SHIFT))) {
|
2006-01-11 21:44:39 +00:00
|
|
|
printk(KERN_ERR
|
|
|
|
"SRAT: PXMs only cover %luMB of your %luMB e820 RAM. Not used.\n",
|
|
|
|
(pxmram << PAGE_SHIFT) >> 20,
|
|
|
|
(e820ram << PAGE_SHIFT) >> 20);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
void __init acpi_numa_arch_fixup(void) {}
|
|
|
|
|
2011-02-16 11:13:06 +00:00
|
|
|
int __init x86_acpi_numa_init(void)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
ret = acpi_numa_init();
|
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
|
|
|
return srat_disabled() ? -EINVAL : 0;
|
|
|
|
}
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
/* Use the information discovered above to actually set up the nodes. */
|
2011-02-16 11:13:06 +00:00
|
|
|
int __init acpi_scan_nodes(void)
|
2005-04-16 22:20:36 +00:00
|
|
|
{
|
|
|
|
int i;
|
2006-01-11 21:44:39 +00:00
|
|
|
|
2007-07-21 15:09:56 +00:00
|
|
|
if (acpi_numa <= 0)
|
|
|
|
return -1;
|
|
|
|
|
x86: Fix checking of SRAT when node 0 ram is not from 0
Found one system that boot from socket1 instead of socket0, SRAT get rejected...
[ 0.000000] SRAT: Node 1 PXM 0 0-a0000
[ 0.000000] SRAT: Node 1 PXM 0 100000-80000000
[ 0.000000] SRAT: Node 1 PXM 0 100000000-2080000000
[ 0.000000] SRAT: Node 0 PXM 1 2080000000-4080000000
[ 0.000000] SRAT: Node 2 PXM 2 4080000000-6080000000
[ 0.000000] SRAT: Node 3 PXM 3 6080000000-8080000000
[ 0.000000] SRAT: Node 4 PXM 4 8080000000-a080000000
[ 0.000000] SRAT: Node 5 PXM 5 a080000000-c080000000
[ 0.000000] SRAT: Node 6 PXM 6 c080000000-e080000000
[ 0.000000] SRAT: Node 7 PXM 7 e080000000-10080000000
...
[ 0.000000] NUMA: Allocated memnodemap from 500000 - 701040
[ 0.000000] NUMA: Using 20 for the hash shift.
[ 0.000000] Adding active range (0, 0x2080000, 0x4080000) 0 entries of 3200 used
[ 0.000000] Adding active range (1, 0x0, 0x96) 1 entries of 3200 used
[ 0.000000] Adding active range (1, 0x100, 0x7f750) 2 entries of 3200 used
[ 0.000000] Adding active range (1, 0x100000, 0x2080000) 3 entries of 3200 used
[ 0.000000] Adding active range (2, 0x4080000, 0x6080000) 4 entries of 3200 used
[ 0.000000] Adding active range (3, 0x6080000, 0x8080000) 5 entries of 3200 used
[ 0.000000] Adding active range (4, 0x8080000, 0xa080000) 6 entries of 3200 used
[ 0.000000] Adding active range (5, 0xa080000, 0xc080000) 7 entries of 3200 used
[ 0.000000] Adding active range (6, 0xc080000, 0xe080000) 8 entries of 3200 used
[ 0.000000] Adding active range (7, 0xe080000, 0x10080000) 9 entries of 3200 used
[ 0.000000] SRAT: PXMs only cover 917504MB of your 1048566MB e820 RAM. Not used.
[ 0.000000] SRAT: SRAT not used.
the early_node_map is not sorted because node0 with non zero start come first.
so try to sort it right away after all regions are registered.
also fixs refression by 8716273c (x86: Export srat physical topology)
-v2: make it more solid to handle cross node case like node0 [0,4g), [8,12g) and node1 [4g, 8g), [12g, 16g)
-v3: update comments.
Reported-and-tested-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4B2579D2.3010201@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
2009-12-16 01:59:02 +00:00
|
|
|
/* for out of order entries in SRAT */
|
|
|
|
sort_node_map();
|
2011-02-16 11:13:07 +00:00
|
|
|
if (!nodes_cover_memory(numa_nodes)) {
|
2009-09-25 22:20:04 +00:00
|
|
|
bad_srat();
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
x86-64, numa: Put pgtable to local node memory
Introduce init_memory_mapping_high(), and use it with 64bit.
It will go with every memory segment above 4g to create page table to the
memory range itself.
before this patch all page tables was on one node.
with this patch, one RED-PEN is killed
debug out for 8 sockets system after patch
[ 0.000000] initial memory mapped : 0 - 20000000
[ 0.000000] init_memory_mapping: [0x00000000000000-0x0000007f74ffff]
[ 0.000000] 0000000000 - 007f600000 page 2M
[ 0.000000] 007f600000 - 007f750000 page 4k
[ 0.000000] kernel direct mapping tables up to 7f750000 @ [0x7f74c000-0x7f74ffff]
[ 0.000000] RAMDISK: 7bc84000 - 7f745000
....
[ 0.000000] Adding active range (0, 0x10, 0x95) 0 entries of 3200 used
[ 0.000000] Adding active range (0, 0x100, 0x7f750) 1 entries of 3200 used
[ 0.000000] Adding active range (0, 0x100000, 0x1080000) 2 entries of 3200 used
[ 0.000000] Adding active range (1, 0x1080000, 0x2080000) 3 entries of 3200 used
[ 0.000000] Adding active range (2, 0x2080000, 0x3080000) 4 entries of 3200 used
[ 0.000000] Adding active range (3, 0x3080000, 0x4080000) 5 entries of 3200 used
[ 0.000000] Adding active range (4, 0x4080000, 0x5080000) 6 entries of 3200 used
[ 0.000000] Adding active range (5, 0x5080000, 0x6080000) 7 entries of 3200 used
[ 0.000000] Adding active range (6, 0x6080000, 0x7080000) 8 entries of 3200 used
[ 0.000000] Adding active range (7, 0x7080000, 0x8080000) 9 entries of 3200 used
[ 0.000000] init_memory_mapping: [0x00000100000000-0x0000107fffffff]
[ 0.000000] 0100000000 - 1080000000 page 2M
[ 0.000000] kernel direct mapping tables up to 1080000000 @ [0x107ffbd000-0x107fffffff]
[ 0.000000] memblock_x86_reserve_range: [0x107ffc2000-0x107fffffff] PGTABLE
[ 0.000000] init_memory_mapping: [0x00001080000000-0x0000207fffffff]
[ 0.000000] 1080000000 - 2080000000 page 2M
[ 0.000000] kernel direct mapping tables up to 2080000000 @ [0x207ff7d000-0x207fffffff]
[ 0.000000] memblock_x86_reserve_range: [0x207ffc0000-0x207fffffff] PGTABLE
[ 0.000000] init_memory_mapping: [0x00002080000000-0x0000307fffffff]
[ 0.000000] 2080000000 - 3080000000 page 2M
[ 0.000000] kernel direct mapping tables up to 3080000000 @ [0x307ff3d000-0x307fffffff]
[ 0.000000] memblock_x86_reserve_range: [0x307ffc0000-0x307fffffff] PGTABLE
[ 0.000000] init_memory_mapping: [0x00003080000000-0x0000407fffffff]
[ 0.000000] 3080000000 - 4080000000 page 2M
[ 0.000000] kernel direct mapping tables up to 4080000000 @ [0x407fefd000-0x407fffffff]
[ 0.000000] memblock_x86_reserve_range: [0x407ffc0000-0x407fffffff] PGTABLE
[ 0.000000] init_memory_mapping: [0x00004080000000-0x0000507fffffff]
[ 0.000000] 4080000000 - 5080000000 page 2M
[ 0.000000] kernel direct mapping tables up to 5080000000 @ [0x507febd000-0x507fffffff]
[ 0.000000] memblock_x86_reserve_range: [0x507ffc0000-0x507fffffff] PGTABLE
[ 0.000000] init_memory_mapping: [0x00005080000000-0x0000607fffffff]
[ 0.000000] 5080000000 - 6080000000 page 2M
[ 0.000000] kernel direct mapping tables up to 6080000000 @ [0x607fe7d000-0x607fffffff]
[ 0.000000] memblock_x86_reserve_range: [0x607ffc0000-0x607fffffff] PGTABLE
[ 0.000000] init_memory_mapping: [0x00006080000000-0x0000707fffffff]
[ 0.000000] 6080000000 - 7080000000 page 2M
[ 0.000000] kernel direct mapping tables up to 7080000000 @ [0x707fe3d000-0x707fffffff]
[ 0.000000] memblock_x86_reserve_range: [0x707ffc0000-0x707fffffff] PGTABLE
[ 0.000000] init_memory_mapping: [0x00007080000000-0x0000807fffffff]
[ 0.000000] 7080000000 - 8080000000 page 2M
[ 0.000000] kernel direct mapping tables up to 8080000000 @ [0x807fdfc000-0x807fffffff]
[ 0.000000] memblock_x86_reserve_range: [0x807ffbf000-0x807fffffff] PGTABLE
[ 0.000000] Initmem setup node 0 [0000000000000000-000000107fffffff]
[ 0.000000] NODE_DATA [0x0000107ffbd000-0x0000107ffc1fff]
[ 0.000000] Initmem setup node 1 [0000001080000000-000000207fffffff]
[ 0.000000] NODE_DATA [0x0000207ffbb000-0x0000207ffbffff]
[ 0.000000] Initmem setup node 2 [0000002080000000-000000307fffffff]
[ 0.000000] NODE_DATA [0x0000307ffbb000-0x0000307ffbffff]
[ 0.000000] Initmem setup node 3 [0000003080000000-000000407fffffff]
[ 0.000000] NODE_DATA [0x0000407ffbb000-0x0000407ffbffff]
[ 0.000000] Initmem setup node 4 [0000004080000000-000000507fffffff]
[ 0.000000] NODE_DATA [0x0000507ffbb000-0x0000507ffbffff]
[ 0.000000] Initmem setup node 5 [0000005080000000-000000607fffffff]
[ 0.000000] NODE_DATA [0x0000607ffbb000-0x0000607ffbffff]
[ 0.000000] Initmem setup node 6 [0000006080000000-000000707fffffff]
[ 0.000000] NODE_DATA [0x0000707ffbb000-0x0000707ffbffff]
[ 0.000000] Initmem setup node 7 [0000007080000000-000000807fffffff]
[ 0.000000] NODE_DATA [0x0000807ffba000-0x0000807ffbefff]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4D1933D1.9020609@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2010-12-28 00:48:17 +00:00
|
|
|
init_memory_mapping_high();
|
|
|
|
|
2005-09-12 16:49:25 +00:00
|
|
|
/* Finally register nodes */
|
2007-05-02 17:27:20 +00:00
|
|
|
for_each_node_mask(i, node_possible_map)
|
2011-02-16 11:13:07 +00:00
|
|
|
setup_node_bootmem(i, numa_nodes[i].start, numa_nodes[i].end);
|
2006-04-07 17:49:21 +00:00
|
|
|
/* Try again in case setup_node_bootmem missed one due
|
|
|
|
to missing bootmem */
|
2007-05-02 17:27:20 +00:00
|
|
|
for_each_node_mask(i, node_possible_map)
|
2006-04-07 17:49:21 +00:00
|
|
|
if (!node_online(i))
|
2011-02-16 11:13:07 +00:00
|
|
|
setup_node_bootmem(i, numa_nodes[i].start,
|
|
|
|
numa_nodes[i].end);
|
2006-04-07 17:49:21 +00:00
|
|
|
|
2008-12-17 01:34:01 +00:00
|
|
|
for (i = 0; i < nr_cpu_ids; i++) {
|
2008-01-30 12:33:21 +00:00
|
|
|
int node = early_cpu_to_node(i);
|
|
|
|
|
2008-01-30 12:33:21 +00:00
|
|
|
if (node == NUMA_NO_NODE)
|
2005-04-16 22:20:36 +00:00
|
|
|
continue;
|
2009-05-15 20:59:37 +00:00
|
|
|
if (!node_online(node))
|
x86: cleanup early per cpu variables/accesses v4
* Introduce a new PER_CPU macro called "EARLY_PER_CPU". This is
used by some per_cpu variables that are initialized and accessed
before there are per_cpu areas allocated.
["Early" in respect to per_cpu variables is "earlier than the per_cpu
areas have been setup".]
This patchset adds these new macros:
DEFINE_EARLY_PER_CPU(_type, _name, _initvalue)
EXPORT_EARLY_PER_CPU_SYMBOL(_name)
DECLARE_EARLY_PER_CPU(_type, _name)
early_per_cpu_ptr(_name)
early_per_cpu_map(_name, _idx)
early_per_cpu(_name, _cpu)
The DEFINE macro defines the per_cpu variable as well as the early
map and pointer. It also initializes the per_cpu variable and map
elements to "_initvalue". The early_* macros provide access to
the initial map (usually setup during system init) and the early
pointer. This pointer is initialized to point to the early map
but is then NULL'ed when the actual per_cpu areas are setup. After
that the per_cpu variable is the correct access to the variable.
The early_per_cpu() macro is not very efficient but does show how to
access the variable if you have a function that can be called both
"early" and "late". It tests the early ptr to be NULL, and if not
then it's still valid. Otherwise, the per_cpu variable is used
instead:
#define early_per_cpu(_name, _cpu) \
(early_per_cpu_ptr(_name) ? \
early_per_cpu_ptr(_name)[_cpu] : \
per_cpu(_name, _cpu))
A better method is to actually check the pointer manually. In the
case below, numa_set_node can be called both "early" and "late":
void __cpuinit numa_set_node(int cpu, int node)
{
int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map);
if (cpu_to_node_map)
cpu_to_node_map[cpu] = node;
else
per_cpu(x86_cpu_to_node_map, cpu) = node;
}
* Add a flag "arch_provides_topology_pointers" that indicates pointers
to topology cpumask_t maps are available. Otherwise, use the function
returning the cpumask_t value. This is useful if cpumask_t set size
is very large to avoid copying data on to/off of the stack.
* The coverage of CONFIG_DEBUG_PER_CPU_MAPS has been increased while
the non-debug case has been optimized a bit.
* Remove an unreferenced compiler warning in drivers/base/topology.c
* Clean up #ifdef in setup.c
For inclusion into sched-devel/latest tree.
Based on:
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
+ sched-devel/latest .../mingo/linux-2.6-sched-devel.git
Signed-off-by: Mike Travis <travis@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-05-12 19:21:12 +00:00
|
|
|
numa_clear_node(i);
|
2005-04-16 22:20:36 +00:00
|
|
|
}
|
|
|
|
numa_init_array();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-07-21 15:10:32 +00:00
|
|
|
#ifdef CONFIG_NUMA_EMU
|
2008-01-30 12:33:10 +00:00
|
|
|
static int fake_node_to_pxm_map[MAX_NUMNODES] __initdata = {
|
|
|
|
[0 ... MAX_NUMNODES-1] = PXM_INVAL
|
|
|
|
};
|
2008-01-30 12:33:21 +00:00
|
|
|
static s16 fake_apicid_to_node[MAX_LOCAL_APIC] __initdata = {
|
2008-01-30 12:33:10 +00:00
|
|
|
[0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE
|
|
|
|
};
|
2007-07-21 15:10:32 +00:00
|
|
|
static int __init find_node_by_addr(unsigned long addr)
|
|
|
|
{
|
|
|
|
int ret = NUMA_NO_NODE;
|
|
|
|
int i;
|
|
|
|
|
2011-02-16 11:13:07 +00:00
|
|
|
for_each_node_mask(i, mem_nodes_parsed) {
|
2007-07-21 15:10:32 +00:00
|
|
|
/*
|
|
|
|
* Find the real node that this emulated node appears on. For
|
|
|
|
* the sake of simplicity, we only use a real node's starting
|
|
|
|
* address to determine which emulated node it appears on.
|
|
|
|
*/
|
2011-02-16 11:13:07 +00:00
|
|
|
if (addr >= numa_nodes[i].start && addr < numa_nodes[i].end) {
|
2007-07-21 15:10:32 +00:00
|
|
|
ret = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2008-01-30 12:33:35 +00:00
|
|
|
return ret;
|
2007-07-21 15:10:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* In NUMA emulation, we need to setup proximity domain (_PXM) to node ID
|
|
|
|
* mappings that respect the real ACPI topology but reflect our emulated
|
|
|
|
* environment. For each emulated node, we find which real node it appears on
|
|
|
|
* and create PXM to NID mappings for those fake nodes which mirror that
|
|
|
|
* locality. SLIT will now represent the correct distances between emulated
|
|
|
|
* nodes as a result of the real topology.
|
|
|
|
*/
|
|
|
|
void __init acpi_fake_nodes(const struct bootnode *fake_nodes, int num_nodes)
|
|
|
|
{
|
2007-07-21 15:10:33 +00:00
|
|
|
int i, j;
|
2007-07-21 15:10:32 +00:00
|
|
|
|
|
|
|
for (i = 0; i < num_nodes; i++) {
|
|
|
|
int nid, pxm;
|
|
|
|
|
|
|
|
nid = find_node_by_addr(fake_nodes[i].start);
|
|
|
|
if (nid == NUMA_NO_NODE)
|
|
|
|
continue;
|
|
|
|
pxm = node_to_pxm(nid);
|
|
|
|
if (pxm == PXM_INVAL)
|
|
|
|
continue;
|
|
|
|
fake_node_to_pxm_map[i] = pxm;
|
2007-07-21 15:10:33 +00:00
|
|
|
/*
|
|
|
|
* For each apicid_to_node mapping that exists for this real
|
|
|
|
* node, it must now point to the fake node ID.
|
|
|
|
*/
|
|
|
|
for (j = 0; j < MAX_LOCAL_APIC; j++)
|
2011-01-23 13:37:39 +00:00
|
|
|
if (__apicid_to_node[j] == nid &&
|
2010-05-06 09:24:34 +00:00
|
|
|
fake_apicid_to_node[j] == NUMA_NO_NODE)
|
2007-07-21 15:10:33 +00:00
|
|
|
fake_apicid_to_node[j] = i;
|
2007-07-21 15:10:32 +00:00
|
|
|
}
|
2010-12-23 01:23:56 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If there are apicid-to-node mappings for physical nodes that do not
|
|
|
|
* have a corresponding emulated node, it should default to a guaranteed
|
|
|
|
* value.
|
|
|
|
*/
|
|
|
|
for (i = 0; i < MAX_LOCAL_APIC; i++)
|
2011-01-23 13:37:39 +00:00
|
|
|
if (__apicid_to_node[i] != NUMA_NO_NODE &&
|
2010-12-23 01:23:56 +00:00
|
|
|
fake_apicid_to_node[i] == NUMA_NO_NODE)
|
|
|
|
fake_apicid_to_node[i] = 0;
|
|
|
|
|
2007-07-21 15:10:32 +00:00
|
|
|
for (i = 0; i < num_nodes; i++)
|
|
|
|
__acpi_map_pxm_to_node(fake_node_to_pxm_map[i], i);
|
2011-01-23 13:37:39 +00:00
|
|
|
memcpy(__apicid_to_node, fake_apicid_to_node, sizeof(__apicid_to_node));
|
2007-07-21 15:10:32 +00:00
|
|
|
|
2011-02-16 11:13:07 +00:00
|
|
|
nodes_clear(mem_nodes_parsed);
|
2007-07-21 15:10:32 +00:00
|
|
|
for (i = 0; i < num_nodes; i++)
|
|
|
|
if (fake_nodes[i].start != fake_nodes[i].end)
|
2011-02-16 11:13:07 +00:00
|
|
|
node_set(i, mem_nodes_parsed);
|
2007-07-21 15:10:32 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int null_slit_node_compare(int a, int b)
|
|
|
|
{
|
|
|
|
return node_to_pxm(a) == node_to_pxm(b);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
static int null_slit_node_compare(int a, int b)
|
|
|
|
{
|
|
|
|
return a == b;
|
|
|
|
}
|
|
|
|
#endif /* CONFIG_NUMA_EMU */
|
|
|
|
|
2005-04-16 22:20:36 +00:00
|
|
|
int __node_distance(int a, int b)
|
|
|
|
{
|
|
|
|
int index;
|
|
|
|
|
|
|
|
if (!acpi_slit)
|
2007-07-21 15:10:32 +00:00
|
|
|
return null_slit_node_compare(a, b) ? LOCAL_DISTANCE :
|
|
|
|
REMOTE_DISTANCE;
|
2007-02-02 16:48:22 +00:00
|
|
|
index = acpi_slit->locality_count * node_to_pxm(a);
|
2005-04-16 22:20:36 +00:00
|
|
|
return acpi_slit->entry[index + node_to_pxm(b)];
|
|
|
|
}
|
|
|
|
|
|
|
|
EXPORT_SYMBOL(__node_distance);
|
2006-10-01 06:27:06 +00:00
|
|
|
|
2008-05-12 13:43:38 +00:00
|
|
|
#if defined(CONFIG_MEMORY_HOTPLUG_SPARSE) || defined(CONFIG_ACPI_HOTPLUG_MEMORY)
|
2006-10-01 06:27:06 +00:00
|
|
|
int memory_add_physaddr_to_nid(u64 start)
|
|
|
|
{
|
|
|
|
int i, ret = 0;
|
|
|
|
|
|
|
|
for_each_node(i)
|
|
|
|
if (nodes_add[i].start <= start && nodes_add[i].end > start)
|
|
|
|
ret = i;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
2006-10-01 06:27:07 +00:00
|
|
|
EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
|
2008-05-12 13:43:38 +00:00
|
|
|
#endif
|