Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 boot updates from Ingo Molnar:
 "The biggest changes in this cycle were:

   - prepare for more KASLR related changes, by restructuring, cleaning
     up and fixing the existing boot code.  (Kees Cook, Baoquan He,
     Yinghai Lu)

   - simplifly/concentrate subarch handling code, eliminate
     paravirt_enabled() usage.  (Luis R Rodriguez)"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (50 commits)
  x86/KASLR: Clarify purpose of each get_random_long()
  x86/KASLR: Add virtual address choosing function
  x86/KASLR: Return earliest overlap when avoiding regions
  x86/KASLR: Add 'struct slot_area' to manage random_addr slots
  x86/boot: Add missing file header comments
  x86/KASLR: Initialize mapping_info every time
  x86/boot: Comment what finalize_identity_maps() does
  x86/KASLR: Build identity mappings on demand
  x86/boot: Split out kernel_ident_mapping_init()
  x86/boot: Clean up indenting for asm/boot.h
  x86/KASLR: Improve comments around the mem_avoid[] logic
  x86/boot: Simplify pointer casting in choose_random_location()
  x86/KASLR: Consolidate mem_avoid[] entries
  x86/boot: Clean up pointer casting
  x86/boot: Warn on future overlapping memcpy() use
  x86/boot: Extract error reporting functions
  x86/boot: Correctly bounds-check relocations
  x86/KASLR: Clean up unused code from old 'run_size' and rename it to 'kernel_total_size'
  x86/boot: Fix "run_size" calculation
  x86/boot: Calculate decompression size during boot not build
  ...

3 files changed, 80 insertions, 76 deletions

diff --git a/arch/x86/mm/ident_map.c b/arch/x86/mm/ident_map.c
new file mode 100644
index 000000000000..ec21796ac5fd
--- /dev/null
+++ b/arch/x86/mm/ident_map.c
@@ -0,0 +1,79 @@
+/*
+ * Helper routines for building identity mapping page tables. This is
+ * included by both the compressed kernel and the regular kernel.
+ */
+
+static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page,
+                           unsigned long addr, unsigned long end)
+{
+        addr &= PMD_MASK;
+        for (; addr < end; addr += PMD_SIZE) {
+                pmd_t *pmd = pmd_page + pmd_index(addr);
+
+                if (!pmd_present(*pmd))
+                        set_pmd(pmd, __pmd(addr | pmd_flag));
+        }
+}
+
+static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page,
+                          unsigned long addr, unsigned long end)
+{
+        unsigned long next;
+
+        for (; addr < end; addr = next) {
+                pud_t *pud = pud_page + pud_index(addr);
+                pmd_t *pmd;
+
+                next = (addr & PUD_MASK) + PUD_SIZE;
+                if (next > end)
+                        next = end;
+
+                if (pud_present(*pud)) {
+                        pmd = pmd_offset(pud, 0);
+                        ident_pmd_init(info->pmd_flag, pmd, addr, next);
+                        continue;
+                }
+                pmd = (pmd_t *)info->alloc_pgt_page(info->context);
+                if (!pmd)
+                        return -ENOMEM;
+                ident_pmd_init(info->pmd_flag, pmd, addr, next);
+                set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE));
+        }
+
+        return 0;
+}
+
+int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page,
+                              unsigned long addr, unsigned long end)
+{
+        unsigned long next;
+        int result;
+        int off = info->kernel_mapping ? pgd_index(__PAGE_OFFSET) : 0;
+
+        for (; addr < end; addr = next) {
+                pgd_t *pgd = pgd_page + pgd_index(addr) + off;
+                pud_t *pud;
+
+                next = (addr & PGDIR_MASK) + PGDIR_SIZE;
+                if (next > end)
+                        next = end;
+
+                if (pgd_present(*pgd)) {
+                        pud = pud_offset(pgd, 0);
+                        result = ident_pud_init(info, pud, addr, next);
+                        if (result)
+                                return result;
+                        continue;
+                }
+
+                pud = (pud_t *)info->alloc_pgt_page(info->context);
+                if (!pud)
+                        return -ENOMEM;
+                result = ident_pud_init(info, pud, addr, next);
+                if (result)
+                        return result;
+                set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE));
+        }
+
+        return 0;
+}
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 85af914e3d27..84df150ee77e 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -804,9 +804,6 @@ void __init mem_init(void)
         BUILD_BUG_ON(VMALLOC_START                      >= VMALLOC_END);
 #undef high_memory
 #undef __FIXADDR_TOP
-#ifdef CONFIG_RANDOMIZE_BASE
-        BUILD_BUG_ON(CONFIG_RANDOMIZE_BASE_MAX_OFFSET > KERNEL_IMAGE_SIZE);
-#endif
 
 #ifdef CONFIG_HIGHMEM
         BUG_ON(PKMAP_BASE + LAST_PKMAP*PAGE_SIZE        > FIXADDR_START);
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 89d97477c1d9..bce2e5d9edd4 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -58,79 +58,7 @@
 
 #include "mm_internal.h"
 
-static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page,
-                           unsigned long addr, unsigned long end)
-{
-        addr &= PMD_MASK;
-        for (; addr < end; addr += PMD_SIZE) {
-                pmd_t *pmd = pmd_page + pmd_index(addr);
-
-                if (!pmd_present(*pmd))
-                        set_pmd(pmd, __pmd(addr | pmd_flag));
-        }
-}
-static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page,
-                          unsigned long addr, unsigned long end)
-{
-        unsigned long next;
-
-        for (; addr < end; addr = next) {
-                pud_t *pud = pud_page + pud_index(addr);
-                pmd_t *pmd;
-
-                next = (addr & PUD_MASK) + PUD_SIZE;
-                if (next > end)
-                        next = end;
-
-                if (pud_present(*pud)) {
-                        pmd = pmd_offset(pud, 0);
-                        ident_pmd_init(info->pmd_flag, pmd, addr, next);
-                        continue;
-                }
-                pmd = (pmd_t *)info->alloc_pgt_page(info->context);
-                if (!pmd)
-                        return -ENOMEM;
-                ident_pmd_init(info->pmd_flag, pmd, addr, next);
-                set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE));
-        }
-
-        return 0;
-}
-
-int kernel_ident_mapping_init(struct x86_mapping_info *info, pgd_t *pgd_page,
-                              unsigned long addr, unsigned long end)
-{
-        unsigned long next;
-        int result;
-        int off = info->kernel_mapping ? pgd_index(__PAGE_OFFSET) : 0;
-
-        for (; addr < end; addr = next) {
-                pgd_t *pgd = pgd_page + pgd_index(addr) + off;
-                pud_t *pud;
-
-                next = (addr & PGDIR_MASK) + PGDIR_SIZE;
-                if (next > end)
-                        next = end;
-
-                if (pgd_present(*pgd)) {
-                        pud = pud_offset(pgd, 0);
-                        result = ident_pud_init(info, pud, addr, next);
-                        if (result)
-                                return result;
-                        continue;
-                }
-
-                pud = (pud_t *)info->alloc_pgt_page(info->context);
-                if (!pud)
-                        return -ENOMEM;
-                result = ident_pud_init(info, pud, addr, next);
-                if (result)
-                        return result;
-                set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE));
-        }
-
-        return 0;
-}
+#include "ident_map.c"
 
 /*
  * NOTE: pagetable_init alloc all the fixmap pagetables contiguous on the