MIPS: Handle initmem in systems with kernel not in add_memory_region() mem

This patch addresses a couple of related problems:

1) The kernel may reside in physical memory outside of the ranges set
   by plat_mem_setup().  If this is the case, init mem cannot be
   reused as it resides outside of the range of pages that the kernel
   memory allocators control.

2) initrd images might be loaded in physical memory outside of the
   ranges set by plat_mem_setup().  The memory likewise cannot be
   reused.  The patch doesn't handle this specific case, but the
   infrastructure is useful for future patches that do.

The crux of the problem is that there are memory regions that need be
memory_present(), but that cannot be free_bootmem() at the time of
arch_mem_init().  We create a new type of memory (BOOT_MEM_INIT_RAM)
for use with add_memory_region().  Then arch_mem_init() adds the init
mem with this type if the init mem is not already covered by existing
ranges.

When memory is being freed into the bootmem allocator, we skip the
BOOT_MEM_INIT_RAM ranges so they are not clobbered, but we do signal
them as memory_present().  This way when they are later freed, the
necessary memory manager structures have initialized and the Sparse
allocater is prevented from crashing.

The Octeon specific code that handled this case is removed, because
the new general purpose code handles the case.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
To: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/1988/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 2d9028f1474c0a3f343d6a6c75b12de71cbd2231..b394552e5ca02c98995341f491424c94de630e48 100644 (file)
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -642,14 +642,6 @@ void __init plat_mem_setup(void)
 
        total = 0;
 
-       /* First add the init memory we will be returning.  */
-       memory = __pa_symbol(&__init_begin) & PAGE_MASK;
-       mem_alloc_size = (__pa_symbol(&__init_end) & PAGE_MASK) - memory;
-       if (mem_alloc_size > 0) {
-               add_memory_region(memory, mem_alloc_size, BOOT_MEM_RAM);
-               total += mem_alloc_size;
-       }
-
        /*
         * The Mips memory init uses the first memory location for
         * some memory vectors. When SPARSEMEM is in use, it doesn't

diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
index 35cd1bab69c3c23d81015da791d2e7609526d962..7a51d879e6ca2180c448812b9bc1591f3020f678 100644 (file)
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -86,6 +86,7 @@ extern unsigned long mips_machtype;
 #define BOOT_MEM_RAM           1
 #define BOOT_MEM_ROM_DATA      2
 #define BOOT_MEM_RESERVED      3
+#define BOOT_MEM_INIT_RAM      4
 
 /*
  * A memory map that's built upon what was determined

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 84af26ab221236d3a4077e76fea2497ae769a640..e86c2cf554aa5815623b6b870e5b4e853630cb8f 100644 (file)
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -121,6 +121,9 @@ static void __init print_memory_map(void)
                case BOOT_MEM_RAM:
                        printk(KERN_CONT "(usable)\n");
                        break;
+               case BOOT_MEM_INIT_RAM:
+                       printk(KERN_CONT "(usable after init)\n");
+                       break;
                case BOOT_MEM_ROM_DATA:
                        printk(KERN_CONT "(ROM data)\n");
                        break;
@@ -361,15 +364,24 @@ static void __init bootmem_init(void)
        for (i = 0; i < boot_mem_map.nr_map; i++) {
                unsigned long start, end, size;
 
+               start = PFN_UP(boot_mem_map.map[i].addr);
+               end   = PFN_DOWN(boot_mem_map.map[i].addr
+                                   + boot_mem_map.map[i].size);
+
                /*
                 * Reserve usable memory.
                 */
-               if (boot_mem_map.map[i].type != BOOT_MEM_RAM)
+               switch (boot_mem_map.map[i].type) {
+               case BOOT_MEM_RAM:
+                       break;
+               case BOOT_MEM_INIT_RAM:
+                       memory_present(0, start, end);
                        continue;
+               default:
+                       /* Not usable memory */
+                       continue;
+               }
 
-               start = PFN_UP(boot_mem_map.map[i].addr);
-               end   = PFN_DOWN(boot_mem_map.map[i].addr
-                                   + boot_mem_map.map[i].size);
                /*
                 * We are rounding up the start address of usable memory
                 * and at the end of the usable range downwards.
@@ -455,11 +467,33 @@ early_param("mem", early_parse_mem);
 
 static void __init arch_mem_init(char **cmdline_p)
 {
+       phys_t init_mem, init_end, init_size;
+
        extern void plat_mem_setup(void);
 
        /* call board setup routine */
        plat_mem_setup();
 
+       init_mem = PFN_UP(__pa_symbol(&__init_begin)) << PAGE_SHIFT;
+       init_end = PFN_DOWN(__pa_symbol(&__init_end)) << PAGE_SHIFT;
+       init_size = init_end - init_mem;
+       if (init_size) {
+               /* Make sure it is in the boot_mem_map */
+               int i, found;
+               found = 0;
+               for (i = 0; i < boot_mem_map.nr_map; i++) {
+                       if (init_mem >= boot_mem_map.map[i].addr &&
+                           init_mem < (boot_mem_map.map[i].addr +
+                                       boot_mem_map.map[i].size)) {
+                               found = 1;
+                               break;
+                       }
+               }
+               if (!found)
+                       add_memory_region(init_mem, init_size,
+                                         BOOT_MEM_INIT_RAM);
+       }
+
        pr_info("Determined physical RAM map:\n");
        print_memory_map();
 
@@ -523,6 +557,7 @@ static void __init resource_init(void)
                res = alloc_bootmem(sizeof(struct resource));
                switch (boot_mem_map.map[i].type) {
                case BOOT_MEM_RAM:
+               case BOOT_MEM_INIT_RAM:
                case BOOT_MEM_ROM_DATA:
                        res->name = "System RAM";
                        break;

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index b7ebc4fa89bcd5b4b77465ab60919317b513bf79..3b3ffd439cd7d8811863f7d121c580f08578b3d7 100644 (file)
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -304,9 +304,14 @@ int page_is_ram(unsigned long pagenr)
        for (i = 0; i < boot_mem_map.nr_map; i++) {
                unsigned long addr, end;
 
-               if (boot_mem_map.map[i].type != BOOT_MEM_RAM)
+               switch (boot_mem_map.map[i].type) {
+               case BOOT_MEM_RAM:
+               case BOOT_MEM_INIT_RAM:
+                       break;
+               default:
                        /* not usable memory */
                        continue;
+               }
 
                addr = PFN_UP(boot_mem_map.map[i].addr);
                end = PFN_DOWN(boot_mem_map.map[i].addr +
@@ -379,7 +384,7 @@ void __init mem_init(void)
 
        reservedpages = ram = 0;
        for (tmp = 0; tmp < max_low_pfn; tmp++)
-               if (page_is_ram(tmp)) {
+               if (page_is_ram(tmp) && pfn_valid(tmp)) {
                        ram++;
                        if (PageReserved(pfn_to_page(tmp)))
                                reservedpages++;