Commit 16785bd7 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Linus Torvalds
Browse files

mm: merge pte_mkhuge() call into arch_make_huge_pte() 

Each call into pte_mkhuge() is invariably followed by
arch_make_huge_pte().  Instead arch_make_huge_pte() can accommodate
pte_mkhuge() at the beginning.  This updates generic fallback stub for
arch_make_huge_pte() and available platforms definitions.  This makes huge
pte creation much cleaner and easier to follow.

Link: https://lkml.kernel.org/r/1643860669-26307-1-git-send-email-anshuman.khandual@arm.com


Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ef696f93

arch/arm64/mm/hugetlbpage.c

+1 −0
Original line number Diff line number Diff line
@@ -347,6 +347,7 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags) 
{

	size_t pagesize = 1UL << shift;



	entry = pte_mkhuge(entry);

	if (pagesize == CONT_PTE_SIZE) {

		entry = pte_mkcont(entry);

	} else if (pagesize == CONT_PMD_SIZE) {

arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h

+2 −2
Original line number Diff line number Diff line
@@ -71,9 +71,9 @@ static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags 
	size_t size = 1UL << shift;



	if (size == SZ_16K)

		return __pte(pte_val(entry) & ~_PAGE_HUGE);

		return __pte(pte_val(entry) | _PAGE_SPS);

	else

		return entry;

		return __pte(pte_val(entry) | _PAGE_SPS | _PAGE_HUGE);

}

#define arch_make_huge_pte arch_make_huge_pte

#endif

arch/sparc/mm/hugetlbpage.c

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags) 
{

	pte_t pte;



	entry = pte_mkhuge(entry);

	pte = hugepage_shift_to_tte(entry, shift);



#ifdef CONFIG_SPARC64

include/linux/hugetlb.h

+1 −1
Original line number Diff line number Diff line
@@ -754,7 +754,7 @@ static inline void arch_clear_hugepage_flags(struct page *page) { } 
static inline pte_t arch_make_huge_pte(pte_t entry, unsigned int shift,

				       vm_flags_t flags)

{

	return entry;

	return pte_mkhuge(entry);

}

#endif

mm/hugetlb.c

+1 −2
Original line number Diff line number Diff line
@@ -4637,7 +4637,6 @@ static pte_t make_huge_pte(struct vm_area_struct *vma, struct page *page, 
					   vma->vm_page_prot));

	}

	entry = pte_mkyoung(entry);

	entry = pte_mkhuge(entry);

	entry = arch_make_huge_pte(entry, shift, vma->vm_flags);



	return entry;
@@ -6171,7 +6170,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma, 
			unsigned int shift = huge_page_shift(hstate_vma(vma));



			old_pte = huge_ptep_modify_prot_start(vma, address, ptep);

			pte = pte_mkhuge(huge_pte_modify(old_pte, newprot));

			pte = huge_pte_modify(old_pte, newprot);

			pte = arch_make_huge_pte(pte, shift, vma->vm_flags);

			huge_ptep_modify_prot_commit(vma, address, ptep, old_pte, pte);

			pages++;