| Message ID | 20220809091558.14379-9-alexandru.elisei@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm/arm64: Rework cache maintenance at boot | expand |
On Tue, Aug 09, 2022 at 10:15:47AM +0100, Alexandru Elisei wrote: > Until commit 031755dbfefb ("arm: enable vmalloc"), the idmap was allocated > using pgd_alloc(). After that commit, all the page table allocator > functions were switched to using the page allocator, but pgd_alloc() was > left unchanged and became unused, with the idmap now being allocated with > alloc_page(). > > For arm64, the pgd table size varies based on the page size, which is > configured by the user. For arm, it will always contain 4 entries (it > translates bits 31:30 of the input address). To keep things simple and > consistent with the other functions and across both architectures, modify > pgd_alloc() to use alloc_page() instead of memalign like the rest of the > page table allocator functions and use it to allocate the idmap. > > Note that when the idmap is created, alloc_ops->memalign is > memalign_pages() which allocates memory with page granularity. Using > memalign() as before would still have allocated a full page. > > Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> > --- > lib/arm/asm/pgtable.h | 4 ++-- > lib/arm/mmu.c | 4 ++-- > lib/arm64/asm/pgtable.h | 4 ++-- > 3 files changed, 6 insertions(+), 6 deletions(-) > Reviewed-by: Andrew Jones <andrew.jones@linux.dev>
diff --git a/lib/arm/asm/pgtable.h b/lib/arm/asm/pgtable.h index d7c73906ba5e..a35f42965df9 100644 --- a/lib/arm/asm/pgtable.h +++ b/lib/arm/asm/pgtable.h @@ -43,8 +43,8 @@ #define pgd_free(pgd) free(pgd) static inline pgd_t *pgd_alloc(void) { - pgd_t *pgd = memalign(L1_CACHE_BYTES, PTRS_PER_PGD * sizeof(pgd_t)); - memset(pgd, 0, PTRS_PER_PGD * sizeof(pgd_t)); + assert(PTRS_PER_PGD * sizeof(pgd_t) <= PAGE_SIZE); + pgd_t *pgd = alloc_page(); return pgd; } diff --git a/lib/arm/mmu.c b/lib/arm/mmu.c index 8f936acafe8b..2b7405d0274f 100644 --- a/lib/arm/mmu.c +++ b/lib/arm/mmu.c @@ -165,7 +165,7 @@ void *setup_mmu(phys_addr_t unused0, void *unused1) #endif if (!mmu_idmap) - mmu_idmap = alloc_page(); + mmu_idmap = pgd_alloc(); for (r = mem_regions; r->end; ++r) { if (r->flags & MR_F_IO) { @@ -197,7 +197,7 @@ void __iomem *__ioremap(phys_addr_t phys_addr, size_t size) pgtable = current_thread_info()->pgtable; } else { if (!mmu_idmap) - mmu_idmap = alloc_page(); + mmu_idmap = pgd_alloc(); pgtable = mmu_idmap; } diff --git a/lib/arm64/asm/pgtable.h b/lib/arm64/asm/pgtable.h index bfb8a993e112..06357920aa74 100644 --- a/lib/arm64/asm/pgtable.h +++ b/lib/arm64/asm/pgtable.h @@ -49,8 +49,8 @@ #define pgd_free(pgd) free(pgd) static inline pgd_t *pgd_alloc(void) { - pgd_t *pgd = memalign(PAGE_SIZE, PTRS_PER_PGD * sizeof(pgd_t)); - memset(pgd, 0, PTRS_PER_PGD * sizeof(pgd_t)); + assert(PTRS_PER_PGD * sizeof(pgd_t) <= PAGE_SIZE); + pgd_t *pgd = alloc_page(); return pgd; }
Until commit 031755dbfefb ("arm: enable vmalloc"), the idmap was allocated using pgd_alloc(). After that commit, all the page table allocator functions were switched to using the page allocator, but pgd_alloc() was left unchanged and became unused, with the idmap now being allocated with alloc_page(). For arm64, the pgd table size varies based on the page size, which is configured by the user. For arm, it will always contain 4 entries (it translates bits 31:30 of the input address). To keep things simple and consistent with the other functions and across both architectures, modify pgd_alloc() to use alloc_page() instead of memalign like the rest of the page table allocator functions and use it to allocate the idmap. Note that when the idmap is created, alloc_ops->memalign is memalign_pages() which allocates memory with page granularity. Using memalign() as before would still have allocated a full page. Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> --- lib/arm/asm/pgtable.h | 4 ++-- lib/arm/mmu.c | 4 ++-- lib/arm64/asm/pgtable.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)