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

Pull x86 mm changes from Peter Anvin:
 "This is a huge set of several partly interrelated (and concurrently
  developed) changes, which is why the branch history is messier than
  one would like.

  The *really* big items are two humonguous patchsets mostly developed
  by Yinghai Lu at my request, which completely revamps the way we
  create initial page tables.  In particular, rather than estimating how
  much memory we will need for page tables and then build them into that
  memory -- a calculation that has shown to be incredibly fragile -- we
  now build them (on 64 bits) with the aid of a "pseudo-linear mode" --
  a #PF handler which creates temporary page tables on demand.

  This has several advantages:

  1. It makes it much easier to support things that need access to data
     very early (a followon patchset uses this to load microcode way
     early in the kernel startup).

  2. It allows the kernel and all the kernel data objects to be invoked
     from above the 4 GB limit.  This allows kdump to work on very large
     systems.

  3. It greatly reduces the difference between Xen and native (Xen's
     equivalent of the #PF handler are the temporary page tables created
     by the domain builder), eliminating a bunch of fragile hooks.

  The patch series also gets us a bit closer to W^X.

  Additional work in this pull is the 64-bit get_user() work which you
  were also involved with, and a bunch of cleanups/speedups to
  __phys_addr()/__pa()."

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (105 commits)
  x86, mm: Move reserving low memory later in initialization
  x86, doc: Clarify the use of asm("%edx") in uaccess.h
  x86, mm: Redesign get_user with a __builtin_choose_expr hack
  x86: Be consistent with data size in getuser.S
  x86, mm: Use a bitfield to mask nuisance get_user() warnings
  x86/kvm: Fix compile warning in kvm_register_steal_time()
  x86-32: Add support for 64bit get_user()
  x86-32, mm: Remove reference to alloc_remap()
  x86-32, mm: Remove reference to resume_map_numa_kva()
  x86-32, mm: Rip out x86_32 NUMA remapping code
  x86/numa: Use __pa_nodebug() instead
  x86: Don't panic if can not alloc buffer for swiotlb
  mm: Add alloc_bootmem_low_pages_nopanic()
  x86, 64bit, mm: hibernate use generic mapping_init
  x86, 64bit, mm: Mark data/bss/brk to nx
  x86: Merge early kernel reserve for 32bit and 64bit
  x86: Add Crash kernel low reservation
  x86, kdump: Remove crashkernel range find limit for 64bit
  memblock: Add memblock_mem_size()
  x86, boot: Not need to check setup_header version for setup_data
  ...

5 files changed, 67 insertions, 33 deletions

diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 18997e5a1053..5b7531966b84 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -285,16 +285,26 @@ struct biosregs {
 void intcall(u8 int_no, const struct biosregs *ireg, struct biosregs *oreg);
 
 /* cmdline.c */
-int __cmdline_find_option(u32 cmdline_ptr, const char *option, char *buffer, int bufsize);
-int __cmdline_find_option_bool(u32 cmdline_ptr, const char *option);
+int __cmdline_find_option(unsigned long cmdline_ptr, const char *option, char *buffer, int bufsize);
+int __cmdline_find_option_bool(unsigned long cmdline_ptr, const char *option);
 static inline int cmdline_find_option(const char *option, char *buffer, int bufsize)
 {
-        return __cmdline_find_option(boot_params.hdr.cmd_line_ptr, option, buffer, bufsize);
+        unsigned long cmd_line_ptr = boot_params.hdr.cmd_line_ptr;
+
+        if (cmd_line_ptr >= 0x100000)
+                return -1;      /* inaccessible */
+
+        return __cmdline_find_option(cmd_line_ptr, option, buffer, bufsize);
 }
 
 static inline int cmdline_find_option_bool(const char *option)
 {
-        return __cmdline_find_option_bool(boot_params.hdr.cmd_line_ptr, option);
+        unsigned long cmd_line_ptr = boot_params.hdr.cmd_line_ptr;
+
+        if (cmd_line_ptr >= 0x100000)
+                return -1;      /* inaccessible */
+
+        return __cmdline_find_option_bool(cmd_line_ptr, option);
 }
 
 
diff --git a/arch/x86/boot/cmdline.c b/arch/x86/boot/cmdline.c
index 6b3b6f708c04..625d21b0cd3f 100644
--- a/arch/x86/boot/cmdline.c
+++ b/arch/x86/boot/cmdline.c
@@ -27,7 +27,7 @@ static inline int myisspace(u8 c)
  * Returns the length of the argument (regardless of if it was
  * truncated to fit in the buffer), or -1 on not found.
  */
-int __cmdline_find_option(u32 cmdline_ptr, const char *option, char *buffer, int bufsize)
+int __cmdline_find_option(unsigned long cmdline_ptr, const char *option, char *buffer, int bufsize)
 {
         addr_t cptr;
         char c;
@@ -41,8 +41,8 @@ int __cmdline_find_option(u32 cmdline_ptr, const char *option, char *buffer, int
                 st_bufcpy       /* Copying this to buffer */
         } state = st_wordstart;
 
-        if (!cmdline_ptr || cmdline_ptr >= 0x100000)
-                return -1;      /* No command line, or inaccessible */
+        if (!cmdline_ptr)
+                return -1;      /* No command line */
 
         cptr = cmdline_ptr & 0xf;
         set_fs(cmdline_ptr >> 4);
@@ -99,7 +99,7 @@ int __cmdline_find_option(u32 cmdline_ptr, const char *option, char *buffer, int
  * Returns the position of that option (starts counting with 1)
  * or 0 on not found
  */
-int __cmdline_find_option_bool(u32 cmdline_ptr, const char *option)
+int __cmdline_find_option_bool(unsigned long cmdline_ptr, const char *option)
 {
         addr_t cptr;
         char c;
@@ -111,8 +111,8 @@ int __cmdline_find_option_bool(u32 cmdline_ptr, const char *option)
                 st_wordskip,    /* Miscompare, skip */
         } state = st_wordstart;
 
-        if (!cmdline_ptr || cmdline_ptr >= 0x100000)
-                return -1;      /* No command line, or inaccessible */
+        if (!cmdline_ptr)
+                return -1;      /* No command line */
 
         cptr = cmdline_ptr & 0xf;
         set_fs(cmdline_ptr >> 4);
diff --git a/arch/x86/boot/compressed/cmdline.c b/arch/x86/boot/compressed/cmdline.c
index 10f6b1178c68..bffd73b45b1f 100644
--- a/arch/x86/boot/compressed/cmdline.c
+++ b/arch/x86/boot/compressed/cmdline.c
@@ -13,13 +13,21 @@ static inline char rdfs8(addr_t addr)
         return *((char *)(fs + addr));
 }
 #include "../cmdline.c"
+static unsigned long get_cmd_line_ptr(void)
+{
+        unsigned long cmd_line_ptr = real_mode->hdr.cmd_line_ptr;
+
+        cmd_line_ptr |= (u64)real_mode->ext_cmd_line_ptr << 32;
+
+        return cmd_line_ptr;
+}
 int cmdline_find_option(const char *option, char *buffer, int bufsize)
 {
-        return __cmdline_find_option(real_mode->hdr.cmd_line_ptr, option, buffer, bufsize);
+        return __cmdline_find_option(get_cmd_line_ptr(), option, buffer, bufsize);
 }
 int cmdline_find_option_bool(const char *option)
 {
-        return __cmdline_find_option_bool(real_mode->hdr.cmd_line_ptr, option);
+        return __cmdline_find_option_bool(get_cmd_line_ptr(), option);
 }
 
 #endif
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index f5d1aaa0dec8..c1d383d1fb7e 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -37,6 +37,12 @@
         __HEAD
         .code32
 ENTRY(startup_32)
+        /*
+         * 32bit entry is 0 and it is ABI so immutable!
+         * If we come here directly from a bootloader,
+         * kernel(text+data+bss+brk) ramdisk, zero_page, command line
+         * all need to be under the 4G limit.
+         */
         cld
         /*
          * Test KEEP_SEGMENTS flag to see if the bootloader is asking
@@ -154,6 +160,12 @@ ENTRY(startup_32)
         btsl    $_EFER_LME, %eax
         wrmsr
 
+        /* After gdt is loaded */
+        xorl    %eax, %eax
+        lldt    %ax
+        movl    $0x20, %eax
+        ltr     %ax
+
         /*
          * Setup for the jump to 64bit mode
          *
@@ -176,28 +188,18 @@ ENTRY(startup_32)
         lret
 ENDPROC(startup_32)
 
-no_longmode:
-        /* This isn't an x86-64 CPU so hang */
-1:
-        hlt
-        jmp     1b
-
-#include "../../kernel/verify_cpu.S"
-
-        /*
-         * Be careful here startup_64 needs to be at a predictable
-         * address so I can export it in an ELF header.  Bootloaders
-         * should look at the ELF header to find this address, as
-         * it may change in the future.
-         */
         .code64
         .org 0x200
 ENTRY(startup_64)
         /*
+         * 64bit entry is 0x200 and it is ABI so immutable!
          * We come here either from startup_32 or directly from a
-         * 64bit bootloader.  If we come here from a bootloader we depend on
-         * an identity mapped page table being provied that maps our
-         * entire text+data+bss and hopefully all of memory.
+         * 64bit bootloader.
+         * If we come here from a bootloader, kernel(text+data+bss+brk),
+         * ramdisk, zero_page, command line could be above 4G.
+         * We depend on an identity mapped page table being provided
+         * that maps our entire kernel(text+data+bss+brk), zero page
+         * and command line.
          */
 #ifdef CONFIG_EFI_STUB
         /*
@@ -247,9 +249,6 @@ preferred_addr:
         movl    %eax, %ss
         movl    %eax, %fs
         movl    %eax, %gs
-        lldt    %ax
-        movl    $0x20, %eax
-        ltr     %ax
 
         /*
          * Compute the decompressed kernel start address.  It is where
@@ -349,6 +348,15 @@ relocated:
  */
         jmp     *%rbp
 
+        .code32
+no_longmode:
+        /* This isn't an x86-64 CPU so hang */
+1:
+        hlt
+        jmp     1b
+
+#include "../../kernel/verify_cpu.S"
+
         .data
 gdt:
         .word   gdt_end - gdt
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 944ce595f767..9ec06a1f6d61 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -374,6 +374,14 @@ xloadflags:
 #else
 # define XLF0 0
 #endif
+
+#if defined(CONFIG_RELOCATABLE) && defined(CONFIG_X86_64)
+   /* kernel/boot_param/ramdisk could be loaded above 4g */
+# define XLF1 XLF_CAN_BE_LOADED_ABOVE_4G
+#else
+# define XLF1 0
+#endif
+
 #ifdef CONFIG_EFI_STUB
 # ifdef CONFIG_X86_64
 #  define XLF23 XLF_EFI_HANDOVER_64             /* 64-bit EFI handover ok */
@@ -383,7 +391,7 @@ xloadflags:
 #else
 # define XLF23 0
 #endif
-                        .word XLF0 | XLF23
+                        .word XLF0 | XLF1 | XLF23
 
 cmdline_size:   .long   COMMAND_LINE_SIZE-1     #length of the command line,
                                                 #added with boot protocol