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

Pull x86 mm updates from Ingo Molnar:
 "The main x86 MM changes in this cycle were:

   - continued native kernel PCID support preparation patches to the TLB
     flushing code (Andy Lutomirski)

   - various fixes related to 32-bit compat syscall returning address
     over 4Gb in applications, launched from 64-bit binaries - motivated
     by C/R frameworks such as Virtuozzo. (Dmitry Safonov)

   - continued Intel 5-level paging enablement: in particular the
     conversion of x86 GUP to the generic GUP code. (Kirill A. Shutemov)

   - x86/mpx ABI corner case fixes/enhancements (Joerg Roedel)

   - ... plus misc updates, fixes and cleanups"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (62 commits)
  mm, zone_device: Replace {get, put}_zone_device_page() with a single reference to fix pmem crash
  x86/mm: Fix flush_tlb_page() on Xen
  x86/mm: Make flush_tlb_mm_range() more predictable
  x86/mm: Remove flush_tlb() and flush_tlb_current_task()
  x86/vm86/32: Switch to flush_tlb_mm_range() in mark_screen_rdonly()
  x86/mm/64: Fix crash in remove_pagetable()
  Revert "x86/mm/gup: Switch GUP to the generic get_user_page_fast() implementation"
  x86/boot/e820: Remove a redundant self assignment
  x86/mm: Fix dump pagetables for 4 levels of page tables
  x86/mpx, selftests: Only check bounds-vs-shadow when we keep shadow
  x86/mpx: Correctly report do_mpx_bt_fault() failures to user-space
  Revert "x86/mm/numa: Remove numa_nodemask_from_meminfo()"
  x86/espfix: Add support for 5-level paging
  x86/kasan: Extend KASAN to support 5-level paging
  x86/mm: Add basic defines/helpers for CONFIG_X86_5LEVEL=y
  x86/paravirt: Add 5-level support to the paravirt code
  x86/mm: Define virtual memory map for 5-level paging
  x86/asm: Remove __VIRTUAL_MASK_SHIFT==47 assert
  x86/boot: Detect 5-level paging support
  x86/mm/numa: Remove numa_nodemask_from_meminfo()
  ...

2 files changed, 49 insertions, 2 deletions

diff --git a/tools/testing/selftests/x86/ldt_gdt.c b/tools/testing/selftests/x86/ldt_gdt.c
index f6121612e769..b9a22f18566a 100644
--- a/tools/testing/selftests/x86/ldt_gdt.c
+++ b/tools/testing/selftests/x86/ldt_gdt.c
@@ -409,6 +409,51 @@ static void *threadproc(void *ctx)
         }
 }
 
+#ifdef __i386__
+
+#ifndef SA_RESTORE
+#define SA_RESTORER 0x04000000
+#endif
+
+/*
+ * The UAPI header calls this 'struct sigaction', which conflicts with
+ * glibc.  Sigh.
+ */
+struct fake_ksigaction {
+        void *handler;  /* the real type is nasty */
+        unsigned long sa_flags;
+        void (*sa_restorer)(void);
+        unsigned char sigset[8];
+};
+
+static void fix_sa_restorer(int sig)
+{
+        struct fake_ksigaction ksa;
+
+        if (syscall(SYS_rt_sigaction, sig, NULL, &ksa, 8) == 0) {
+                /*
+                 * glibc has a nasty bug: it sometimes writes garbage to
+                 * sa_restorer.  This interacts quite badly with anything
+                 * that fiddles with SS because it can trigger legacy
+                 * stack switching.  Patch it up.  See:
+                 *
+                 * https://sourceware.org/bugzilla/show_bug.cgi?id=21269
+                 */
+                if (!(ksa.sa_flags & SA_RESTORER) && ksa.sa_restorer) {
+                        ksa.sa_restorer = NULL;
+                        if (syscall(SYS_rt_sigaction, sig, &ksa, NULL,
+                                    sizeof(ksa.sigset)) != 0)
+                                err(1, "rt_sigaction");
+                }
+        }
+}
+#else
+static void fix_sa_restorer(int sig)
+{
+        /* 64-bit glibc works fine. */
+}
+#endif
+
 static void sethandler(int sig, void (*handler)(int, siginfo_t *, void *),
                        int flags)
 {
@@ -420,6 +465,7 @@ static void sethandler(int sig, void (*handler)(int, siginfo_t *, void *),
         if (sigaction(sig, &sa, 0))
                 err(1, "sigaction");
 
+        fix_sa_restorer(sig);
 }
 
 static jmp_buf jmpbuf;
diff --git a/tools/testing/selftests/x86/mpx-mini-test.c b/tools/testing/selftests/x86/mpx-mini-test.c
index 616ee9673339..a8df159a8924 100644
--- a/tools/testing/selftests/x86/mpx-mini-test.c
+++ b/tools/testing/selftests/x86/mpx-mini-test.c
@@ -404,8 +404,6 @@ void handler(int signum, siginfo_t *si, void *vucontext)
                 dprintf2("info->si_lower: %p\n", __si_bounds_lower(si));
                 dprintf2("info->si_upper: %p\n", __si_bounds_upper(si));
 
-                check_siginfo_vs_shadow(si);
-
                 for (i = 0; i < 8; i++)
                         dprintf3("[%d]: %p\n", i, si_addr_ptr[i]);
                 switch (br_reason) {
@@ -416,6 +414,9 @@ void handler(int signum, siginfo_t *si, void *vucontext)
                         exit(5);
                 case 1: /* #BR MPX bounds exception */
                         /* these are normal and we expect to see them */
+
+                        check_siginfo_vs_shadow(si);
+
                         dprintf1("bounds exception (normal): status 0x%jx at %p si_addr: %p\n",
                                 status, (void *)ip, si->si_addr);
                         num_bnd_chk++;