s390/mm: Introduce region-third and segment table entry present bits

Introduce region-third and segment table entry present SW bits, and adjust
pmd/pud_present() accordingly.

Also add pmd/pud_present() checks to pmd/pud_leaf(), to return false for
future swap entries. Same logic applies to pmd_trans_huge(), make that
return pmd_leaf() instead of duplicating the same check.

huge_pte_offset() also needs to be adjusted, current code would return
NULL for !pud_present(). Use the same logic as in the generic version,
which allows for !pud_present() swap entries.

Similar to PTE, bit 63 can be used for the new SW present bit in region
and segment table entries. For segment-table entries (PMD) the architecture
says that "Bits 62-63 are available for programming", so they are safe to
use. The same is true for large leaf region-third-table entries (PUD).

However, for non-leaf region-third-table entries, bits 62-63 indicate the
TABLE LENGTH and both must be set to 1. But such entries would always be
considered as present, so it is safe to use bit 63 as PRESENT bit for PUD.
They also should not conflict with bit 62 potentially later used for
preserving SOFT_DIRTY in swap entries, because they are not swap entries.

Valid PMDs / PUDs should always have the present bit set, so add it to
the various pgprot defines, and also _SEGMENT_ENTRY which is OR'ed e.g.
in pmd_populate(). _REGION3_ENTRY wouldn't need any change, as the present
bit is already included in the TABLE LENGTH, but also explicitly add it
there, for completeness, and just in case the bit would ever be changed.

gmap code needs some adjustment, to also OR the _SEGMENT_ENTRY, like it
is already done gmap_shadow_pgt() when creating new PMDs, but not in
__gmap_link(). Otherwise, the gmap PMDs would not be considered present,
e.g. when using pmd_leaf() checks in gmap code. The various WARN_ON
checks in gmap code also need adjustment, to tolerate the new present
bit.

This is a prerequisite for hugetlbfs PTE_MARKER support on s390, which
is needed to fix a regression introduced with commit 8a13897fb0da
("mm: userfaultfd: support UFFDIO_POISON for hugetlbfs"). That commit
depends on the availability of swap entries for hugetlbfs, which were
not available for s390 so far.

Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index ee5d047a2d6705367c27bfd9c56a15d750c996ff..8213e05770f8be340b2b9e146a2967b991fd2c82 100644 (file)
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -277,7 +277,8 @@ static inline int is_module_addr(void *addr)
 #define _REGION1_ENTRY_EMPTY   (_REGION_ENTRY_TYPE_R1 | _REGION_ENTRY_INVALID)
 #define _REGION2_ENTRY         (_REGION_ENTRY_TYPE_R2 | _REGION_ENTRY_LENGTH)
 #define _REGION2_ENTRY_EMPTY   (_REGION_ENTRY_TYPE_R2 | _REGION_ENTRY_INVALID)
-#define _REGION3_ENTRY         (_REGION_ENTRY_TYPE_R3 | _REGION_ENTRY_LENGTH)
+#define _REGION3_ENTRY         (_REGION_ENTRY_TYPE_R3 | _REGION_ENTRY_LENGTH | \
+                                _REGION3_ENTRY_PRESENT)
 #define _REGION3_ENTRY_EMPTY   (_REGION_ENTRY_TYPE_R3 | _REGION_ENTRY_INVALID)
 
 #define _REGION3_ENTRY_HARDWARE_BITS           0xfffffffffffff6ffUL
@@ -297,6 +298,14 @@ static inline int is_module_addr(void *addr)
 
 #define _REGION_ENTRY_BITS      0xfffffffffffff22fUL
 
+/*
+ * SW region present bit. For non-leaf region-third-table entries, bits 62-63
+ * indicate the TABLE LENGTH and both must be set to 1. But such entries
+ * would always be considered as present, so it is safe to use bit 63 as
+ * PRESENT bit for PUD.
+ */
+#define _REGION3_ENTRY_PRESENT 0x0001
+
 /* Bits in the segment table entry */
 #define _SEGMENT_ENTRY_BITS                    0xfffffffffffffe3fUL
 #define _SEGMENT_ENTRY_HARDWARE_BITS           0xfffffffffffffe3cUL
