| Message ID | d1e54510-9ea2-edf-3851-fa7635ce1e5e@google.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | arch: allow pte_offset_map[_lock]() to fail | expand |
| Context | Check | Description |
|---|---|---|
| conchuod/cover_letter | success | Series has a cover letter |
| conchuod/tree_selection | success | Guessed tree name to be for-next at HEAD ac9a78681b92 |
| conchuod/fixes_present | success | Fixes tag not required for -next series |
| conchuod/maintainers_pattern | success | MAINTAINERS pattern errors before the patch: 6 and now 6 |
| conchuod/verify_signedoff | success | Signed-off-by tag matches author and committer |
| conchuod/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| conchuod/build_rv64_clang_allmodconfig | success | Errors and warnings before: 8 this patch: 8 |
| conchuod/module_param | success | Was 0 now: 0 |
| conchuod/build_rv64_gcc_allmodconfig | success | Errors and warnings before: 8 this patch: 8 |
| conchuod/build_rv32_defconfig | success | Build OK |
| conchuod/dtb_warn_rv64 | success | Errors and warnings before: 3 this patch: 3 |
| conchuod/header_inline | success | No static functions without inline keyword in header files |
| conchuod/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 16 lines checked |
| conchuod/build_rv64_nommu_k210_defconfig | success | Build OK |
| conchuod/verify_fixes | success | No Fixes tag |
| conchuod/build_rv64_nommu_virt_defconfig | success | Build OK |
Hi Hugh, On 5/10/23 06:59, Hugh Dickins wrote: > pte_alloc_map() expects to be followed by pte_unmap(), but hugetlb omits > that: to keep balance in future, use the recently added pte_alloc_huge() > instead; with pte_offset_huge() a better name for pte_offset_kernel(). > > Signed-off-by: Hugh Dickins <hughd@google.com> > --- > arch/riscv/mm/hugetlbpage.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/riscv/mm/hugetlbpage.c b/arch/riscv/mm/hugetlbpage.c > index a163a3e0f0d4..80926946759f 100644 > --- a/arch/riscv/mm/hugetlbpage.c > +++ b/arch/riscv/mm/hugetlbpage.c > @@ -43,7 +43,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, > > for_each_napot_order(order) { > if (napot_cont_size(order) == sz) { > - pte = pte_alloc_map(mm, pmd, addr & napot_cont_mask(order)); > + pte = pte_alloc_huge(mm, pmd, addr & napot_cont_mask(order)); > break; > } > } > @@ -90,7 +90,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, > > for_each_napot_order(order) { > if (napot_cont_size(order) == sz) { > - pte = pte_offset_kernel(pmd, addr & napot_cont_mask(order)); > + pte = pte_offset_huge(pmd, addr & napot_cont_mask(order)); > break; > } > } Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com> Thanks, Alex
On Tue, 09 May 2023 21:59:57 PDT (-0700), hughd@google.com wrote: > pte_alloc_map() expects to be followed by pte_unmap(), but hugetlb omits > that: to keep balance in future, use the recently added pte_alloc_huge() > instead; with pte_offset_huge() a better name for pte_offset_kernel(). > > Signed-off-by: Hugh Dickins <hughd@google.com> > --- > arch/riscv/mm/hugetlbpage.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/riscv/mm/hugetlbpage.c b/arch/riscv/mm/hugetlbpage.c > index a163a3e0f0d4..80926946759f 100644 > --- a/arch/riscv/mm/hugetlbpage.c > +++ b/arch/riscv/mm/hugetlbpage.c > @@ -43,7 +43,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, > > for_each_napot_order(order) { > if (napot_cont_size(order) == sz) { > - pte = pte_alloc_map(mm, pmd, addr & napot_cont_mask(order)); > + pte = pte_alloc_huge(mm, pmd, addr & napot_cont_mask(order)); > break; > } > } > @@ -90,7 +90,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, > > for_each_napot_order(order) { > if (napot_cont_size(order) == sz) { > - pte = pte_offset_kernel(pmd, addr & napot_cont_mask(order)); > + pte = pte_offset_huge(pmd, addr & napot_cont_mask(order)); > break; > } > } Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
diff --git a/arch/riscv/mm/hugetlbpage.c b/arch/riscv/mm/hugetlbpage.c index a163a3e0f0d4..80926946759f 100644 --- a/arch/riscv/mm/hugetlbpage.c +++ b/arch/riscv/mm/hugetlbpage.c @@ -43,7 +43,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm, for_each_napot_order(order) { if (napot_cont_size(order) == sz) { - pte = pte_alloc_map(mm, pmd, addr & napot_cont_mask(order)); + pte = pte_alloc_huge(mm, pmd, addr & napot_cont_mask(order)); break; } } @@ -90,7 +90,7 @@ pte_t *huge_pte_offset(struct mm_struct *mm, for_each_napot_order(order) { if (napot_cont_size(order) == sz) { - pte = pte_offset_kernel(pmd, addr & napot_cont_mask(order)); + pte = pte_offset_huge(pmd, addr & napot_cont_mask(order)); break; } }
pte_alloc_map() expects to be followed by pte_unmap(), but hugetlb omits that: to keep balance in future, use the recently added pte_alloc_huge() instead; with pte_offset_huge() a better name for pte_offset_kernel(). Signed-off-by: Hugh Dickins <hughd@google.com> --- arch/riscv/mm/hugetlbpage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)