mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-25 03:46:17 +00:00
Code Issues Releases Wiki Activity

mm: shmem: rename shmem_is_huge() to shmem_huge_global_enabled()

Browse source 
shmem_is_huge() is now used to check if the top-level huge page is
enabled, thus rename it to reflect its usage.

Link: https://lkml.kernel.org/r/da53296e0ab6359aa083561d9dc01e4223d60fbe.1721626645.git.baolin.wang@linux.alibaba.com
Signed-off-by: Baolin Wang <baolin.wang@linux.alibaba.com>
Reviewed-by: Ryan Roberts <ryan.roberts@arm.com>
Acked-by: David Hildenbrand <david@redhat.com>
Cc: Barry Song <21cnbao@gmail.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Lance Yang <ioworker0@gmail.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Baolin Wang 2024-07-22 13:43:18 +08:00 committed by Andrew Morton
parent 0bedf001e3
commit d58a2a581f
3 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
include/linux/shmem_fs.h
View file

@ -111,14 +111,15 @@ extern void shmem_truncate_range(struct inode *inode, loff_t start, loff_t end);
int shmem_unuse(unsigned int type); int shmem_unuse(unsigned int type);
#ifdef CONFIG_TRANSPARENT_HUGEPAGE #ifdef CONFIG_TRANSPARENT_HUGEPAGE
extern bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force, extern bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index, bool shmem_huge_force,
struct mm_struct *mm, unsigned long vm_flags); struct mm_struct *mm, unsigned long vm_flags);
unsigned long shmem_allowable_huge_orders(struct inode *inode, unsigned long shmem_allowable_huge_orders(struct inode *inode,
struct vm_area_struct *vma, pgoff_t index, struct vm_area_struct *vma, pgoff_t index,
bool global_huge); bool global_huge);
#else #else
static __always_inline bool shmem_is_huge(struct inode *inode, pgoff_t index, bool shmem_huge_force, static __always_inline bool shmem_huge_global_enabled(struct inode *inode, pgoff_t index,
struct mm_struct *mm, unsigned long vm_flags) bool shmem_huge_force, struct mm_struct *mm,
unsigned long vm_flags)
{ {
return false; return false;
} }

5
mm/huge_memory.c
View file

@ -160,8 +160,9 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma,
* own flags. * own flags.
*/ */
if (!in_pf && shmem_file(vma->vm_file)) { if (!in_pf && shmem_file(vma->vm_file)) {
bool global_huge = shmem_is_huge(file_inode(vma->vm_file), vma->vm_pgoff, bool global_huge = shmem_huge_global_enabled(file_inode(vma->vm_file),
!enforce_sysfs, vma->vm_mm, vm_flags); vma->vm_pgoff, !enforce_sysfs,
vma->vm_mm, vm_flags);
if (!vma_is_anon_shmem(vma)) if (!vma_is_anon_shmem(vma))
return global_huge ? orders : 0; return global_huge ? orders : 0;

15
mm/shmem.c
View file

@ -548,9 +548,9 @@ static bool shmem_confirm_swap(struct address_space *mapping,
static int shmem_huge __read_mostly = SHMEM_HUGE_NEVER; static int shmem_huge __read_mostly = SHMEM_HUGE_NEVER;
static bool __shmem_is_huge(struct inode *inode, pgoff_t index, static bool __shmem_huge_global_enabled(struct inode *inode, pgoff_t index,
bool shmem_huge_force, struct mm_struct *mm, bool shmem_huge_force, struct mm_struct *mm,
unsigned long vm_flags) unsigned long vm_flags)
{ {
loff_t i_size; 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, bool shmem_huge_force, struct mm_struct *mm,
unsigned long vm_flags) unsigned long vm_flags)
{ {
if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER) if (HPAGE_PMD_ORDER > MAX_PAGECACHE_ORDER)
return false; 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) #if defined(CONFIG_SYSFS)
@ -1156,7 +1157,7 @@ static int shmem_getattr(struct mnt_idmap *idmap,
STATX_ATTR_NODUMP); STATX_ATTR_NODUMP);
generic_fillattr(idmap, request_mask, inode, stat); 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; stat->blksize = HPAGE_PMD_SIZE;
if (request_mask & STATX_BTIME) { if (request_mask & STATX_BTIME) {
@ -2149,7 +2150,7 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index,
return 0; 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); vma ? vma->vm_flags : 0);
/* Find hugepage orders that are allowed for anonymous shmem. */ /* Find hugepage orders that are allowed for anonymous shmem. */
if (vma && vma_is_anon_shmem(vma)) if (vma && vma_is_anon_shmem(vma))