Skip to contentSkip to conversation

mm-thp-fix-collapse_files-try_to_unmapfolio.patch removed from -mm tree

merged Andrew Morton 1 participant 1 message Mar 1, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The patch titled
Subject: mm/thp: fix collapse_file()'s try_to_unmap(folio,)
has been removed from the -mm tree. Its filename was
mm-thp-fix-collapse_files-try_to_unmapfolio.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
From: Hugh Dickins <[email protected]>
Subject: mm/thp: fix collapse_file()'s try_to_unmap(folio,)

The foliation of THP collapse_file()'s call to try_to_unmap() is currently wrong, crashing on a test in rmap_walk() when xas_next() delivered a value (after which page has been loaded independently).

Fixes c3b522d9a698 ("mm/rmap: Convert try_to_unmap() to take a folio")
Cc Matthew Wilcox <[email protected]>

---

 mm/khugepaged.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
mm/khugepaged.c renamed from mm/khugepaged.c~mm-thp-fix-collapse_files-try_to_unmapfolio +2 -1
@@ -1835,7 +1835,8 @@ static void collapse_file(struct mm_stru
 		}
 
 		if (page_mapped(page))
-			try_to_unmap(folio, TTU_IGNORE_MLOCK | TTU_BATCH_FLUSH);
+			try_to_unmap(page_folio(page),
+				     TTU_IGNORE_MLOCK | TTU_BATCH_FLUSH);
 
 		xas_lock_irq(&xas);
 		xas_set(&xas, index);

_

Patches currently in -mm which might be from [email protected] are

memfd-fix-f_seal_write-after-shmem-huge-page-allocated.patch tmpfs-support-for-file-creation-time-fix.patch