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

Pull x86 protection key support from Ingo Molnar:
 "This tree adds support for a new memory protection hardware feature
  that is available in upcoming Intel CPUs: 'protection keys' (pkeys).

  There's a background article at LWN.net:

      https://lwn.net/Articles/643797/

  The gist is that protection keys allow the encoding of
  user-controllable permission masks in the pte.  So instead of having a
  fixed protection mask in the pte (which needs a system call to change
  and works on a per page basis), the user can map a (handful of)
  protection mask variants and can change the masks runtime relatively
  cheaply, without having to change every single page in the affected
  virtual memory range.

  This allows the dynamic switching of the protection bits of large
  amounts of virtual memory, via user-space instructions.  It also
  allows more precise control of MMU permission bits: for example the
  executable bit is separate from the read bit (see more about that
  below).

  This tree adds the MM infrastructure and low level x86 glue needed for
  that, plus it adds a high level API to make use of protection keys -
  if a user-space application calls:

        mmap(..., PROT_EXEC);

  or

        mprotect(ptr, sz, PROT_EXEC);

  (note PROT_EXEC-only, without PROT_READ/WRITE), the kernel will notice
  this special case, and will set a special protection key on this
  memory range.  It also sets the appropriate bits in the Protection
  Keys User Rights (PKRU) register so that the memory becomes unreadable
  and unwritable.

  So using protection keys the kernel is able to implement 'true'
  PROT_EXEC on x86 CPUs: without protection keys PROT_EXEC implies
  PROT_READ as well.  Unreadable executable mappings have security
  advantages: they cannot be read via information leaks to figure out
  ASLR details, nor can they be scanned for ROP gadgets - and they
  cannot be used by exploits for data purposes either.

  We know about no user-space code that relies on pure PROT_EXEC
  mappings today, but binary loaders could start making use of this new
  feature to map binaries and libraries in a more secure fashion.

  There is other pending pkeys work that offers more high level system
  call APIs to manage protection keys - but those are not part of this
  pull request.

  Right now there's a Kconfig that controls this feature
  (CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS) that is default enabled
  (like most x86 CPU feature enablement code that has no runtime
  overhead), but it's not user-configurable at the moment.  If there's
  any serious problem with this then we can make it configurable and/or
  flip the default"

* 'mm-pkeys-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (38 commits)
  x86/mm/pkeys: Fix mismerge of protection keys CPUID bits
  mm/pkeys: Fix siginfo ABI breakage caused by new u64 field
  x86/mm/pkeys: Fix access_error() denial of writes to write-only VMA
  mm/core, x86/mm/pkeys: Add execute-only protection keys support
  x86/mm/pkeys: Create an x86 arch_calc_vm_prot_bits() for VMA flags
  x86/mm/pkeys: Allow kernel to modify user pkey rights register
  x86/fpu: Allow setting of XSAVE state
  x86/mm: Factor out LDT init from context init
  mm/core, x86/mm/pkeys: Add arch_validate_pkey()
  mm/core, arch, powerpc: Pass a protection key in to calc_vm_flag_bits()
  x86/mm/pkeys: Actually enable Memory Protection Keys in the CPU
  x86/mm/pkeys: Add Kconfig prompt to existing config option
  x86/mm/pkeys: Dump pkey from VMA in /proc/pid/smaps
  x86/mm/pkeys: Dump PKRU with other kernel registers
  mm/core, x86/mm/pkeys: Differentiate instruction fetches
  x86/mm/pkeys: Optimize fault handling in access_error()
  mm/core: Do not enforce PKEY permissions on remote mm access
  um, pkeys: Add UML arch_*_access_permitted() methods
  mm/gup, x86/mm/pkeys: Check VMAs and PTEs for protection keys
  x86/mm/gup: Simplify get_user_pages() PTE bit handling
  ...

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/mips/mm/gup.c
Simple merge

diff --cc arch/s390/include/asm/mmu_context.h
Simple merge

