Commit 92cd58bd authored by David Hildenbrand's avatar David Hildenbrand Committed by akpm

s390/pgtable: support __HAVE_ARCH_PTE_SWP_EXCLUSIVE

Let's use bit 52, which is unused.

Link: https://lkml.kernel.org/r/20220329164329.208407-7-david@redhat.comSigned-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Don Dutile <ddutile@redhat.com>
Cc: Gerald Schaefer <gerald.schaefer@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Jann Horn <jannh@google.com>
Cc: Jason Gunthorpe <jgg@nvidia.com>
Cc: John Hubbard <jhubbard@nvidia.com>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: Liang Zhang <zhangliang5@huawei.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Mike Rapoport <rppt@linux.ibm.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Oded Gabbay <oded.gabbay@gmail.com>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pedro Demarchi Gomes <pedrodemargomes@gmail.com>
Cc: Peter Xu <peterx@redhat.com>
Cc: Rik van Riel <riel@surriel.com>
Cc: Roman Gushchin <guro@fb.com>
Cc: Shakeel Butt <shakeelb@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 8043d26c
...@@ -181,6 +181,8 @@ static inline int is_module_addr(void *addr) ...@@ -181,6 +181,8 @@ static inline int is_module_addr(void *addr)
#define _PAGE_SOFT_DIRTY 0x000 #define _PAGE_SOFT_DIRTY 0x000
#endif #endif
#define _PAGE_SWP_EXCLUSIVE _PAGE_LARGE /* SW pte exclusive swap bit */
/* Set of bits not changed in pte_modify */ /* Set of bits not changed in pte_modify */
#define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_SPECIAL | _PAGE_DIRTY | \ #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_SPECIAL | _PAGE_DIRTY | \
_PAGE_YOUNG | _PAGE_SOFT_DIRTY) _PAGE_YOUNG | _PAGE_SOFT_DIRTY)
...@@ -826,6 +828,22 @@ static inline int pmd_protnone(pmd_t pmd) ...@@ -826,6 +828,22 @@ static inline int pmd_protnone(pmd_t pmd)
} }
#endif #endif
#define __HAVE_ARCH_PTE_SWP_EXCLUSIVE
static inline int pte_swp_exclusive(pte_t pte)
{
return pte_val(pte) & _PAGE_SWP_EXCLUSIVE;
}
static inline pte_t pte_swp_mkexclusive(pte_t pte)
{
return set_pte_bit(pte, __pgprot(_PAGE_SWP_EXCLUSIVE));
}
static inline pte_t pte_swp_clear_exclusive(pte_t pte)
{
return clear_pte_bit(pte, __pgprot(_PAGE_SWP_EXCLUSIVE));
}
static inline int pte_soft_dirty(pte_t pte) static inline int pte_soft_dirty(pte_t pte)
{ {
return pte_val(pte) & _PAGE_SOFT_DIRTY; return pte_val(pte) & _PAGE_SOFT_DIRTY;
...@@ -1715,14 +1733,15 @@ static inline int has_transparent_hugepage(void) ...@@ -1715,14 +1733,15 @@ static inline int has_transparent_hugepage(void)
* Bits 54 and 63 are used to indicate the page type. Bit 53 marks the pte * Bits 54 and 63 are used to indicate the page type. Bit 53 marks the pte
* as invalid. * as invalid.
* A swap pte is indicated by bit pattern (pte & 0x201) == 0x200 * A swap pte is indicated by bit pattern (pte & 0x201) == 0x200
* | offset |X11XX|type |S0| * | offset |E11XX|type |S0|
* |0000000000111111111122222222223333333333444444444455|55555|55566|66| * |0000000000111111111122222222223333333333444444444455|55555|55566|66|
* |0123456789012345678901234567890123456789012345678901|23456|78901|23| * |0123456789012345678901234567890123456789012345678901|23456|78901|23|
* *
* Bits 0-51 store the offset. * Bits 0-51 store the offset.
* Bit 52 (E) is used to remember PG_anon_exclusive.
* Bits 57-61 store the type. * Bits 57-61 store the type.
* Bit 62 (S) is used for softdirty tracking. * Bit 62 (S) is used for softdirty tracking.
* Bits 52, 55 and 56 (X) are unused. * Bits 55 and 56 (X) are unused.
*/ */
#define __SWP_OFFSET_MASK ((1UL << 52) - 1) #define __SWP_OFFSET_MASK ((1UL << 52) - 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment