Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-17 13:58:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm: thp: only regular file could be THP eligible

Browse Source 
Since commit a4aeaa06d45e ("mm: khugepaged: skip huge page collapse for
special files"), khugepaged just collapses THP for regular file which is
the intended usecase for readonly fs THP.  Only show regular file as THP
eligible accordingly.

And make file_thp_enabled() available for khugepaged too in order to
remove duplicate code.

Link: https://lkml.kernel.org/r/20220510203222.24246-5-shy828301@gmail.com
Signed-off-by: Yang Shi <shy828301@gmail.com>
Acked-by: Song Liu <song@kernel.org>
Acked-by: Vlastmil Babka <vbabka@suse.cz>
Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Miaohe Lin <linmiaohe@huawei.com>
Cc: Rik van Riel <riel@surriel.com>
Cc: Song Liu <songliubraving@fb.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Zi Yan <ziy@nvidia.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Yang Shi 2022-05-19 14:08:49 -07:00 committed by akpm
parent 52b52bf15b
commit 78d12c19e0
3 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/linux/huge_mm.h
View File

@ -173,6 +173,20 @@ static inline bool __transparent_hugepage_enabled(struct vm_area_struct *vma)
return false; return false;
} }
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)) &&
(vma->vm_flags & VM_EXEC) &&
!inode_is_open_for_write(inode) && S_ISREG(inode->i_mode);
}
bool transparent_hugepage_active(struct vm_area_struct *vma); bool transparent_hugepage_active(struct vm_area_struct *vma);
#define transparent_hugepage_use_zero_page() \ #define transparent_hugepage_use_zero_page() \

11
mm/huge_memory.c
View File

@ -69,13 +69,6 @@ static atomic_t huge_zero_refcount;
struct page *huge_zero_page __read_mostly; struct page *huge_zero_page __read_mostly;
unsigned long huge_zero_pfn __read_mostly = ~0UL; unsigned long huge_zero_pfn __read_mostly = ~0UL;
static inline bool file_thp_enabled(struct vm_area_struct *vma)
{
return transhuge_vma_enabled(vma, vma->vm_flags) && vma->vm_file &&
!inode_is_open_for_write(vma->vm_file->f_inode) &&
(vma->vm_flags & VM_EXEC);
}
bool transparent_hugepage_active(struct vm_area_struct *vma) bool transparent_hugepage_active(struct vm_area_struct *vma)
{ {
/* The addr is used to check if the vma size fits */ /* The addr is used to check if the vma size fits */
@ -87,8 +80,8 @@ bool transparent_hugepage_active(struct vm_area_struct *vma)
return __transparent_hugepage_enabled(vma); return __transparent_hugepage_enabled(vma);
if (vma_is_shmem(vma)) if (vma_is_shmem(vma))
return shmem_huge_enabled(vma); return shmem_huge_enabled(vma);
if (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS)) if (transhuge_vma_enabled(vma, vma->vm_flags) && file_thp_enabled(vma))
return file_thp_enabled(vma); return true;
return false; return false;
} }

9
mm/khugepaged.c
View File

@ -464,13 +464,8 @@ static bool hugepage_vma_check(struct vm_area_struct *vma,
return false; return false;
/* Only regular file is valid */ /* Only regular file is valid */
if (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) && vma->vm_file && if (file_thp_enabled(vma))
(vm_flags & VM_EXEC)) { return true;
struct inode *inode = vma->vm_file->f_inode;
return !inode_is_open_for_write(inode) &&
S_ISREG(inode->i_mode);
}
if (!vma->anon_vma || !vma_is_anonymous(vma)) if (!vma->anon_vma || !vma_is_anonymous(vma))
return false; return false;