1 files changed, 91 insertions, 19 deletions

diff --git a/arch/x86/mm/discontig_32.c b/arch/x86/mm/discontig_32.c
index 13a474d3c6e9..04b1d20e2613 100644
--- a/arch/x86/mm/discontig_32.c
+++ b/arch/x86/mm/discontig_32.c
@@ -32,6 +32,7 @@
 #include <linux/kexec.h>
 #include <linux/pfn.h>
 #include <linux/swap.h>
+#include <linux/acpi.h>
 
 #include <asm/e820.h>
 #include <asm/setup.h>
@@ -103,14 +104,10 @@ extern unsigned long highend_pfn, highstart_pfn;
 
 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
 
-static unsigned long node_remap_start_pfn[MAX_NUMNODES];
 unsigned long node_remap_size[MAX_NUMNODES];
-static unsigned long node_remap_offset[MAX_NUMNODES];
 static void *node_remap_start_vaddr[MAX_NUMNODES];
 void set_pmd_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags);
 
-static void *node_remap_end_vaddr[MAX_NUMNODES];
-static void *node_remap_alloc_vaddr[MAX_NUMNODES];
 static unsigned long kva_start_pfn;
 static unsigned long kva_pages;
 /*
@@ -167,6 +164,22 @@ static void __init allocate_pgdat(int nid)
         }
 }
 
+#ifdef CONFIG_DISCONTIGMEM
+/*
+ * In the discontig memory model, a portion of the kernel virtual area (KVA)
+ * is reserved and portions of nodes are mapped using it. This is to allow
+ * node-local memory to be allocated for structures that would normally require
+ * ZONE_NORMAL. The memory is allocated with alloc_remap() and callers
+ * should be prepared to allocate from the bootmem allocator instead. This KVA
+ * mechanism is incompatible with SPARSEMEM as it makes assumptions about the
+ * layout of memory that are broken if alloc_remap() succeeds for some of the
+ * map and fails for others
+ */
+static unsigned long node_remap_start_pfn[MAX_NUMNODES];
+static void *node_remap_end_vaddr[MAX_NUMNODES];
+static void *node_remap_alloc_vaddr[MAX_NUMNODES];
+static unsigned long node_remap_offset[MAX_NUMNODES];
+
 void *alloc_remap(int nid, unsigned long size)
 {
         void *allocation = node_remap_alloc_vaddr[nid];
@@ -263,11 +276,46 @@ static unsigned long calculate_numa_remap_pages(void)
         return reserve_pages;
 }
 
