Commit f0caffbf authored by Bang Li's avatar Bang Li Committed by Liu Shixin
Browse files

mm: thp: support "THPeligible" semantics for mTHP with anonymous shmem 

mainline inclusion
from mainline-v6.11-rc1
commit 26c7d8413aaf113a54b54f63e151416a5c5c2a88
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAIHPC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=26c7d8413aaf113a54b54f63e151416a5c5c2a88

--------------------------------

After the commit 7fb1b252afb5 ("mm: shmem: add mTHP support for anonymous
shmem"), we can configure different policies through the multi-size THP
sysfs interface for anonymous shmem.  But currently "THPeligible"
indicates only whether the mapping is eligible for allocating THP-pages as
well as the THP is PMD mappable or not for anonymous shmem, we need to
support semantics for mTHP with anonymous shmem similar to those for mTHP
with anonymous memory.

Link: https://lkml.kernel.org/r/20240705032309.24933-1-libang.li@antgroup.com


Signed-off-by: default avatarBang Li <libang.li@antgroup.com>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Lance Yang <ioworker0@gmail.com>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
parent fcd78709

include/linux/shmem_fs.h

+9 −0
Original line number Diff line number Diff line
@@ -117,12 +117,21 @@ 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);

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)

{

	return false;

}

static inline unsigned long shmem_allowable_huge_orders(struct inode *inode,

				struct vm_area_struct *vma, pgoff_t index,

				bool global_huge)

{

	return 0;

}

#endif



#ifdef CONFIG_SHMEM

mm/huge_memory.c

+9 −4
Original line number Diff line number Diff line
@@ -155,10 +155,15 @@ unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma, 
	 * Must be done before hugepage flags check since shmem has its

	 * own flags.

	 */

	if (!in_pf && shmem_file(vma->vm_file))

		return shmem_is_huge(file_inode(vma->vm_file), vma->vm_pgoff,

				     !enforce_sysfs, vma->vm_mm, vm_flags)

			? orders : 0;

	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);



		if (!vma_is_anon_shmem(vma))

			return global_huge ? orders : 0;

		return shmem_allowable_huge_orders(file_inode(vma->vm_file),

							vma, vma->vm_pgoff, global_huge);

	}



	if (!vma_is_anonymous(vma)) {

		/*

mm/shmem.c

+1 −8
Original line number Diff line number Diff line
@@ -1639,7 +1639,7 @@ static gfp_t limit_gfp_mask(gfp_t huge_gfp, gfp_t limit_gfp) 
}



#ifdef CONFIG_TRANSPARENT_HUGEPAGE

static 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,

				bool global_huge)

{
@@ -1724,13 +1724,6 @@ static unsigned long shmem_suitable_orders(struct inode *inode, struct vm_fault 
	return orders;

}

#else

static unsigned long shmem_allowable_huge_orders(struct inode *inode,

				struct vm_area_struct *vma, pgoff_t index,

				bool global_huge)

{

	return 0;

}



static unsigned long shmem_suitable_orders(struct inode *inode, struct vm_fault *vmf,

					   struct address_space *mapping, pgoff_t index,

					   unsigned long orders)