Skip to contentSkip to conversation

mm-khugepaged-clean-up-refcount-check-using-folio_expected_ref_count.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 1, 2025

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm/khugepaged: clean up refcount check using folio_expected_ref_count()
has been removed from the -mm tree. Its filename was
mm-khugepaged-clean-up-refcount-check-using-folio_expected_ref_count.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: Shivank Garg <[email protected]>
Subject: mm/khugepaged: clean up refcount check using folio_expected_ref_count()
Date: Mon, 26 May 2025 18:28:20 +0000

Use folio_expected_ref_count() instead of open-coded logic in is_refcount_suitable(). This avoids code duplication and improves clarity.

Drop is_refcount_suitable() as it is no longer needed.

---

 mm/khugepaged.c |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)
mm/khugepaged.c renamed from mm/khugepaged.c~mm-khugepaged-clean-up-refcount-check-using-folio_expected_ref_count +2 -15
@@ -548,19 +548,6 @@ static void release_pte_pages(pte_t *pte
 	}
 }
 
-static bool is_refcount_suitable(struct folio *folio)
-{
-	int expected_refcount = folio_mapcount(folio);
-
-	if (!folio_test_anon(folio) || folio_test_swapcache(folio))
-		expected_refcount += folio_nr_pages(folio);
-
-	if (folio_test_private(folio))
-		expected_refcount++;
-
-	return folio_ref_count(folio) == expected_refcount;
-}
-
 static int __collapse_huge_page_isolate(struct vm_area_struct *vma,
 					unsigned long address,
 					pte_t *pte,
@@ -652,7 +639,7 @@ static int __collapse_huge_page_isolate(
 		 * but not from this process. The other process cannot write to
 		 * the page, only trigger CoW.
 		 */
-		if (!is_refcount_suitable(folio)) {
+		if (folio_expected_ref_count(folio) != folio_ref_count(folio)) {
 			folio_unlock(folio);
 			result = SCAN_PAGE_COUNT;
 			goto out;
@@ -1402,7 +1389,7 @@ static int hpage_collapse_scan_pmd(struc
 		 * has excessive GUP pins (i.e. 512).  Anyway the same check
 		 * will be done again later the risk seems low.
 		 */
-		if (!is_refcount_suitable(folio)) {
+		if (folio_expected_ref_count(folio) != folio_ref_count(folio)) {
 			result = SCAN_PAGE_COUNT;
 			goto out_unmap;
 		}

_

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