@@ -308,7 +317,7 @@ static inline int is_module_addr(void *addr)
 #define _SEGMENT_ENTRY_INVALID 0x20    /* invalid segment table entry      */
 #define _SEGMENT_ENTRY_TYPE_MASK 0x0c  /* segment table type mask          */
 
-#define _SEGMENT_ENTRY         (0)
+#define _SEGMENT_ENTRY         (_SEGMENT_ENTRY_PRESENT)
 #define _SEGMENT_ENTRY_EMPTY   (_SEGMENT_ENTRY_INVALID)
 
 #define _SEGMENT_ENTRY_DIRTY   0x2000  /* SW segment dirty bit */
@@ -324,6 +333,8 @@ static inline int is_module_addr(void *addr)
 #define _SEGMENT_ENTRY_SOFT_DIRTY 0x0000 /* SW segment soft dirty bit */
 #endif
 
+#define _SEGMENT_ENTRY_PRESENT 0x0001  /* SW segment present bit */
+
 #define _CRST_ENTRIES  2048    /* number of region/segment table entries */
 #define _PAGE_ENTRIES  256     /* number of page table entries */
 
@@ -455,17 +466,22 @@ static inline int is_module_addr(void *addr)
 /*
  * Segment entry (large page) protection definitions.
  */
-#define SEGMENT_NONE   __pgprot(_SEGMENT_ENTRY_INVALID | \
+#define SEGMENT_NONE   __pgprot(_SEGMENT_ENTRY_PRESENT | \
+                                _SEGMENT_ENTRY_INVALID | \
                                 _SEGMENT_ENTRY_PROTECT)
-#define SEGMENT_RO     __pgprot(_SEGMENT_ENTRY_PROTECT | \
+#define SEGMENT_RO     __pgprot(_SEGMENT_ENTRY_PRESENT | \
+                                _SEGMENT_ENTRY_PROTECT | \
                                 _SEGMENT_ENTRY_READ | \
                                 _SEGMENT_ENTRY_NOEXEC)
-#define SEGMENT_RX     __pgprot(_SEGMENT_ENTRY_PROTECT | \
+#define SEGMENT_RX     __pgprot(_SEGMENT_ENTRY_PRESENT | \
+                                _SEGMENT_ENTRY_PROTECT | \
                                 _SEGMENT_ENTRY_READ)
-#define SEGMENT_RW     __pgprot(_SEGMENT_ENTRY_READ | \
+#define SEGMENT_RW     __pgprot(_SEGMENT_ENTRY_PRESENT | \
+                                _SEGMENT_ENTRY_READ | \
                                 _SEGMENT_ENTRY_WRITE | \
                                 _SEGMENT_ENTRY_NOEXEC)
-#define SEGMENT_RWX    __pgprot(_SEGMENT_ENTRY_READ | \
+#define SEGMENT_RWX    __pgprot(_SEGMENT_ENTRY_PRESENT | \
+                                _SEGMENT_ENTRY_READ | \
                                 _SEGMENT_ENTRY_WRITE)
 #define SEGMENT_KERNEL __pgprot(_SEGMENT_ENTRY |       \
                                 _SEGMENT_ENTRY_LARGE | \
@@ -492,6 +508,7 @@ static inline int is_module_addr(void *addr)
  */
 
 #define REGION3_KERNEL __pgprot(_REGION_ENTRY_TYPE_R3 | \
+                                _REGION3_ENTRY_PRESENT | \
                                 _REGION3_ENTRY_LARGE |  \
                                 _REGION3_ENTRY_READ |   \
                                 _REGION3_ENTRY_WRITE |  \
