Unverified Commit a179a4bf authored by Alexandre Ghiti's avatar Alexandre Ghiti Committed by Palmer Dabbelt
Browse files

riscv: Fix hugetlb_mask_last_page() when NAPOT is enabled 



When NAPOT is enabled, a new hugepage size is available and then we need
to make hugetlb_mask_last_page() aware of that.

Fixes: 82a1a1f3 ("riscv: mm: support Svnapot in hugetlb page")
Signed-off-by: default avatarAlexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20240117195741.1926459-3-alexghiti@rivosinc.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 1458eb2c

arch/riscv/mm/hugetlbpage.c

+20 −0
Original line number Diff line number Diff line
@@ -125,6 +125,26 @@ pte_t *huge_pte_offset(struct mm_struct *mm, 
	return pte;

}



unsigned long hugetlb_mask_last_page(struct hstate *h)

{

	unsigned long hp_size = huge_page_size(h);



	switch (hp_size) {

#ifndef __PAGETABLE_PMD_FOLDED

	case PUD_SIZE:

		return P4D_SIZE - PUD_SIZE;

#endif

	case PMD_SIZE:

		return PUD_SIZE - PMD_SIZE;

	case napot_cont_size(NAPOT_CONT64KB_ORDER):

		return PMD_SIZE - napot_cont_size(NAPOT_CONT64KB_ORDER);

	default:

		break;

	}



	return 0UL;

}



static pte_t get_clear_contig(struct mm_struct *mm,

			      unsigned long addr,

			      pte_t *ptep,