mm-khugepaged-support-shmem-mthp-collapse.patch removed from -mm tree
The quilt patch titled
Subject: mm: khugepaged: support shmem mTHP collapse
has been removed from the -mm tree. Its filename was
mm-khugepaged-support-shmem-mthp-collapse.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Baolin Wang <[email protected]>
Subject: mm: khugepaged: support shmem mTHP collapse
Date: Tue, 20 Aug 2024 17:49:16 +0800
Shmem already supports the allocation of mTHP, but khugepaged does not yet support collapsing mTHP folios. Now khugepaged is ready to support mTHP, and this patch enables the collapse of shmem mTHP.
---
mm/khugepaged.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-)
mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-support-shmem-mthp-collapse +11 -17
@@ -1843,7 +1843,7 @@ static int collapse_file(struct mm_struc } }while (1 ); -for (index = start; index < end; index++) { +for (index = start; index < end;) {xas_set (&xas, index); folio =xas_load (&xas);
@@ -1862,6 +1862,7 @@ static int collapse_file(struct mm_struc } } nr_none++; + index++;continue ; }
@@ -1943,12 +1944,10 @@ static int collapse_file(struct mm_struc* we locked the first folio, then a THP might be there already. * This will be discovered on the first iteration. */ -if (folio_test_large (folio)) { - result =folio_order (folio) ==HPAGE_PMD_ORDER && - folio->index == start -/* Maybe PMD-mapped */ - ?SCAN_PTE_MAPPED_HUGEPAGE - :SCAN_PAGE_COMPOUND ; +if (folio_order (folio) ==HPAGE_PMD_ORDER && + folio->index == start) { +/* Maybe PMD-mapped */ + result =SCAN_PTE_MAPPED_HUGEPAGE ; goto out_unlock; }
@@ -2009,6 +2008,7 @@ static int collapse_file(struct mm_struc* Accumulate the folios that are being collapsed. */ list_add_tail (&folio->lru, &pagelist); + index +=folio_nr_pages (folio);continue ; out_unlock:folio_unlock (folio);
@@ -2261,16 +2261,10 @@ static int hpage_collapse_scan_file(strucontinue ; } -/* -* TODO: khugepaged should compact smaller compound pages -* into a PMD sized page -*/ -if (folio_test_large (folio)) { - result =folio_order (folio) ==HPAGE_PMD_ORDER && - folio->index == start -/* Maybe PMD-mapped */ - ?SCAN_PTE_MAPPED_HUGEPAGE - :SCAN_PAGE_COMPOUND ; +if (folio_order (folio) ==HPAGE_PMD_ORDER && + folio->index == start) { +/* Maybe PMD-mapped */ + result =SCAN_PTE_MAPPED_HUGEPAGE ;/* * For SCAN_PTE_MAPPED_HUGEPAGE, further processing * by the caller won't touch the page cache, and so
_
Patches currently in -mm which might be from [email protected] are