mm-shmem-rename-shmem_is_huge-to-shmem_huge_global_enabled.patch removed from -mm tree
The quilt patch titled
Subject: mm: shmem: rename shmem_is_huge() to shmem_huge_global_enabled()
has been removed from the -mm tree. Its filename was
mm-shmem-rename-shmem_is_huge-to-shmem_huge_global_enabled.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Baolin Wang <[email protected]>
Subject: mm: shmem: rename shmem_is_huge() to shmem_huge_global_enabled()
Date: Mon, 22 Jul 2024 13:43:18 +0800
shmem_is_huge() is now used to check if the top-level huge page is enabled, thus rename it to reflect its usage.
---
include/linux/shmem_fs.h | 9 +++++---- mm/huge_memory.c | 5 +++-- mm/shmem.c | 15 ++++++++------- 3 files changed, 16 insertions(+), 13 deletions(-)
include/linux/shmem_fs.h renamed from include/linux/shmem_fs.h~mm-shmem-rename-shmem_is_huge-to-shmem_huge_global_enabled +5 -4
@@ -111,14 +111,15 @@ extern void shmem_truncate_range(structint 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; }
mm/huge_memory.c renamed from mm/huge_memory.c~mm-shmem-rename-shmem_is_huge-to-shmem_huge_global_enabled +3 -2
@@ -160,8 +160,9 @@ unsigned long __thp_vma_allowable_orders* 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 ;
mm/shmem.c renamed from mm/shmem.c~mm-shmem-rename-shmem_is_huge-to-shmem_huge_global_enabled +8 -7
@@ -548,9 +548,9 @@ static bool shmem_confirm_swap(struct adstatic 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 } } -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_idma 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 ) {
@@ -2149,7 +2150,7 @@ repeat: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))
_
Patches currently in -mm which might be from [email protected] are
mm-swap-extend-swap_shmem_alloc-to-support-batch-swap_map_shmem-flag-setting.patch mm-shmem-extend-shmem_partial_swap_usage-to-support-large-folio-swap.patch mm-filemap-use-xa_get_order-to-get-the-swap-entry-order.patch mm-shmem-use-swap_free_nr-to-free-shmem-swap-entries.patch mm-shmem-support-large-folio-allocation-for-shmem_replace_folio.patch mm-shmem-support-large-folio-allocation-for-shmem_replace_folio-fix.patch mm-shmem-support-large-folio-allocation-for-shmem_replace_folio-fix-fix.patch mm-shmem-drop-folio-reference-count-using-nr_pages-in-shmem_delete_from_page_cache.patch mm-shmem-split-large-entry-if-the-swapin-folio-is-not-large.patch mm-shmem-split-large-entry-if-the-swapin-folio-is-not-large-fix-2.patch mm-shmem-support-large-folio-swap-out.patch mm-shmem-support-large-folio-swap-out-fix-2.patch mm-khugepaged-expand-the-is_refcount_suitable-to-support-file-folios.patch mm-khugepaged-use-the-number-of-pages-in-the-folio-to-check-the-reference-count.patch mm-khugepaged-support-shmem-mthp-copy.patch mm-khugepaged-support-shmem-mthp-collapse.patch selftests-mm-support-shmem-mthp-collapse-testing.patch