| Message ID | d1e54510-9ea2-edf-3851-fa7635ce1e5e@google.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
| Series | arch: allow pte_offset_map[_lock]() to fail | expand |
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(-)