The patch titled
Subject: mm-khugepaged-skip-huge-page-collapse-for-special-files-fix
has been removed from the -mm tree. Its filename was
mm-khugepaged-skip-huge-page-collapse-for-special-files-fix.patch
This patch was dropped because it was folded into mm-khugepaged-skip-huge-page-collapse-for-special-files.patch
------------------------------------------------------
From: Yang Shi <shy828301@xxxxxxxxx>
Subject: mm-khugepaged-skip-huge-page-collapse-for-special-files-fix
fix vm_file check
Link: https://lkml.kernel.org/r/CAHbLzkqTW9U3VvTu1Ki5v_cLRC9gHW+znBukg_ycergE0JWj-A@xxxxxxxxxxxxxx
Cc: Andrea Righi <andrea.righi@xxxxxxxxxxxxx>
Cc: Hao Sun <sunhao.th@xxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Matthew Wilcox <willy@xxxxxxxxxxxxx>
Cc: Song Liu <songliubraving@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/khugepaged.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- a/mm/khugepaged.c~mm-khugepaged-skip-huge-page-collapse-for-special-files-fix
+++ a/mm/khugepaged.c
@@ -445,9 +445,9 @@ static bool hugepage_vma_check(struct vm
if (!transhuge_vma_enabled(vma, vm_flags))
return false;
- if (vma->vm_file)
- return IS_ALIGNED((vma->vm_start >> PAGE_SHIFT) - vma->vm_pgoff,
- HPAGE_PMD_NR);
+ if (vma->vm_file && !IS_ALIGNED((vma->vm_start >> PAGE_SHIFT) -
+ vma->vm_pgoff, HPAGE_PMD_NR))
+ return false;
/* Enabled via shmem mount options or sysfs settings. */
if (shmem_file(vma->vm_file))
_
Patches currently in -mm which might be from shy828301@xxxxxxxxx are
mm-hwpoison-remove-the-unnecessary-thp-check.patch
mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault.patch
mm-khugepaged-skip-huge-page-collapse-for-special-files.patch
mm-filemap-coding-style-cleanup-for-filemap_map_pmd.patch
mm-hwpoison-refactor-refcount-check-handling.patch
mm-shmem-dont-truncate-page-if-memory-failure-happens.patch
mm-hwpoison-handle-non-anonymous-thp-correctly.patch
mm-migrate-make-demotion-knob-depend-on-migration.patch
