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

Pull s390 updates from Martin Schwidefsky:
 "The new features and main improvements in this merge for v4.9

   - Support for the UBSAN sanitizer

   - Set HAVE_EFFICIENT_UNALIGNED_ACCESS, it improves the code in some
     places

   - Improvements for the in-kernel fpu code, in particular the overhead
     for multiple consecutive in kernel fpu users is recuded

   - Add a SIMD implementation for the RAID6 gen and xor operations

   - Add RAID6 recovery based on the XC instruction

   - The PCI DMA flush logic has been improved to increase the speed of
     the map / unmap operations

   - The time synchronization code has seen some updates

  And bug fixes all over the place"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (48 commits)
  s390/con3270: fix insufficient space padding
  s390/con3270: fix use of uninitialised data
  MAINTAINERS: update DASD maintainer
  s390/cio: fix accidental interrupt enabling during resume
  s390/dasd: add missing \n to end of dev_err messages
  s390/config: Enable config options for Docker
  s390/dasd: make query host access interruptible
  s390/dasd: fix panic during offline processing
  s390/dasd: fix hanging offline processing
  s390/pci_dma: improve lazy flush for unmap
  s390/pci_dma: split dma_update_trans
  s390/pci_dma: improve map_sg
  s390/pci_dma: simplify dma address calculation
  s390/pci_dma: remove dma address range check
  iommu/s390: simplify registration of I/O address translation parameters
  s390: migrate exception table users off module.h and onto extable.h
  s390: export header for CLP ioctl
  s390/vmur: fix irq pointer dereference in int handler
  s390/dasd: add missing KOBJ_CHANGE event for unformatted devices
  s390: enable UBSAN
  ...

4 files changed, 27 insertions, 12 deletions

diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index cbb73fabc91e..661d9fe63c43 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -24,7 +24,7 @@
 #include <linux/kdebug.h>
 #include <linux/init.h>
 #include <linux/console.h>
-#include <linux/module.h>
+#include <linux/extable.h>
 #include <linux/hardirq.h>
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>
diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c
index 2ce6bb3bab32..3ba622702ce4 100644
--- a/arch/s390/mm/gmap.c
+++ b/arch/s390/mm/gmap.c
@@ -94,6 +94,7 @@ out:
 struct gmap *gmap_create(struct mm_struct *mm, unsigned long limit)
 {
         struct gmap *gmap;
+        unsigned long gmap_asce;
 
         gmap = gmap_alloc(limit);
         if (!gmap)
@@ -101,6 +102,11 @@ struct gmap *gmap_create(struct mm_struct *mm, unsigned long limit)
         gmap->mm = mm;
         spin_lock(&mm->context.gmap_lock);
         list_add_rcu(&gmap->list, &mm->context.gmap_list);
+        if (list_is_singular(&mm->context.gmap_list))
+                gmap_asce = gmap->asce;
+        else
+                gmap_asce = -1UL;
+        WRITE_ONCE(mm->context.gmap_asce, gmap_asce);
         spin_unlock(&mm->context.gmap_lock);
         return gmap;
 }
