Re: [PATCH v2 2/3] mm: shmem: rename shmem_is_huge() to shmem_huge_global_enabled()

[Ryan Roberts <ryan.roberts@arm.com>]

On 13/07/2024 14:24, Baolin Wang wrote:
> The shmem_is_huge() is now used to check if the top-level huge page is enabled,
> thus rename it to reflect its usage.
> 
> Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>

Reviewed-by: Ryan Roberts <ryan.roberts@arm.com>

> ---
>  include/linux/shmem_fs.h |  9 +++++----
>  mm/huge_memory.c         |  5 +++--
>  mm/shmem.c               | 15 ++++++++-------
>  3 files changed, 16 insertions(+), 13 deletions(-)
> 
> diff --git a/include/linux/shmem_fs.h b/include/linux/shmem_fs.h
> index 1d06b1e5408a..405ee8d3589a 100644
> --- a/include/linux/shmem_fs.h
> +++ b/include/linux/shmem_fs.h
> @@ -111,14 +111,15 @@ extern void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end);
>  int shmem_unuse(unsigned int type);
>  
>  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
> -extern bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force,
> -			  struct mm_struct *mm, unsigned long vm_flags);
> +extern bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, bool shmem_huge_force,
> +				      struct mm_struct *mm, unsigned long vm_flags);
>  unsigned long shmem_allowable_huge_orders(struct inode *inode,
>  				struct vm_area_struct *vma, pgoff_t index,
>  				bool global_huge);
>  #else
> -static __always_inline bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force,
> -					  struct mm_struct *mm, unsigned long vm_flags)
> +static __always_inline bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index,
> +						      bool shmem_huge_force, struct mm_struct *mm,
> +						      unsigned long vm_flags)
>  {
>  	return false;
>  }
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index f9696c94e211..cc9bad12be75 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -152,8 +152,9 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma,
>  	 * own flags.
>  	 */
>  	if (!in_pf && shmem_file(vma->vm_file)) {
> -		bool global_huge = shmem_is_huge(file_inode(vma->vm_file), vma->vm_pgoff,
> -							!enforce_sysfs, vma->vm_mm, vm_flags);
> +		bool global_huge = shmem_huge_global_enabled(file_inode(vma->vm_file),
> +							     vma->vm_pgoff, !enforce_sysfs,
> +							     vma->vm_mm, vm_flags);
>  
>  		if (!vma_is_anon_shmem(vma))
>  			return global_huge ? orders : 0;
> diff --git a/mm/shmem.c b/mm/shmem.c
> index db7e9808830f..1445dcd39b6f 100644
> --- a/mm/shmem.c
> +++ b/mm/shmem.c
> @@ -548,9 +548,9 @@ static bool shmem_confirm_swap(struct address_space *mapping,
>  
>  static int shmem_huge __read_mostly = SHMEM_HUGE_NEVER;
>  
> -static bool __shmem_is_huge(struct inode *inode, pgoff_t index,
> -			    bool shmem_huge_force, struct mm_struct *mm,
> -			    unsigned long vm_flags)
> +static bool __shmem_huge_global_enabled(struct inode *inode, pgoff_t index,
> +					bool shmem_huge_force, struct mm_struct *mm,
> +					unsigned long vm_flags)
>  {
>  	loff_t i_size;
>  
> @@ -581,14 +581,15 @@ static bool __shmem_is_huge(struct inode *inode, pgoff_t index,
>  	}
>  }
>  
> -bool shmem_is_huge(struct inode *inode, pgoff_t index,
> +bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index,
>  		   bool shmem_huge_force, struct mm_struct *mm,
>  		   unsigned long vm_flags)
>  {
>  	if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER)
>  		return false;
>  
> -	return __shmem_is_huge(inode, index, shmem_huge_force, mm, vm_flags);
> +	return __shmem_huge_global_enabled(inode, index, shmem_huge_force,
> +					   mm, vm_flags);
>  }
>  
>  #if defined(CONFIG_SYSFS)
> @@ -1156,7 +1157,7 @@ static int shmem_getattr(struct mnt_idmap *idmap,
>  			STATX_ATTR_NODUMP);
>  	generic_fillattr(idmap, request_mask, inode, stat);
>  
> -	if (shmem_is_huge(inode, 0, false, NULL, 0))
> +	if (shmem_huge_global_enabled(inode, 0, false, NULL, 0))
>  		stat->blksize = HPAGE_PMD_SIZE;
>  
>  	if (request_mask & STATX_BTIME) {
> @@ -2153,7 +2154,7 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index,
>  		return 0;
>  	}
>  
> -	huge = shmem_is_huge(inode, index, false, fault_mm,
> +	huge = shmem_huge_global_enabled(inode, index, false, fault_mm,
>  			     vma ? vma->vm_flags : 0);
>  	/* Find hugepage orders that are allowed for anonymous shmem. */
>  	if (vma && vma_is_anon_shmem(vma))