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 2/3] arm64: mm: don't call page table ctors for init_mm Date: Mon, 18 Feb 2019 16:13:18 -0700 [thread overview] Message-ID: <20190218231319.178224-2-yuzhao@google.com> (raw) In-Reply-To: <20190218231319.178224-1-yuzhao@google.com> init_mm doesn't require page table lock to be initialized at any level. Add a separate page table allocator for it, and the new one skips page table ctors. The ctors allocate memory when ALLOC_SPLIT_PTLOCKS is set. Not calling them avoids memory leak in case we call pte_free_kernel() on init_mm. Signed-off-by: Yu Zhao <yuzhao@google.com> --- arch/arm64/mm/mmu.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index fa7351877af3..e8bf8a6300e8 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -370,6 +370,16 @@ static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys, } while (pgdp++, addr = next, addr != end); } +static phys_addr_t pgd_kernel_pgtable_alloc(int shift) +{ + void *ptr = (void *)__get_free_page(PGALLOC_GFP); + BUG_ON(!ptr); + + /* Ensure the zeroed page is visible to the page table walker */ + dsb(ishst); + return __pa(ptr); +} + static phys_addr_t pgd_pgtable_alloc(int shift) { void *ptr = (void *)__get_free_page(PGALLOC_GFP); @@ -591,7 +601,7 @@ static int __init map_entry_trampoline(void) /* Map only the text into the trampoline page table */ memset(tramp_pg_dir, 0, PGD_SIZE); __create_pgd_mapping(tramp_pg_dir, pa_start, TRAMP_VALIAS, PAGE_SIZE, - prot, pgd_pgtable_alloc, 0); + prot, pgd_kernel_pgtable_alloc, 0); /* Map both the text and data into the kernel page table */ __set_fixmap(FIX_ENTRY_TRAMP_TEXT, pa_start, prot); @@ -1067,7 +1077,8 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, flags = NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS; __create_pgd_mapping(swapper_pg_dir, start, __phys_to_virt(start), - size, PAGE_KERNEL, pgd_pgtable_alloc, flags); + size, PAGE_KERNEL, pgd_kernel_pgtable_alloc, + flags); return __add_pages(nid, start >> PAGE_SHIFT, size >> PAGE_SHIFT, altmap, want_memblock); -- 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 2/3] arm64: mm: don't call page table ctors for init_mm Date: Mon, 18 Feb 2019 16:13:18 -0700 [thread overview] Message-ID: <20190218231319.178224-2-yuzhao@google.com> (raw) In-Reply-To: <20190218231319.178224-1-yuzhao@google.com> init_mm doesn't require page table lock to be initialized at any level. Add a separate page table allocator for it, and the new one skips page table ctors. The ctors allocate memory when ALLOC_SPLIT_PTLOCKS is set. Not calling them avoids memory leak in case we call pte_free_kernel() on init_mm. Signed-off-by: Yu Zhao <yuzhao@google.com> --- arch/arm64/mm/mmu.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index fa7351877af3..e8bf8a6300e8 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -370,6 +370,16 @@ static void __create_pgd_mapping(pgd_t *pgdir, phys_addr_t phys, } while (pgdp++, addr = next, addr != end); } +static phys_addr_t pgd_kernel_pgtable_alloc(int shift) +{ + void *ptr = (void *)__get_free_page(PGALLOC_GFP); + BUG_ON(!ptr); + + /* Ensure the zeroed page is visible to the page table walker */ + dsb(ishst); + return __pa(ptr); +} + static phys_addr_t pgd_pgtable_alloc(int shift) { void *ptr = (void *)__get_free_page(PGALLOC_GFP); @@ -591,7 +601,7 @@ static int __init map_entry_trampoline(void) /* Map only the text into the trampoline page table */ memset(tramp_pg_dir, 0, PGD_SIZE); __create_pgd_mapping(tramp_pg_dir, pa_start, TRAMP_VALIAS, PAGE_SIZE, - prot, pgd_pgtable_alloc, 0); + prot, pgd_kernel_pgtable_alloc, 0); /* Map both the text and data into the kernel page table */ __set_fixmap(FIX_ENTRY_TRAMP_TEXT, pa_start, prot); @@ -1067,7 +1077,8 @@ int arch_add_memory(int nid, u64 start, u64 size, struct vmem_altmap *altmap, flags = NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS; __create_pgd_mapping(swapper_pg_dir, start, __phys_to_virt(start), - size, PAGE_KERNEL, pgd_pgtable_alloc, flags); + size, PAGE_KERNEL, pgd_kernel_pgtable_alloc, + flags); return __add_pages(nid, start >> PAGE_SHIFT, size >> PAGE_SHIFT, altmap, want_memblock); -- 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 ` [PATCH v2 1/3] arm64: mm: use appropriate ctors for page tables Yu Zhao 2019-02-18 23:13 ` Yu Zhao 2019-02-18 23:13 ` Yu Zhao [this message] 2019-02-18 23:13 ` [PATCH v2 2/3] arm64: mm: don't call page table ctors for init_mm 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-2-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.