From: Steven Price <steven.price@arm.com> To: linux-mm@kvack.org Cc: "Steven Price" <steven.price@arm.com>, "Andy Lutomirski" <luto@kernel.org>, "Ard Biesheuvel" <ard.biesheuvel@linaro.org>, "Arnd Bergmann" <arnd@arndb.de>, "Borislav Petkov" <bp@alien8.de>, "Catalin Marinas" <catalin.marinas@arm.com>, "Dave Hansen" <dave.hansen@linux.intel.com>, "Ingo Molnar" <mingo@redhat.com>, "James Morse" <james.morse@arm.com>, "Jérôme Glisse" <jglisse@redhat.com>, "Peter Zijlstra" <peterz@infradead.org>, "Thomas Gleixner" <tglx@linutronix.de>, "Will Deacon" <will@kernel.org>, x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Mark Rutland" <Mark.Rutland@arm.com>, "Liang, Kan" <kan.liang@linux.intel.com>, "Andrew Morton" <akpm@linux-foundation.org> Subject: [PATCH v10 10/22] x86: mm: Add p?d_leaf() definitions Date: Wed, 31 Jul 2019 16:45:51 +0100 [thread overview] Message-ID: <20190731154603.41797-11-steven.price@arm.com> (raw) In-Reply-To: <20190731154603.41797-1-steven.price@arm.com> 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 x86 we already have p?d_large() functions, so simply add macros to provide the generic p?d_leaf() names for the generic code. Signed-off-by: Steven Price <steven.price@arm.com> --- arch/x86/include/asm/pgtable.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 0bc530c4eb13..6986a451619e 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -239,6 +239,7 @@ static inline unsigned long pgd_pfn(pgd_t pgd) return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT; } +#define p4d_leaf p4d_large static inline int p4d_large(p4d_t p4d) { /* No 512 GiB pages yet */ @@ -247,6 +248,7 @@ static inline int p4d_large(p4d_t p4d) #define pte_page(pte) pfn_to_page(pte_pfn(pte)) +#define pmd_leaf pmd_large static inline int pmd_large(pmd_t pte) { return pmd_flags(pte) & _PAGE_PSE; @@ -874,6 +876,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address) return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(address); } +#define pud_leaf pud_large static inline int pud_large(pud_t pud) { return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) == @@ -885,6 +888,7 @@ static inline int pud_bad(pud_t pud) return (pud_flags(pud) & ~(_KERNPG_TABLE | _PAGE_USER)) != 0; } #else +#define pud_leaf pud_large static inline int pud_large(pud_t pud) { return 0; @@ -1233,6 +1237,7 @@ static inline bool pgdp_maps_userspace(void *__ptr) return (((ptr & ~PAGE_MASK) / sizeof(pgd_t)) < PGD_KERNEL_START); } +#define pgd_leaf pgd_large static inline int pgd_large(pgd_t pgd) { return 0; } #ifdef CONFIG_PAGE_TABLE_ISOLATION -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Steven Price <steven.price@arm.com> To: linux-mm@kvack.org Cc: "Mark Rutland" <Mark.Rutland@arm.com>, x86@kernel.org, "Arnd Bergmann" <arnd@arndb.de>, "Ard Biesheuvel" <ard.biesheuvel@linaro.org>, "Peter Zijlstra" <peterz@infradead.org>, "Catalin Marinas" <catalin.marinas@arm.com>, "Dave Hansen" <dave.hansen@linux.intel.com>, linux-kernel@vger.kernel.org, "Steven Price" <steven.price@arm.com>, "Jérôme Glisse" <jglisse@redhat.com>, "Ingo Molnar" <mingo@redhat.com>, "Borislav Petkov" <bp@alien8.de>, "Andy Lutomirski" <luto@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>, "James Morse" <james.morse@arm.com>, "Thomas Gleixner" <tglx@linutronix.de>, "Will Deacon" <will@kernel.org>, "Andrew Morton" <akpm@linux-foundation.org>, linux-arm-kernel@lists.infradead.org, "Liang, Kan" <kan.liang@linux.intel.com> Subject: [PATCH v10 10/22] x86: mm: Add p?d_leaf() definitions Date: Wed, 31 Jul 2019 16:45:51 +0100 [thread overview] Message-ID: <20190731154603.41797-11-steven.price@arm.com> (raw) In-Reply-To: <20190731154603.41797-1-steven.price@arm.com> 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 x86 we already have p?d_large() functions, so simply add macros to provide the generic p?d_leaf() names for the generic code. Signed-off-by: Steven Price <steven.price@arm.com> --- arch/x86/include/asm/pgtable.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 0bc530c4eb13..6986a451619e 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -239,6 +239,7 @@ static inline unsigned long pgd_pfn(pgd_t pgd) return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT; } +#define p4d_leaf p4d_large static inline int p4d_large(p4d_t p4d) { /* No 512 GiB pages yet */ @@ -247,6 +248,7 @@ static inline int p4d_large(p4d_t p4d) #define pte_page(pte) pfn_to_page(pte_pfn(pte)) +#define pmd_leaf pmd_large static inline int pmd_large(pmd_t pte) { return pmd_flags(pte) & _PAGE_PSE; @@ -874,6 +876,7 @@ static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address) return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(address); } +#define pud_leaf pud_large static inline int pud_large(pud_t pud) { return (pud_val(pud) & (_PAGE_PSE | _PAGE_PRESENT)) == @@ -885,6 +888,7 @@ static inline int pud_bad(pud_t pud) return (pud_flags(pud) & ~(_KERNPG_TABLE | _PAGE_USER)) != 0; } #else +#define pud_leaf pud_large static inline int pud_large(pud_t pud) { return 0; @@ -1233,6 +1237,7 @@ static inline bool pgdp_maps_userspace(void *__ptr) return (((ptr & ~PAGE_MASK) / sizeof(pgd_t)) < PGD_KERNEL_START); } +#define pgd_leaf pgd_large static inline int pgd_large(pgd_t pgd) { return 0; } #ifdef CONFIG_PAGE_TABLE_ISOLATION -- 2.20.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-07-31 15:46 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-31 15:45 [PATCH v10 00/22] Generic page walk and ptdump Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 01/22] mm: Add generic p?d_leaf() macros Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 02/22] arc: mm: Add p?d_leaf() definitions Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 03/22] arm: " Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 04/22] arm64: " Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 05/22] mips: " Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 18:35 ` Paul Burton 2019-07-31 18:35 ` Paul Burton 2019-07-31 15:45 ` [PATCH v10 06/22] powerpc: " Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 07/22] riscv: " Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 08/22] s390: " Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 09/22] sparc: " Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` Steven Price [this message] 2019-07-31 15:45 ` [PATCH v10 10/22] x86: " Steven Price 2019-07-31 15:45 ` [PATCH v10 11/22] mm: pagewalk: Add p4d_entry() and pgd_entry() Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 12/22] mm: pagewalk: Allow walking without vma Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 13/22] mm: pagewalk: Add test_p?d callbacks Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 14/22] mm: pagewalk: Add 'depth' parameter to pte_hole Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 15/22] x86: mm: Point to struct seq_file from struct pg_state Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 16/22] x86: mm+efi: Convert ptdump_walk_pgd_level() to take a mm_struct Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 17/22] x86: mm: Convert ptdump_walk_pgd_level_debugfs() to take an mm_struct Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:45 ` [PATCH v10 18/22] x86: mm: Convert ptdump_walk_pgd_level_core() " Steven Price 2019-07-31 15:45 ` Steven Price 2019-07-31 15:46 ` [PATCH v10 19/22] mm: Add generic ptdump Steven Price 2019-07-31 15:46 ` Steven Price 2019-07-31 15:46 ` [PATCH v10 20/22] x86: mm: Convert dump_pagetables to use walk_page_range Steven Price 2019-07-31 15:46 ` Steven Price 2019-08-06 23:58 ` Andrew Morton 2019-08-06 23:58 ` Andrew Morton 2019-08-07 12:58 ` Steven Price 2019-08-07 12:58 ` Steven Price 2019-08-07 20:16 ` Andrew Morton 2019-08-07 20:16 ` Andrew Morton 2019-07-31 15:46 ` [PATCH v10 21/22] arm64: mm: Convert mm/dump.c to use walk_page_range() Steven Price 2019-07-31 15:46 ` Steven Price 2019-07-31 15:46 ` [PATCH v10 22/22] arm64: mm: Display non-present entries in ptdump Steven Price 2019-07-31 15:46 ` Steven Price
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190731154603.41797-11-steven.price@arm.com \ --to=steven.price@arm.com \ --cc=Mark.Rutland@arm.com \ --cc=akpm@linux-foundation.org \ --cc=ard.biesheuvel@linaro.org \ --cc=arnd@arndb.de \ --cc=bp@alien8.de \ --cc=catalin.marinas@arm.com \ --cc=dave.hansen@linux.intel.com \ --cc=hpa@zytor.com \ --cc=james.morse@arm.com \ --cc=jglisse@redhat.com \ --cc=kan.liang@linux.intel.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=luto@kernel.org \ --cc=mingo@redhat.com \ --cc=peterz@infradead.org \ --cc=tglx@linutronix.de \ --cc=will@kernel.org \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.