mips: Reserve memory for the kernel image resources

The reserved_end variable had been used by the bootmem_init() code
to find a lowest limit of memory available for memmap blob. The original
code just tried to find a free memory space higher than kernel was placed.
This limitation seems justified for the memmap ragion search process, but
I can't see any obvious reason to reserve the unused space below kernel
seeing some platforms place it much higher than standard 1MB. Moreover
the RELOCATION config enables it to be loaded at any memory address.
So lets reserve the memory occupied by the kernel only, leaving the region
below being free for allocations. After doing this we can now discard the
code freeing a space between kernel _text and VMLINUX_LOAD_ADDRESS symbols
since it's going to be free anyway (unless marked as reserved by
platforms).

Signed-off-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Paul Burton <paul.burton@mips.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: Matt Redfearn <matt.redfearn@mips.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Cc: Huacai Chen <chenhc@lemote.com>
Cc: Stefan Agner <stefan@agner.ch>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 185e0e42e009a1691d9ecf9ed96ffd5653775d7e..f71a7d32a687169ebd63efd421f45204bf694727 100644 (file)
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -371,7 +371,6 @@ static void __init bootmem_init(void)
 
 static void __init bootmem_init(void)
 {
-       unsigned long reserved_end;
        phys_addr_t ramstart = PHYS_ADDR_MAX;
        int i;
 
@@ -382,10 +381,10 @@ static void __init bootmem_init(void)
         * will reserve the area used for the initrd.
         */
        init_initrd();
-       reserved_end = (unsigned long) PFN_UP(__pa_symbol(&_end));
 
-       memblock_reserve(PHYS_OFFSET,
-                        (reserved_end << PAGE_SHIFT) - PHYS_OFFSET);
+       /* Reserve memory occupied by kernel. */
+       memblock_reserve(__pa_symbol(&_text),
+                       __pa_symbol(&_end) - __pa_symbol(&_text));
 
        /*
         * max_low_pfn is not a number of pages. The number of pages
@@ -501,29 +500,6 @@ static void __init bootmem_init(void)
                memory_present(0, start, end);
        }
 
-#ifdef CONFIG_RELOCATABLE
-       /*
-        * The kernel reserves all memory below its _end symbol as bootmem,
-        * but the kernel may now be at a much higher address. The memory
-        * between the original and new locations may be returned to the system.
-        */
-       if (__pa_symbol(_text) > __pa_symbol(VMLINUX_LOAD_ADDRESS)) {
-               unsigned long offset;
-               extern void show_kernel_relocation(const char *level);
-
-               offset = __pa_symbol(_text) - __pa_symbol(VMLINUX_LOAD_ADDRESS);
-               memblock_free(__pa_symbol(VMLINUX_LOAD_ADDRESS), offset);
-
-#if defined(CONFIG_DEBUG_KERNEL) && defined(CONFIG_DEBUG_INFO)
-               /*
-                * This information is necessary when debugging the kernel
-                * But is a security vulnerability otherwise!
-                */
-               show_kernel_relocation(KERN_INFO);
-#endif
-       }
-#endif
-
        /*
         * Reserve initrd memory if needed.
         */