diff options
| author | Alexandre Ghiti <alexghiti@rivosinc.com> | 2024-01-17 20:57:41 +0100 |
|---|---|---|
| committer | Palmer Dabbelt <palmer@rivosinc.com> | 2024-02-01 13:25:55 -0800 |
| commit | a179a4bfb694f80f2709a1d0398469e787acb974 (patch) | |
| tree | f1e173585fcdeef6b99df4e793bf0358543f517c | |
| parent | 1458eb2c9d88ad4b35eb6d6a4aa1d43d8fbf7f62 (diff) | |
| download | linux-stable-a179a4bfb694f80f2709a1d0398469e787acb974.tar.gz linux-stable-a179a4bfb694f80f2709a1d0398469e787acb974.tar.bz2 linux-stable-a179a4bfb694f80f2709a1d0398469e787acb974.zip | |
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: 82a1a1f3bfb6 ("riscv: mm: support Svnapot in hugetlb page")
Signed-off-by: Alexandre Ghiti <alexghiti@rivosinc.com>
Link: https://lore.kernel.org/r/20240117195741.1926459-3-alexghiti@rivosinc.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
| -rw-r--r-- | arch/riscv/mm/hugetlbpage.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/riscv/mm/hugetlbpage.c b/arch/riscv/mm/hugetlbpage.c index 865ac5c7d159..87406b26c3da 100644 --- a/arch/riscv/mm/hugetlbpage.c +++ b/arch/riscv/mm/hugetlbpage.c @@ -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, |