diff --cc arch/x86/Kconfig
index d07cca6,eda18ce..8b680a5
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -155,7 -155,8 +155,9 @@@ config X8
        select VIRT_TO_BUS
        select X86_DEV_DMA_OPS                  if X86_64
        select X86_FEATURE_NAMES                if PROC_FS
 +      select HAVE_STACK_VALIDATION            if X86_64
+       select ARCH_USES_HIGH_VMA_FLAGS         if X86_INTEL_MEMORY_PROTECTION_KEYS
+       select ARCH_HAS_PKEYS                   if X86_INTEL_MEMORY_PROTECTION_KEYS
  
  config INSTRUCTION_DECODER
        def_bool y

diff --cc arch/x86/include/asm/cpufeatures.h
Simple merge

diff --cc arch/x86/include/asm/fpu/xstate.h
index f23cd8c,9994d42..38951b0
--- 1/arch/x86/include/asm/fpu/xstate.h
--- 2/arch/x86/include/asm/fpu/xstate.h
+++ b/arch/x86/include/asm/fpu/xstate.h
@@@ -24,11 -28,9 +24,12 @@@
                                 XFEATURE_MASK_YMM | \
                                 XFEATURE_MASK_OPMASK | \
                                 XFEATURE_MASK_ZMM_Hi256 | \
-                                XFEATURE_MASK_Hi16_ZMM)
+                                XFEATURE_MASK_Hi16_ZMM  | \
+                                XFEATURE_MASK_PKRU)
  
 +/* Supported features which require eager state saving */
 +#define XFEATURE_MASK_EAGER   (XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR)
 +
  /* All currently supported features */
  #define XCNTXT_MASK   (XFEATURE_MASK_LAZY | XFEATURE_MASK_EAGER)
  

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/fpu/core.c
Simple merge

diff --cc arch/x86/kernel/fpu/xstate.c
index 6e8354f,1b19818..b48ef35
--- 1/arch/x86/kernel/fpu/xstate.c
--- 2/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@@ -51,11 -59,9 +59,12 @@@ void fpu__xstate_clear_all_cpu_caps(voi
        setup_clear_cpu_cap(X86_FEATURE_AVX512PF);
        setup_clear_cpu_cap(X86_FEATURE_AVX512ER);
        setup_clear_cpu_cap(X86_FEATURE_AVX512CD);
 +      setup_clear_cpu_cap(X86_FEATURE_AVX512DQ);
 +      setup_clear_cpu_cap(X86_FEATURE_AVX512BW);
 +      setup_clear_cpu_cap(X86_FEATURE_AVX512VL);
        setup_clear_cpu_cap(X86_FEATURE_MPX);
        setup_clear_cpu_cap(X86_FEATURE_XGETBV1);
+       setup_clear_cpu_cap(X86_FEATURE_PKU);
  }
  
  /*

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/mm/fault.c
index 03898ae,6138db4..5ce1ed0
--- 1/arch/x86/mm/fault.c
--- 2/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@@ -661,9 -711,11 +718,11 @@@ no_context(struct pt_regs *regs, unsign
        struct task_struct *tsk = current;
        unsigned long flags;
        int sig;
+       /* No context means no VMA to pass down */
+       struct vm_area_struct *vma = NULL;
  
        /* Are we prepared to handle this kernel fault? */
 -      if (fixup_exception(regs)) {
 +      if (fixup_exception(regs, X86_TRAP_PF)) {
                /*
                 * Any interrupt that takes a fault gets the fixup. This makes
                 * the below recursive fault logic only apply to a faults from

diff --cc arch/x86/mm/gup.c
Simple merge

diff --cc arch/x86/mm/mpx.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
Simple merge

diff --cc drivers/gpu/drm/radeon/radeon_ttm.c
Simple merge

diff --cc drivers/misc/mic/scif/scif_rma.c
Simple merge

diff --cc drivers/scsi/st.c
Simple merge

diff --cc drivers/staging/android/ashmem.c
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/events/uprobes.c
Simple merge

diff --cc mm/Kconfig
Simple merge

diff --cc mm/memory.c
Simple merge

diff --cc mm/mempolicy.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/nommu.c
Simple merge

diff --cc mm/util.c
Simple merge

diff --cc virt/kvm/async_pf.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge