From: Yu Zhao <yuzhao@google.com> To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com> Cc: "Aneesh Kumar K . V" <aneesh.kumar@linux.vnet.ibm.com>, Andrew Morton <akpm@linux-foundation.org>, Nick Piggin <npiggin@gmail.com>, Peter Zijlstra <peterz@infradead.org>, Joel Fernandes <joel@joelfernandes.org>, "Kirill A . Shutemov" <kirill@shutemov.name>, Mark Rutland <mark.rutland@arm.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Chintan Pandya <cpandya@codeaurora.org>, Jun Yao <yaojun8558363@gmail.com>, Laura Abbott <labbott@redhat.com>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, Yu Zhao <yuzhao@google.com> Subject: [PATCH v2 1/3] arm64: mm: use appropriate ctors for page tables Date: Mon, 18 Feb 2019 16:13:17 -0700 [thread overview] Message-ID: <20190218231319.178224-1-yuzhao@google.com> (raw) In-Reply-To: <20190214211642.2200-1-yuzhao@google.com> For pte page, use pgtable_page_ctor(); for pmd page, use pgtable_pmd_page_ctor() if not folded; and for the rest (pud, p4d and pgd), don't use any. Signed-off-by: Yu Zhao <yuzhao@google.com> --- arch/arm64/mm/mmu.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index b6f5aa52ac67..fa7351877af3 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -98,7 +98,7 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, } EXPORT_SYMBOL(phys_mem_access_prot); -static phys_addr_t __init early_pgtable_alloc(void) +static phys_addr_t __init early_pgtable_alloc(int shift) { phys_addr_t phys; void *ptr; @@ -173,7 +173,7 @@ static void init_pte(pmd_t *pmdp, unsigned long addr, unsigned long end, static void alloc_init_cont_pte(pmd_t *pmdp, unsigned long addr, unsigned long end, phys_addr_t phys, pgprot_t prot, - phys_addr_t (*pgtable_alloc)(void), + phys_addr_t (*pgtable_alloc)(int), int flags) { unsigned long next; @@ -183,7 +183,7 @@ static void alloc_init_cont_pte(pmd_t *pmdp, unsigned long addr, if (pmd_none(pmd)) { phys_addr_t pte_phys; BUG_ON(!pgtable_alloc); - pte_phys = pgtable_alloc(); + pte_phys = pgtable_alloc(PAGE_SHIFT); __pmd_populate(pmdp, pte_phys, PMD_TYPE_TABLE); pmd = READ_ONCE(*pmdp); } @@ -207,7 +207,7 @@ static void alloc_init_cont_pte(pmd_t *pmdp, unsigned long addr, static void init_pmd(pud_t *pudp, unsigned long addr, unsigned long end, phys_addr_t phys, pgprot_t prot, - phys_addr_t (*pgtable_alloc)(void), int flags) + phys_addr_t (*pgtable_alloc)(int), int flags) { unsigned long next; pmd_t *pmdp; @@ -245,7 +245,7 @@ static void init_pmd(pud_t *pudp, unsigned long addr, unsigned long end, static void alloc_init_cont_pmd(pud_t *pudp, unsigned long addr, unsigned long end, phys_addr_t phys, pgprot_t prot, - phys_addr_t (*pgtable_alloc)(void), int flags) + phys_addr_t (*pgtable_alloc)(int), int flags) { unsigned long next; pud_t pud = READ_ONCE(*pudp); @@ -257,7 +257,7 @@ static void alloc_init_cont_pmd(pud_t *pudp, unsigned long addr, if (pud_none(pud)) { phys_addr_t pmd_phys; BUG_ON(!pgtable_alloc); - pmd_phys = pgtable_alloc(); + pmd_phys = pgtable_alloc(PMD_SHIFT); __pud_populate(pudp, pmd_phys, PUD_TYPE_TABLE); pud = READ_ONCE(*pudp); } @@ -293,7 +293,7 @@ static inline bool use_1G_block(unsigned long addr, unsigned long next, static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, phys_addr_t phys, pgprot_t prot, - phys_addr_t (*pgtable_alloc)(void), + phys_addr_t (*pgtable_alloc)(int), int flags) { unsigned long next; @@ -303,7 +303,7 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, if (pgd_none(pgd)) { phys_addr_t pud_phys; BUG_ON(!pgtable_alloc); - pud_phys = pgtable_alloc(); + pud_phys = pgtable_alloc(PUD_SHIFT); __pgd_populate(pgdp, pud_phys, PUD_TYPE_TABLE); pgd = READ_ONCE(*pgdp); } @@ -344,7 +344,7 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys, unsigned long virt, phys_addr_t size, pgprot_t prot, - phys_addr_t (*pgtable_alloc)(void), + phys_addr_t (*pgtable_alloc)(int), int flags) { unsigned long addr, length, end, next; @@ -370,11 +370,20 @@ static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys, } while (pgdp++, addr = next, addr != end); } -static phys_addr_t pgd_pgtable_alloc(void) +static phys_addr_t pgd_pgtable_alloc(int shift) { void *ptr = (void *)__get_free_page(PGALLOC_GFP); - if (!ptr || !pgtable_page_ctor(virt_to_page(ptr))) - BUG(); + BUG_ON(!ptr); + + /* + * Initialize page table locks in case later we need to + * call core mm functions like apply_to_page_range() on + * this pre-allocated page table. + */ + if (shift == PAGE_SHIFT) + BUG_ON(!pgtable_page_ctor(virt_to_page(ptr))); + else if (shift == PMD_SHIFT && PMD_SHIFT != PUD_SHIFT) + BUG_ON(!pgtable_pmd_page_ctor(virt_to_page(ptr))); /* Ensure the zeroed page is visible to the page table walker */ dsb(ishst); -- 2.21.0.rc0.258.g878e2cd30e-goog
WARNING: multiple messages have this Message-ID (diff)
From: Yu Zhao <yuzhao@google.com> To: Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com> Cc: Mark Rutland <mark.rutland@arm.com>, linux-arch@vger.kernel.org, Yu Zhao <yuzhao@google.com>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, Peter Zijlstra <peterz@infradead.org>, linux-kernel@vger.kernel.org, Nick Piggin <npiggin@gmail.com>, Jun Yao <yaojun8558363@gmail.com>, linux-mm@kvack.org, "Aneesh Kumar K . V" <aneesh.kumar@linux.vnet.ibm.com>, Chintan Pandya <cpandya@codeaurora.org>, Joel Fernandes <joel@joelfernandes.org>, "Kirill A . Shutemov" <kirill@shutemov.name>, Andrew Morton <akpm@linux-foundation.org>, Laura Abbott <labbott@redhat.com>, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 1/3] arm64: mm: use appropriate ctors for page tables Date: Mon, 18 Feb 2019 16:13:17 -0700 [thread overview] Message-ID: <20190218231319.178224-1-yuzhao@google.com> (raw) In-Reply-To: <20190214211642.2200-1-yuzhao@google.com> For pte page, use pgtable_page_ctor(); for pmd page, use pgtable_pmd_page_ctor() if not folded; and for the rest (pud, p4d and pgd), don't use any. Signed-off-by: Yu Zhao <yuzhao@google.com> --- arch/arm64/mm/mmu.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index b6f5aa52ac67..fa7351877af3 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -98,7 +98,7 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, } EXPORT_SYMBOL(phys_mem_access_prot); -static phys_addr_t __init early_pgtable_alloc(void) +static phys_addr_t __init early_pgtable_alloc(int shift) { phys_addr_t phys; void *ptr; @@ -173,7 +173,7 @@ static void init_pte(pmd_t *pmdp, unsigned long addr, unsigned long end, static void alloc_init_cont_pte(pmd_t *pmdp, unsigned long addr, unsigned long end, phys_addr_t phys, pgprot_t prot, - phys_addr_t (*pgtable_alloc)(void), + phys_addr_t (*pgtable_alloc)(int), int flags) { unsigned long next; @@ -183,7 +183,7 @@ static void alloc_init_cont_pte(pmd_t *pmdp, unsigned long addr, if (pmd_none(pmd)) { phys_addr_t pte_phys; BUG_ON(!pgtable_alloc); - pte_phys = pgtable_alloc(); + pte_phys = pgtable_alloc(PAGE_SHIFT); __pmd_populate(pmdp, pte_phys, PMD_TYPE_TABLE); pmd = READ_ONCE(*pmdp); } @@ -207,7 +207,7 @@ static void alloc_init_cont_pte(pmd_t *pmdp, unsigned long addr, static void init_pmd(pud_t *pudp, unsigned long addr, unsigned long end, phys_addr_t phys, pgprot_t prot, - phys_addr_t (*pgtable_alloc)(void), int flags) + phys_addr_t (*pgtable_alloc)(int), int flags) { unsigned long next; pmd_t *pmdp; @@ -245,7 +245,7 @@ static void init_pmd(pud_t *pudp, unsigned long addr, unsigned long end, static void alloc_init_cont_pmd(pud_t *pudp, unsigned long addr, unsigned long end, phys_addr_t phys, pgprot_t prot, - phys_addr_t (*pgtable_alloc)(void), int flags) + phys_addr_t (*pgtable_alloc)(int), int flags) { unsigned long next; pud_t pud = READ_ONCE(*pudp); @@ -257,7 +257,7 @@ static void alloc_init_cont_pmd(pud_t *pudp, unsigned long addr, if (pud_none(pud)) { phys_addr_t pmd_phys; BUG_ON(!pgtable_alloc); - pmd_phys = pgtable_alloc(); + pmd_phys = pgtable_alloc(PMD_SHIFT); __pud_populate(pudp, pmd_phys, PUD_TYPE_TABLE); pud = READ_ONCE(*pudp); } @@ -293,7 +293,7 @@ static inline bool use_1G_block(unsigned long addr, unsigned long next, static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, phys_addr_t phys, pgprot_t prot, - phys_addr_t (*pgtable_alloc)(void), + phys_addr_t (*pgtable_alloc)(int), int flags) { unsigned long next; @@ -303,7 +303,7 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, if (pgd_none(pgd)) { phys_addr_t pud_phys; BUG_ON(!pgtable_alloc); - pud_phys = pgtable_alloc(); + pud_phys = pgtable_alloc(PUD_SHIFT); __pgd_populate(pgdp, pud_phys, PUD_TYPE_TABLE); pgd = READ_ONCE(*pgdp); } @@ -344,7 +344,7 @@ static void alloc_init_pud(pgd_t *pgdp, unsigned long addr, unsigned long end, static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys, unsigned long virt, phys_addr_t size, pgprot_t prot, - phys_addr_t (*pgtable_alloc)(void), + phys_addr_t (*pgtable_alloc)(int), int flags) { unsigned long addr, length, end, next; @@ -370,11 +370,20 @@ static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys, } while (pgdp++, addr = next, addr != end); } -static phys_addr_t pgd_pgtable_alloc(void) +static phys_addr_t pgd_pgtable_alloc(int shift) { void *ptr = (void *)__get_free_page(PGALLOC_GFP); - if (!ptr || !pgtable_page_ctor(virt_to_page(ptr))) - BUG(); + BUG_ON(!ptr); + + /* + * Initialize page table locks in case later we need to + * call core mm functions like apply_to_page_range() on + * this pre-allocated page table. + */ + if (shift == PAGE_SHIFT) + BUG_ON(!pgtable_page_ctor(virt_to_page(ptr))); + else if (shift == PMD_SHIFT && PMD_SHIFT != PUD_SHIFT) + BUG_ON(!pgtable_pmd_page_ctor(virt_to_page(ptr))); /* Ensure the zeroed page is visible to the page table walker */ dsb(ishst); -- 2.21.0.rc0.258.g878e2cd30e-goog _______________________________________________ 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-02-18 23:13 UTC|newest] Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-14 21:16 [PATCH] arm64: mm: enable per pmd page table lock Yu Zhao 2019-02-14 21:16 ` Yu Zhao 2019-02-18 15:12 ` Will Deacon 2019-02-18 15:12 ` Will Deacon 2019-02-18 19:49 ` Yu Zhao 2019-02-18 19:49 ` Yu Zhao 2019-02-18 20:48 ` Yu Zhao 2019-02-18 20:48 ` Yu Zhao 2019-02-19 4:09 ` Anshuman Khandual 2019-02-19 4:09 ` Anshuman Khandual 2019-02-18 23:13 ` Yu Zhao [this message] 2019-02-18 23:13 ` [PATCH v2 1/3] arm64: mm: use appropriate ctors for page tables Yu Zhao 2019-02-18 23:13 ` [PATCH v2 2/3] arm64: mm: don't call page table ctors for init_mm Yu Zhao 2019-02-18 23:13 ` Yu Zhao 2019-02-26 15:13 ` Mark Rutland 2019-02-26 15:13 ` Mark Rutland 2019-03-09 3:52 ` Yu Zhao 2019-03-09 3:52 ` Yu Zhao 2019-02-18 23:13 ` [PATCH v2 3/3] arm64: mm: enable per pmd page table lock Yu Zhao 2019-02-18 23:13 ` Yu Zhao 2019-02-19 4:21 ` [PATCH v2 1/3] arm64: mm: use appropriate ctors for page tables Anshuman Khandual 2019-02-19 4:21 ` Anshuman Khandual 2019-02-19 5:32 ` Yu Zhao 2019-02-19 5:32 ` Yu Zhao 2019-02-19 6:17 ` Anshuman Khandual 2019-02-19 6:17 ` Anshuman Khandual 2019-02-19 22:28 ` Yu Zhao 2019-02-19 22:28 ` Yu Zhao 2019-02-20 10:27 ` Anshuman Khandual 2019-02-20 10:27 ` Anshuman Khandual 2019-02-20 12:24 ` Matthew Wilcox 2019-02-20 12:24 ` Matthew Wilcox 2019-02-20 20:22 ` Yu Zhao 2019-02-20 20:22 ` Yu Zhao 2019-02-20 20:59 ` Matthew Wilcox 2019-02-20 20:59 ` Matthew Wilcox 2019-02-20 20:59 ` Matthew Wilcox 2019-02-20 1:34 ` Matthew Wilcox 2019-02-20 1:34 ` Matthew Wilcox 2019-02-20 1:34 ` Matthew Wilcox 2019-02-20 3:20 ` Anshuman Khandual 2019-02-20 3:20 ` Anshuman Khandual 2019-02-20 21:03 ` Matthew Wilcox 2019-02-20 21:03 ` Matthew Wilcox 2019-02-20 21:03 ` Matthew Wilcox 2019-02-26 15:12 ` Mark Rutland 2019-02-26 15:12 ` Mark Rutland 2019-03-09 4:01 ` Yu Zhao 2019-03-09 4:01 ` Yu Zhao 2019-03-09 4:01 ` Yu Zhao 2019-03-10 1:19 ` [PATCH v3 " Yu Zhao 2019-03-10 1:19 ` Yu Zhao 2019-03-10 1:19 ` Yu Zhao 2019-03-10 1:19 ` [PATCH v3 2/3] arm64: mm: don't call page table ctors for init_mm Yu Zhao 2019-03-10 1:19 ` Yu Zhao 2019-03-10 1:19 ` Yu Zhao 2019-03-10 1:19 ` [PATCH v3 3/3] arm64: mm: enable per pmd page table lock Yu Zhao 2019-03-10 1:19 ` Yu Zhao 2019-03-10 1:19 ` Yu Zhao 2019-03-11 8:28 ` Anshuman Khandual 2019-03-11 8:28 ` Anshuman Khandual 2019-03-11 23:10 ` Yu Zhao 2019-03-11 23:10 ` Yu Zhao 2019-03-11 12:12 ` Mark Rutland 2019-03-11 12:12 ` Mark Rutland 2019-03-11 12:57 ` Anshuman Khandual 2019-03-11 12:57 ` Anshuman Khandual 2019-03-11 23:11 ` Yu Zhao 2019-03-11 23:11 ` Yu Zhao 2019-03-11 23:11 ` Yu Zhao 2019-03-11 7:45 ` [PATCH v3 1/3] arm64: mm: use appropriate ctors for page tables Anshuman Khandual 2019-03-11 7:45 ` Anshuman Khandual 2019-03-11 23:23 ` Yu Zhao 2019-03-11 23:23 ` Yu Zhao 2019-03-12 0:57 ` [PATCH v4 1/4] " Yu Zhao 2019-03-12 0:57 ` Yu Zhao 2019-03-12 0:57 ` Yu Zhao 2019-03-12 0:57 ` [PATCH v4 2/4] arm64: mm: don't call page table ctors for init_mm Yu Zhao 2019-03-12 0:57 ` Yu Zhao 2019-03-12 0:57 ` Yu Zhao 2019-03-12 0:57 ` [PATCH v4 3/4] arm64: mm: call ctor for stage2 pmd page Yu Zhao 2019-03-12 0:57 ` Yu Zhao 2019-03-12 0:57 ` Yu Zhao 2019-03-12 2:19 ` [PATCH] KVM: ARM: Remove pgtable page standard functions from stage-2 page tables Anshuman Khandual 2019-03-12 2:19 ` Anshuman Khandual 2019-03-12 2:40 ` Yu Zhao 2019-03-12 2:40 ` Yu Zhao 2019-03-12 10:37 ` Suzuki K Poulose 2019-03-12 10:37 ` Suzuki K Poulose 2019-03-12 11:31 ` Anshuman Khandual 2019-03-12 11:31 ` Anshuman Khandual 2019-03-12 11:43 ` Suzuki K Poulose 2019-03-12 11:43 ` Suzuki K Poulose 2019-03-12 13:25 ` [PATCH V2] " Anshuman Khandual 2019-03-12 13:25 ` Anshuman Khandual 2019-04-01 16:16 ` Will Deacon 2019-04-01 16:16 ` Will Deacon 2019-04-01 16:16 ` Will Deacon 2019-04-01 18:34 ` Yu Zhao 2019-04-01 18:34 ` Yu Zhao 2019-04-01 18:34 ` Yu Zhao 2019-04-02 9:03 ` Will Deacon 2019-04-02 9:03 ` Will Deacon 2019-04-02 9:03 ` Will Deacon 2019-04-08 14:22 ` Will Deacon 2019-04-08 14:22 ` Will Deacon 2019-04-08 14:22 ` Will Deacon 2019-04-08 14:22 ` Will Deacon 2019-04-08 17:18 ` Yu Zhao 2019-04-08 17:18 ` Yu Zhao 2019-04-08 17:18 ` Yu Zhao 2019-04-08 9:09 ` Marc Zyngier 2019-04-08 9:09 ` Marc Zyngier 2019-04-08 9:09 ` Marc Zyngier 2019-04-08 9:09 ` Marc Zyngier 2019-03-12 0:57 ` [PATCH v4 4/4] arm64: mm: enable per pmd page table lock Yu Zhao 2019-03-12 0:57 ` Yu Zhao 2019-03-12 0:57 ` Yu Zhao 2019-02-19 3:08 ` [PATCH] " Anshuman Khandual 2019-02-19 3:08 ` Anshuman Khandual
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=20190218231319.178224-1-yuzhao@google.com \ --to=yuzhao@google.com \ --cc=akpm@linux-foundation.org \ --cc=aneesh.kumar@linux.vnet.ibm.com \ --cc=ard.biesheuvel@linaro.org \ --cc=catalin.marinas@arm.com \ --cc=cpandya@codeaurora.org \ --cc=joel@joelfernandes.org \ --cc=kirill@shutemov.name \ --cc=labbott@redhat.com \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=mark.rutland@arm.com \ --cc=npiggin@gmail.com \ --cc=peterz@infradead.org \ --cc=will.deacon@arm.com \ --cc=yaojun8558363@gmail.com \ /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.