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

Commit 3ed3a4f0 authored by Kirill A. Shutemov's avatar Kirill A. Shutemov Committed by Linus Torvalds
Browse files

mm: cleanup *pte_alloc* interfaces 



There are few things about *pte_alloc*() helpers worth cleaning up:

 - 'vma' argument is unused, let's drop it;

 - most __pte_alloc() callers do speculative check for pmd_none(),
   before taking ptl: let's introduce pte_alloc() macro which does
   the check.

   The only direct user of __pte_alloc left is userfaultfd, which has
   different expectation about atomicity wrt pmd.

 - pte_alloc_map() and pte_alloc_map_lock() are redefined using
   pte_alloc().

[sudeep.holla@arm.com: fix build for arm64 hugetlbpage]
[sfr@canb.auug.org.au: fix arch/arm/mm/mmu.c some more]
Signed-off-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5057dcd0

arch/arm/mm/mmu.c

+3 −3
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ static void *__init late_alloc(unsigned long sz) 
	return ptr;

}



static pte_t * __init pte_alloc(pmd_t *pmd, unsigned long addr,

static pte_t * __init arm_pte_alloc(pmd_t *pmd, unsigned long addr,

				unsigned long prot,

				void *(*alloc)(unsigned long sz))

{
@@ -747,7 +747,7 @@ static pte_t * __init pte_alloc(pmd_t *pmd, unsigned long addr, 
static pte_t * __init early_pte_alloc(pmd_t *pmd, unsigned long addr,

				      unsigned long prot)

{

	return pte_alloc(pmd, addr, prot, early_alloc);

	return arm_pte_alloc(pmd, addr, prot, early_alloc);

}



static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr,
@@ -756,7 +756,7 @@ static void __init alloc_init_pte(pmd_t *pmd, unsigned long addr, 
				  void *(*alloc)(unsigned long sz),

				  bool ng)

{

	pte_t *pte = pte_alloc(pmd, addr, type->prot_l1, alloc);

	pte_t *pte = arm_pte_alloc(pmd, addr, type->prot_l1, alloc);

	do {

		set_pte_ext(pte, pfn_pte(pfn, __pgprot(type->prot_pte)),

			    ng ? PTE_EXT_NG : 0);

arch/arm/mm/pgd.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ pgd_t *pgd_alloc(struct mm_struct *mm) 
		if (!new_pmd)

			goto no_pmd;



		new_pte = pte_alloc_map(mm, NULL, new_pmd, 0);

		new_pte = pte_alloc_map(mm, new_pmd, 0);

		if (!new_pte)

			goto no_pte;

arch/arm64/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, 
		 * will be no pte_unmap() to correspond with this

		 * pte_alloc_map().

		 */

		pte = pte_alloc_map(mm, NULL, pmd, addr);

		pte = pte_alloc_map(mm, pmd, addr);

	} else if (sz == PMD_SIZE) {

		if (IS_ENABLED(CONFIG_ARCH_WANT_HUGE_PMD_SHARE) &&

		    pud_none(*pud))

arch/ia64/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ huge_pte_alloc(struct mm_struct *mm, unsigned long addr, unsigned long sz) 
	if (pud) {

		pmd = pmd_alloc(mm, pud, taddr);

		if (pmd)

			pte = pte_alloc_map(mm, NULL, pmd, taddr);

			pte = pte_alloc_map(mm, pmd, taddr);

	}

	return pte;

}

arch/metag/mm/hugetlbpage.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, 
	pgd = pgd_offset(mm, addr);

	pud = pud_offset(pgd, addr);

	pmd = pmd_offset(pud, addr);

	pte = pte_alloc_map(mm, NULL, pmd, addr);

	pte = pte_alloc_map(mm, pmd, addr);

	pgd->pgd &= ~_PAGE_SZ_MASK;

	pgd->pgd |= _PAGE_SZHUGE;