Commit 9884efd7 authored by Kefeng Wang's avatar Kefeng Wang Committed by Andrew Morton
Browse files

mm: huge_memory: move file_thp_enabled() into huge_memory.c 

file_thp_enabled() is only used in __thp_vma_allowable_orders(), so move
it into huge_memory.c, also check READ_ONLY_THP_FOR_FS ahead to avoid
unnecessary code if config disabled.

Link: https://lkml.kernel.org/r/20241017141457.1169092-1-wangkefeng.wang@huawei.com


Signed-off-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarBaolin Wang <baolin.wang@linux.alibaba.com>
Cc: Barry Song <baohua@kernel.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Ryan Roberts <ryan.roberts@arm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5a90c155

include/linux/huge_mm.h

+0 −13
Original line number Diff line number Diff line
@@ -252,19 +252,6 @@ static inline unsigned long thp_vma_suitable_orders(struct vm_area_struct *vma, 
	return orders;

}



static inline bool file_thp_enabled(struct vm_area_struct *vma)

{

	struct inode *inode;



	if (!vma->vm_file)

		return false;



	inode = vma->vm_file->f_inode;



	return (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS)) &&

	       !inode_is_open_for_write(inode) && S_ISREG(inode->i_mode);

}



unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma,

					 unsigned long vm_flags,

					 unsigned long tva_flags,

mm/huge_memory.c

+15 −0
Original line number Diff line number Diff line
@@ -83,6 +83,21 @@ unsigned long huge_anon_orders_madvise __read_mostly; 
unsigned long huge_anon_orders_inherit __read_mostly;

static bool anon_orders_configured __initdata;



static inline bool file_thp_enabled(struct vm_area_struct *vma)

{

	struct inode *inode;



	if (!IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS))

		return false;



	if (!vma->vm_file)

		return false;



	inode = file_inode(vma->vm_file);



	return !inode_is_open_for_write(inode) && S_ISREG(inode->i_mode);

}



unsigned long __thp_vma_allowable_orders(struct vm_area_struct *vma,

					 unsigned long vm_flags,

					 unsigned long tva_flags,