@@ -230,6 +236,7 @@ EXPORT_SYMBOL_GPL(gmap_put);
 void gmap_remove(struct gmap *gmap)
 {
         struct gmap *sg, *next;
+        unsigned long gmap_asce;
 
         /* Remove all shadow gmaps linked to this gmap */
         if (!list_empty(&gmap->children)) {
@@ -243,6 +250,14 @@ void gmap_remove(struct gmap *gmap)
         /* Remove gmap from the pre-mm list */
         spin_lock(&gmap->mm->context.gmap_lock);
         list_del_rcu(&gmap->list);
+        if (list_empty(&gmap->mm->context.gmap_list))
+                gmap_asce = 0;
+        else if (list_is_singular(&gmap->mm->context.gmap_list))
+                gmap_asce = list_first_entry(&gmap->mm->context.gmap_list,
+                                             struct gmap, list)->asce;
+        else
+                gmap_asce = -1UL;
+        WRITE_ONCE(gmap->mm->context.gmap_asce, gmap_asce);
         spin_unlock(&gmap->mm->context.gmap_lock);
         synchronize_rcu();
         /* Put reference */
diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c
index af7cf28cf97e..44f150312a16 100644
--- a/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@ -309,11 +309,11 @@ static void ipte_range(pte_t *pte, unsigned long address, int nr)
         int i;
 
         if (test_facility(13)) {
-                __ptep_ipte_range(address, nr - 1, pte);
+                __ptep_ipte_range(address, nr - 1, pte, IPTE_GLOBAL);
                 return;
         }
         for (i = 0; i < nr; i++) {
-                __ptep_ipte(address, pte);
+                __ptep_ipte(address, pte, IPTE_GLOBAL);
                 address += PAGE_SIZE;
                 pte++;
         }
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index 5f092015aaa7..7a1897c51c54 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -35,9 +35,9 @@ static inline pte_t ptep_flush_direct(struct mm_struct *mm,
         atomic_inc(&mm->context.flush_count);
         if (MACHINE_HAS_TLB_LC &&
             cpumask_equal(mm_cpumask(mm), cpumask_of(smp_processor_id())))
-                __ptep_ipte_local(addr, ptep);
+                __ptep_ipte(addr, ptep, IPTE_LOCAL);
         else
-                __ptep_ipte(addr, ptep);
+                __ptep_ipte(addr, ptep, IPTE_GLOBAL);
         atomic_dec(&mm->context.flush_count);
         return old;
 }
@@ -56,7 +56,7 @@ static inline pte_t ptep_flush_lazy(struct mm_struct *mm,
                 pte_val(*ptep) |= _PAGE_INVALID;
                 mm->context.flush_mm = 1;
         } else
-                __ptep_ipte(addr, ptep);
+                __ptep_ipte(addr, ptep, IPTE_GLOBAL);
         atomic_dec(&mm->context.flush_count);
         return old;
 }
@@ -301,9 +301,9 @@ static inline pmd_t pmdp_flush_direct(struct mm_struct *mm,
         atomic_inc(&mm->context.flush_count);
         if (MACHINE_HAS_TLB_LC &&
             cpumask_equal(mm_cpumask(mm), cpumask_of(smp_processor_id())))
-                __pmdp_idte_local(addr, pmdp);
+                __pmdp_idte(addr, pmdp, IDTE_LOCAL);
         else
-                __pmdp_idte(addr, pmdp);
+                __pmdp_idte(addr, pmdp, IDTE_GLOBAL);
         atomic_dec(&mm->context.flush_count);
         return old;
 }
@@ -322,7 +322,7 @@ static inline pmd_t pmdp_flush_lazy(struct mm_struct *mm,
                 pmd_val(*pmdp) |= _SEGMENT_ENTRY_INVALID;
                 mm->context.flush_mm = 1;
         } else if (MACHINE_HAS_IDTE)
-                __pmdp_idte(addr, pmdp);
+                __pmdp_idte(addr, pmdp, IDTE_GLOBAL);
         else
                 __pmdp_csp(pmdp);
         atomic_dec(&mm->context.flush_count);
@@ -374,9 +374,9 @@ static inline pud_t pudp_flush_direct(struct mm_struct *mm,
         atomic_inc(&mm->context.flush_count);
         if (MACHINE_HAS_TLB_LC &&
             cpumask_equal(mm_cpumask(mm), cpumask_of(smp_processor_id())))
-                __pudp_idte_local(addr, pudp);
+                __pudp_idte(addr, pudp, IDTE_LOCAL);
         else
-                __pudp_idte(addr, pudp);
+                __pudp_idte(addr, pudp, IDTE_GLOBAL);
         atomic_dec(&mm->context.flush_count);
         return old;
 }
@@ -620,7 +620,7 @@ bool test_and_clear_guest_dirty(struct mm_struct *mm, unsigned long addr)
         pte = *ptep;
         if (dirty && (pte_val(pte) & _PAGE_PRESENT)) {
                 pgste = pgste_pte_notify(mm, addr, ptep, pgste);
-                __ptep_ipte(addr, ptep);
+                __ptep_ipte(addr, ptep, IPTE_GLOBAL);
                 if (MACHINE_HAS_ESOP || !(pte_val(pte) & _PAGE_WRITE))
                         pte_val(pte) |= _PAGE_PROTECT;
                 else