2021-09-17 07:23:14

by John Hubbard

[permalink] [raw]
Subject: Re: [PATCH] mm/hugetlb: Drop __unmap_hugepage_range definition from hugetlb.h

On 9/16/21 14:28, Peter Xu wrote:
> Drop it in the header since it's only used in hugetlb.c.

Hi Peter,

Tiny documentation tweak: could the above line please be changed to
something approximately like this:

"Remove __unmap_hugepage_range() from the header file, because it is
only used in the .c file."

?

Because: "drop it in" is so close to "drop it into" (which means, "add
it to"), that it's actually reading a lot like the opposite of what you
intend to say.

>
> Suggested-by: Mike Kravetz <[email protected]>
> Signed-off-by: Peter Xu <[email protected]>
> ---
> include/linux/hugetlb.h | 10 ----------
> mm/hugetlb.c | 6 +++---
> 2 files changed, 3 insertions(+), 13 deletions(-)


The change itself looks accurate for the current top of tree, so:

Reviewed-by: John Hubbard <[email protected]>


thanks,
--
John Hubbard
NVIDIA

>
> diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h
> index 1faebe1cd0ed..3cbf60464398 100644
> --- a/include/linux/hugetlb.h
> +++ b/include/linux/hugetlb.h
> @@ -143,9 +143,6 @@ void __unmap_hugepage_range_final(struct mmu_gather *tlb,
> struct vm_area_struct *vma,
> unsigned long start, unsigned long end,
> struct page *ref_page);
> -void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma,
> - unsigned long start, unsigned long end,
> - struct page *ref_page);
> void hugetlb_report_meminfo(struct seq_file *);
> int hugetlb_report_node_meminfo(char *buf, int len, int nid);
> void hugetlb_show_meminfo(void);
> @@ -385,13 +382,6 @@ static inline void __unmap_hugepage_range_final(struct mmu_gather *tlb,
> BUG();
> }
>
> -static inline void __unmap_hugepage_range(struct mmu_gather *tlb,
> - struct vm_area_struct *vma, unsigned long start,
> - unsigned long end, struct page *ref_page)
> -{
> - BUG();
> -}
> -
> static inline vm_fault_t hugetlb_fault(struct mm_struct *mm,
> struct vm_area_struct *vma, unsigned long address,
> unsigned int flags)
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 95dc7b83381f..d394d9545c4e 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -4426,9 +4426,9 @@ int copy_hugetlb_page_range(struct mm_struct *dst, struct mm_struct *src,
> return ret;
> }
>
> -void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma,
> - unsigned long start, unsigned long end,
> - struct page *ref_page)
> +static void __unmap_hugepage_range(struct mmu_gather *tlb, struct vm_area_struct *vma,
> + unsigned long start, unsigned long end,
> + struct page *ref_page)
> {
> struct mm_struct *mm = vma->vm_mm;
> unsigned long address;
>



2021-09-17 10:50:36

by Peter Xu

[permalink] [raw]
Subject: Re: [PATCH] mm/hugetlb: Drop __unmap_hugepage_range definition from hugetlb.h

On Thu, Sep 16, 2021 at 03:57:38PM -0700, John Hubbard wrote:
> On 9/16/21 14:28, Peter Xu wrote:
> > Drop it in the header since it's only used in hugetlb.c.
>
> Hi Peter,

Hi, John,

>
> Tiny documentation tweak: could the above line please be changed to
> something approximately like this:
>
> "Remove __unmap_hugepage_range() from the header file, because it is
> only used in the .c file."
>
> ?

Sure thing.

>
> Because: "drop it in" is so close to "drop it into" (which means, "add
> it to"), that it's actually reading a lot like the opposite of what you
> intend to say.
>
> >
> > Suggested-by: Mike Kravetz <[email protected]>
> > Signed-off-by: Peter Xu <[email protected]>
> > ---
> > include/linux/hugetlb.h | 10 ----------
> > mm/hugetlb.c | 6 +++---
> > 2 files changed, 3 insertions(+), 13 deletions(-)
>
>
> The change itself looks accurate for the current top of tree, so:
>
> Reviewed-by: John Hubbard <[email protected]>

Thanks!

--
Peter Xu