@@ -499,12 +516,14 @@ static inline int is_module_addr(void *addr)
                                 _REGION3_ENTRY_DIRTY | \
                                 _REGION_ENTRY_NOEXEC)
 #define REGION3_KERNEL_RO __pgprot(_REGION_ENTRY_TYPE_R3 | \
+                                  _REGION3_ENTRY_PRESENT | \
                                   _REGION3_ENTRY_LARGE |  \
                                   _REGION3_ENTRY_READ |   \
                                   _REGION3_ENTRY_YOUNG |  \
                                   _REGION_ENTRY_PROTECT | \
                                   _REGION_ENTRY_NOEXEC)
 #define REGION3_KERNEL_EXEC __pgprot(_REGION_ENTRY_TYPE_R3 | \
+                                _REGION3_ENTRY_PRESENT | \
                                 _REGION3_ENTRY_LARGE |  \
                                 _REGION3_ENTRY_READ |   \
                                 _REGION3_ENTRY_WRITE |  \
@@ -747,7 +766,7 @@ static inline int pud_present(pud_t pud)
 {
        if (pud_folded(pud))
                return 1;
-       return (pud_val(pud) & _REGION_ENTRY_ORIGIN) != 0UL;
+       return (pud_val(pud) & _REGION3_ENTRY_PRESENT) != 0;
 }
 
 static inline int pud_none(pud_t pud)
@@ -762,13 +781,18 @@ static inline bool pud_leaf(pud_t pud)
 {
        if ((pud_val(pud) & _REGION_ENTRY_TYPE_MASK) != _REGION_ENTRY_TYPE_R3)
                return 0;
-       return !!(pud_val(pud) & _REGION3_ENTRY_LARGE);
+       return (pud_present(pud) && (pud_val(pud) & _REGION3_ENTRY_LARGE) != 0);
+}
+
+static inline int pmd_present(pmd_t pmd)
+{
+       return (pmd_val(pmd) & _SEGMENT_ENTRY_PRESENT) != 0;
 }
 
 #define pmd_leaf pmd_leaf
 static inline bool pmd_leaf(pmd_t pmd)
 {
-       return (pmd_val(pmd) & _SEGMENT_ENTRY_LARGE) != 0;
+       return (pmd_present(pmd) && (pmd_val(pmd) & _SEGMENT_ENTRY_LARGE) != 0);
 }
 
 static inline int pmd_bad(pmd_t pmd)
@@ -800,11 +824,6 @@ static inline int p4d_bad(p4d_t p4d)
        return (p4d_val(p4d) & ~_REGION_ENTRY_BITS) != 0;
 }
 
