When merging anonymous page vma, if the size of vam can fit in at least
one hugepage, the mm will be registered for khugepaged for collapsing
THP in the future.
But, it skips shmem vma. Doing so for shmem too when merging vma in
order to increase the odd to collapse hugepage by khugepaged.
Also increase the count of shmem THP collapse. It looks missed before.
Signed-off-by: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Kirill A. Shutemov <kirill.shutemov@xxxxxxxxxxxxxxx>
Cc: Vlastimil Babka <vbabka@xxxxxxx>
---
mm/khugepaged.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/mm/khugepaged.c b/mm/khugepaged.c
index d7b2a4b..27f5ce2 100644
--- a/mm/khugepaged.c
+++ b/mm/khugepaged.c
@@ -440,8 +440,12 @@ int khugepaged_enter_vma_merge(struct vm_area_struct *vma,
* page fault if needed.
*/
return 0;
- if (vma->vm_ops || (vm_flags & VM_NO_KHUGEPAGED))
- /* khugepaged not yet working on file or special mappings */
+ if ((vma->vm_ops && !shmem_file(vma->vm_file)) ||
+ (vm_flags & VM_NO_KHUGEPAGED))
+ /*
+ * khugepaged not yet working on non-shmem file or special
+ * mappings
+ */
return 0;
hstart = (vma->vm_start + ~HPAGE_PMD_MASK) & HPAGE_PMD_MASK;
hend = vma->vm_end & HPAGE_PMD_MASK;
@@ -1517,6 +1521,8 @@ static void collapse_shmem(struct mm_struct *mm,
unlock_page(new_page);
*hpage = NULL;
+
+ khugepaged_pages_collapsed++;
} else {
/* Something went wrong: rollback changes to the radix-tree */
shmem_uncharge(mapping->host, nr_none);
--
1.8.3.1