+static void init_remap_allocator(int nid)
+{
+        node_remap_start_vaddr[nid] = pfn_to_kaddr(
+                        kva_start_pfn + node_remap_offset[nid]);
+        node_remap_end_vaddr[nid] = node_remap_start_vaddr[nid] +
+                (node_remap_size[nid] * PAGE_SIZE);
+        node_remap_alloc_vaddr[nid] = node_remap_start_vaddr[nid] +
+                ALIGN(sizeof(pg_data_t), PAGE_SIZE);
+
+        printk ("node %d will remap to vaddr %08lx - %08lx\n", nid,
+                (ulong) node_remap_start_vaddr[nid],
+                (ulong) pfn_to_kaddr(highstart_pfn
+                   + node_remap_offset[nid] + node_remap_size[nid]));
+}
+#else
+void *alloc_remap(int nid, unsigned long size)
+{
+        return NULL;
+}
+
+static unsigned long calculate_numa_remap_pages(void)
+{
+        return 0;
+}
+
+static void init_remap_allocator(int nid)
+{
+}
+
+void __init remap_numa_kva(void)
+{
+}
+#endif /* CONFIG_DISCONTIGMEM */
+
 extern void setup_bootmem_allocator(void);
 unsigned long __init setup_memory(void)
 {
         int nid;
         unsigned long system_start_pfn, system_max_low_pfn;
+        unsigned long wasted_pages;
 
         /*
          * When mapping a NUMA machine we allocate the node_mem_map arrays
@@ -288,11 +336,18 @@ unsigned long __init setup_memory(void)
 
 #ifdef CONFIG_BLK_DEV_INITRD
         /* Numa kva area is below the initrd */
-        if (boot_params.hdr.type_of_loader && boot_params.hdr.ramdisk_image)
-                kva_start_pfn = PFN_DOWN(boot_params.hdr.ramdisk_image)
+        if (initrd_start)
+                kva_start_pfn = PFN_DOWN(initrd_start - PAGE_OFFSET)
                         - kva_pages;
 #endif
-        kva_start_pfn -= kva_start_pfn & (PTRS_PER_PTE-1);
+
+        /*
+         * We waste pages past at the end of the KVA for no good reason other
+         * than how it is located. This is bad.
+         */
+        wasted_pages = kva_start_pfn & (PTRS_PER_PTE-1);
+        kva_start_pfn -= wasted_pages;
+        kva_pages += wasted_pages;
 
         system_max_low_pfn = max_low_pfn = find_max_low_pfn();
         printk("kva_start_pfn ~ %ld find_max_low_pfn() ~ %ld\n",
@@ -318,19 +373,9 @@ unsigned long __init setup_memory(void)
         printk("Low memory ends at vaddr %08lx\n",
                         (ulong) pfn_to_kaddr(max_low_pfn));
         for_each_online_node(nid) {
-                node_remap_start_vaddr[nid] = pfn_to_kaddr(
-                                kva_start_pfn + node_remap_offset[nid]);
-                /* Init the node remap allocator */
-                node_remap_end_vaddr[nid] = node_remap_start_vaddr[nid] +
-                        (node_remap_size[nid] * PAGE_SIZE);
-                node_remap_alloc_vaddr[nid] = node_remap_start_vaddr[nid] +
-                        ALIGN(sizeof(pg_data_t), PAGE_SIZE);
+                init_remap_allocator(nid);
 
                 allocate_pgdat(nid);
-                printk ("node %d will remap to vaddr %08lx - %08lx\n", nid,
-                        (ulong) node_remap_start_vaddr[nid],
-                        (ulong) pfn_to_kaddr(highstart_pfn
-                           + node_remap_offset[nid] + node_remap_size[nid]));
         }
         printk("High memory starts at vaddr %08lx\n",
                         (ulong) pfn_to_kaddr(highstart_pfn));
@@ -345,7 +390,8 @@ unsigned long __init setup_memory(void)
 
 void __init numa_kva_reserve(void)
 {
-        reserve_bootmem(PFN_PHYS(kva_start_pfn),PFN_PHYS(kva_pages));
+        if (kva_pages)
+                reserve_bootmem(PFN_PHYS(kva_start_pfn), PFN_PHYS(kva_pages));
 }
 
 void __init zone_sizes_init(void)
@@ -430,3 +476,29 @@ int memory_add_physaddr_to_nid(u64 addr)
 
 EXPORT_SYMBOL_GPL(memory_add_physaddr_to_nid);
 #endif
+
+#ifndef CONFIG_HAVE_ARCH_PARSE_SRAT
+/*
+ * XXX FIXME: Make SLIT table parsing available to 32-bit NUMA
+ *
+ * These stub functions are needed to compile 32-bit NUMA when SRAT is
+ * not set. There are functions in srat_64.c for parsing this table
+ * and it may be possible to make them common functions.
+ */
+void acpi_numa_slit_init (struct acpi_table_slit *slit)
+{
+        printk(KERN_INFO "ACPI: No support for parsing SLIT table\n");
+}
+
+void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa)
+{
+}
+
+void acpi_numa_memory_affinity_init (struct acpi_srat_mem_affinity *ma)
+{
+}
+
+void acpi_numa_arch_fixup(void)
+{
+}
+#endif /* CONFIG_HAVE_ARCH_PARSE_SRAT */