-static inline int pmd_present(pmd_t pmd)
-{
-       return pmd_val(pmd) != _SEGMENT_ENTRY_EMPTY;
-}
-
 static inline int pmd_none(pmd_t pmd)
 {
        return pmd_val(pmd) == _SEGMENT_ENTRY_EMPTY;
@@ -1852,7 +1871,7 @@ static inline pmd_t pmdp_collapse_flush(struct vm_area_struct *vma,
 
 static inline int pmd_trans_huge(pmd_t pmd)
 {
-       return pmd_val(pmd) & _SEGMENT_ENTRY_LARGE;
+       return pmd_leaf(pmd);
 }
 
 #define has_transparent_hugepage has_transparent_hugepage

diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c
index 329682655af26f581712f99a02afde3631d24fc2..404489ecaf8a4e934413644524ef693f10fb6e1d 100644 (file)
--- a/arch/s390/mm/gmap.c
+++ b/arch/s390/mm/gmap.c
@@ -587,7 +587,8 @@ int __gmap_link(struct gmap *gmap, unsigned long gaddr, unsigned long vmaddr)
                        if (pmd_leaf(*pmd)) {
                                *table = (pmd_val(*pmd) &
                                          _SEGMENT_ENTRY_HARDWARE_BITS_LARGE)
-                                       | _SEGMENT_ENTRY_GMAP_UC;
+                                       | _SEGMENT_ENTRY_GMAP_UC
+                                       | _SEGMENT_ENTRY;
                        } else
                                *table = pmd_val(*pmd) &
                                        _SEGMENT_ENTRY_HARDWARE_BITS;
@@ -2396,7 +2397,8 @@ static void gmap_pmdp_clear(struct mm_struct *mm, unsigned long vmaddr,
                        gaddr = __gmap_segment_gaddr((unsigned long *)pmdp);
                        pmdp_notify_gmap(gmap, pmdp, gaddr);
                        WARN_ON(pmd_val(*pmdp) & ~(_SEGMENT_ENTRY_HARDWARE_BITS_LARGE |
-                                                  _SEGMENT_ENTRY_GMAP_UC));
+                                                  _SEGMENT_ENTRY_GMAP_UC |
+                                                  _SEGMENT_ENTRY));
                        if (purge)
                                __pmdp_csp(pmdp);
                        set_pmd(pmdp, __pmd(_SEGMENT_ENTRY_EMPTY));
@@ -2450,7 +2452,8 @@ void gmap_pmdp_idte_local(struct mm_struct *mm, unsigned long vmaddr)
                        gaddr = __gmap_segment_gaddr(entry);
                        pmdp_notify_gmap(gmap, pmdp, gaddr);
                        WARN_ON(*entry & ~(_SEGMENT_ENTRY_HARDWARE_BITS_LARGE |
-                                          _SEGMENT_ENTRY_GMAP_UC));
+                                          _SEGMENT_ENTRY_GMAP_UC |
+                                          _SEGMENT_ENTRY));
                        if (MACHINE_HAS_TLB_GUEST)
                                __pmdp_idte(gaddr, pmdp, IDTE_GUEST_ASCE,
                                            gmap->asce, IDTE_LOCAL);
@@ -2485,7 +2488,8 @@ void gmap_pmdp_idte_global(struct mm_struct *mm, unsigned long vmaddr)
                        gaddr = __gmap_segment_gaddr(entry);
                        pmdp_notify_gmap(gmap, pmdp, gaddr);
                        WARN_ON(*entry & ~(_SEGMENT_ENTRY_HARDWARE_BITS_LARGE |
-                                          _SEGMENT_ENTRY_GMAP_UC));
+                                          _SEGMENT_ENTRY_GMAP_UC |
+                                          _SEGMENT_ENTRY));
                        if (MACHINE_HAS_TLB_GUEST)
                                __pmdp_idte(gaddr, pmdp, IDTE_GUEST_ASCE,
                                            gmap->asce, IDTE_GLOBAL);

diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
index ded0eff58a192a60d460a8e6eda6e9d30a94667d..a65bebbb5a3472d01f1e4c90abb3a1cd26565375 100644 (file)
--- a/arch/s390/mm/hugetlbpage.c
+++ b/arch/s390/mm/hugetlbpage.c
@@ -48,6 +48,7 @@ static inline unsigned long __pte_to_rste(pte_t pte)
         */
        if (pte_present(pte)) {
                rste = pte_val(pte) & PAGE_MASK;
+               rste |= _SEGMENT_ENTRY_PRESENT;
                rste |= move_set_bit(pte_val(pte), _PAGE_READ,
                                     _SEGMENT_ENTRY_READ);
                rste |= move_set_bit(pte_val(pte), _PAGE_WRITE,
@@ -223,11 +224,10 @@ pte_t *huge_pte_offset(struct mm_struct *mm,
                p4dp = p4d_offset(pgdp, addr);
                if (p4d_present(*p4dp)) {
                        pudp = pud_offset(p4dp, addr);
-                       if (pud_present(*pudp)) {
-                               if (pud_leaf(*pudp))
-                                       return (pte_t *) pudp;
+                       if (sz == PUD_SIZE)
+                               return (pte_t *)pudp;
+                       if (pud_present(*pudp))
                                pmdp = pmd_offset(pudp, addr);
-                       }
                }
        }
        return (pte_t *) pmdp;