The patch titled Subject: s390: mm: add p?d_leaf() definitions has been added to the -mm tree. Its filename is s390-mm-add-pd_leaf-definitions.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/s390-mm-add-pd_leaf-definitions.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/s390-mm-add-pd_leaf-definitions.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Steven Price <steven.price@xxxxxxx> Subject: s390: mm: add p?d_leaf() definitions walk_page_range() is going to be allowed to walk page tables other than those of user space. For this it needs to know when it has reached a 'leaf' entry in the page tables. This information is provided by the p?d_leaf() functions/macros. For s390, pud_large() and pmd_large() are already implemented as static inline functions. Add a macro to provide the p?d_leaf names for the generic code to use. Link: http://lkml.kernel.org/r/20191028135910.33253-9-steven.price@xxxxxxx Signed-off-by: Steven Price <steven.price@xxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: Vasily Gorbik <gor@xxxxxxxxxxxxx> Cc: Christian Borntraeger <borntraeger@xxxxxxxxxx> Cc: Albert Ou <aou@xxxxxxxxxxxxxxxxx> Cc: Alexander Potapenko <glider@xxxxxxxxxx> Cc: Alexandre Ghiti <alex@xxxxxxxx> Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx> Cc: Andy Lutomirski <luto@xxxxxxxxxx> Cc: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> Cc: Arnd Bergmann <arnd@xxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: Borislav Petkov <bp@xxxxxxxxx> Cc: Catalin Marinas <catalin.marinas@xxxxxxx> Cc: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx> Cc: Dave Jiang <dave.jiang@xxxxxxxxx> Cc: David S. Miller <davem@xxxxxxxxxxxxx> Cc: Dmitry Vyukov <dvyukov@xxxxxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: James Hogan <jhogan@xxxxxxxxxx> Cc: James Morse <james.morse@xxxxxxx> Cc: "Liang, Kan" <kan.liang@xxxxxxxxxxxxxxx> Cc: Mark Rutland <mark.rutland@xxxxxxx> Cc: Matthew Wilcox <mawilcox@xxxxxxxxxxxxx> Cc: Michael Ellerman <mpe@xxxxxxxxxxxxxx> Cc: Naoya Horiguchi <n-horiguchi@xxxxxxxxxxxxx> Cc: Palmer Dabbelt <palmer@xxxxxxxxxx> Cc: Paul Burton <paul.burton@xxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Paul Walmsley <paul.walmsley@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxx> Cc: Shiraz Hashim <shashim@xxxxxxxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Vineet Gupta <vgupta@xxxxxxxxxxxx> Cc: Will Deacon <will@xxxxxxxxxx> Cc: Zong Li <zong.li@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/s390/include/asm/pgtable.h | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/s390/include/asm/pgtable.h~s390-mm-add-pd_leaf-definitions +++ a/arch/s390/include/asm/pgtable.h @@ -675,6 +675,7 @@ static inline int pud_none(pud_t pud) return pud_val(pud) == _REGION3_ENTRY_EMPTY; } +#define pud_leaf pud_large static inline int pud_large(pud_t pud) { if ((pud_val(pud) & _REGION_ENTRY_TYPE_MASK) != _REGION_ENTRY_TYPE_R3) @@ -692,6 +693,7 @@ static inline unsigned long pud_pfn(pud_ return (pud_val(pud) & origin_mask) >> PAGE_SHIFT; } +#define pmd_leaf pmd_large static inline int pmd_large(pmd_t pmd) { return (pmd_val(pmd) & _SEGMENT_ENTRY_LARGE) != 0; _ Patches currently in -mm which might be from steven.price@xxxxxxx are mm-add-generic-pd_leaf-macros.patch arc-mm-add-pd_leaf-definitions.patch arm-mm-add-pd_leaf-definitions.patch arm64-mm-add-pd_leaf-definitions.patch mips-mm-add-pd_leaf-definitions.patch powerpc-mm-add-pd_leaf-definitions.patch riscv-mm-add-pd_leaf-definitions.patch s390-mm-add-pd_leaf-definitions.patch sparc-mm-add-pd_leaf-definitions.patch x86-mm-add-pd_leaf-definitions.patch mm-pagewalk-add-p4d_entry-and-pgd_entry.patch mm-pagewalk-allow-walking-without-vma.patch mm-pagewalk-add-test_pd-callbacks.patch mm-pagewalk-add-depth-parameter-to-pte_hole.patch x86-mm-point-to-struct-seq_file-from-struct-pg_state.patch x86-mmefi-convert-ptdump_walk_pgd_level-to-take-a-mm_struct.patch x86-mm-convert-ptdump_walk_pgd_level_debugfs-to-take-an-mm_struct.patch x86-mm-convert-ptdump_walk_pgd_level_core-to-take-an-mm_struct.patch mm-add-generic-ptdump.patch x86-mm-convert-dump_pagetables-to-use-walk_page_range.patch arm64-mm-convert-mm-dumpc-to-use-walk_page_range.patch arm64-mm-display-non-present-entries-in-ptdump.patch