Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15670ef1 authored by Mark Rutland's avatar Mark Rutland Committed by Will Deacon
Browse files

arm64: pgalloc: consistently use PGALLOC_GFP 



We currently allocate different levels of page tables with a variety of
differing flags, and the PGALLOC_GFP flags, intended for use when
allocating any level of page table, are only used for ptes in
pte_alloc_one. On x86, PGALLOC_GFP is used for all page table
allocations.

Currently the major differences are:

* __GFP_NOTRACK -- Needed to ensure page tables are always accessible in
  the presence of kmemcheck to prevent recursive faults. Currently
  kmemcheck cannot be selected for arm64.

* __GFP_REPEAT -- Causes the allocator to try to reclaim pages and retry
  upon a failure to allocate.

* __GFP_ZERO -- Sometimes passed explicitly, sometimes zalloc variants
  are used.

While we've no encountered issues so far, it would be preferable to be
consistent. This patch ensures all levels of table are allocated in the
same manner, with PGALLOC_GFP.

Cc: Steve Capper <steve.capper@arm.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent d6c763af

arch/arm64/include/asm/pgalloc.h

+4 −4
Original line number Diff line number Diff line
@@ -26,11 +26,13 @@ 


#define check_pgt_cache()		do { } while (0)



#define PGALLOC_GFP	(GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO)



#if CONFIG_ARM64_PGTABLE_LEVELS > 2



static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)

{

	return (pmd_t *)get_zeroed_page(GFP_KERNEL | __GFP_REPEAT);

	return (pmd_t *)__get_free_page(PGALLOC_GFP);

}



static inline void pmd_free(struct mm_struct *mm, pmd_t *pmd)
@@ -50,7 +52,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd) 


static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)

{

	return (pud_t *)get_zeroed_page(GFP_KERNEL | __GFP_REPEAT);

	return (pud_t *)__get_free_page(PGALLOC_GFP);

}



static inline void pud_free(struct mm_struct *mm, pud_t *pud)
@@ -69,8 +71,6 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud) 
extern pgd_t *pgd_alloc(struct mm_struct *mm);

extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);



#define PGALLOC_GFP	(GFP_KERNEL | __GFP_NOTRACK | __GFP_REPEAT | __GFP_ZERO)



static inline pte_t *

pte_alloc_one_kernel(struct mm_struct *mm, unsigned long addr)

{

arch/arm64/mm/pgd.c

+2 −2
Original line number Diff line number Diff line
@@ -35,9 +35,9 @@ static struct kmem_cache *pgd_cache; 
pgd_t *pgd_alloc(struct mm_struct *mm)

{

	if (PGD_SIZE == PAGE_SIZE)

		return (pgd_t *)get_zeroed_page(GFP_KERNEL);

		return (pgd_t *)__get_free_page(PGALLOC_GFP);

	else

		return kmem_cache_zalloc(pgd_cache, GFP_KERNEL);

		return kmem_cache_alloc(pgd_cache, PGALLOC_GFP);

}



void pgd_free(struct mm_struct *mm, pgd_t *pgd)