Commit 34e8e63a authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Catalin Marinas
Browse files

arm64/hugetlb: Consistently use pud_sect_supported() 



Let's be consistent in using pud_sect_supported() for PUD_SIZE sized pages.
Hence change hugetlb_mask_last_page() and arch_make_huge_pte() as required.
Also re-arranged the switch statement for a common warning message.

Cc: Will Deacon <will@kernel.org>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Reviewed-by: default avatarRyan Roberts <ryan.roberts@arm.com>
Link: https://lore.kernel.org/r/20250220050534.799645-1-anshuman.khandual@arm.com


Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 2d7872f3

arch/arm64/mm/hugetlbpage.c

+10 −10
Original line number Diff line number Diff line
@@ -342,7 +342,9 @@ unsigned long hugetlb_mask_last_page(struct hstate *h) 
	switch (hp_size) {

#ifndef __PAGETABLE_PMD_FOLDED

	case PUD_SIZE:

		if (pud_sect_supported())

			return PGDIR_SIZE - PUD_SIZE;

		break;

#endif

	case CONT_PMD_SIZE:

		return PUD_SIZE - CONT_PMD_SIZE;
@@ -364,23 +366,21 @@ pte_t arch_make_huge_pte(pte_t entry, unsigned int shift, vm_flags_t flags) 
	switch (pagesize) {

#ifndef __PAGETABLE_PMD_FOLDED

	case PUD_SIZE:

		entry = pud_pte(pud_mkhuge(pte_pud(entry)));

		if (pud_sect_supported())

			return pud_pte(pud_mkhuge(pte_pud(entry)));

		break;

#endif

	case CONT_PMD_SIZE:

		entry = pmd_pte(pmd_mkcont(pte_pmd(entry)));

		fallthrough;

		return pmd_pte(pmd_mkhuge(pmd_mkcont(pte_pmd(entry))));

	case PMD_SIZE:

		entry = pmd_pte(pmd_mkhuge(pte_pmd(entry)));

		break;

		return pmd_pte(pmd_mkhuge(pte_pmd(entry)));

	case CONT_PTE_SIZE:

		entry = pte_mkcont(entry);

		break;

		return pte_mkcont(entry);

	default:

		pr_warn("%s: unrecognized huge page size 0x%lx\n",

			__func__, pagesize);

		break;

	}

	pr_warn("%s: unrecognized huge page size 0x%lx\n",

		__func__, pagesize);

	return entry;

}