khugepaged-reduce-race-probability-between-migration-and-khugepaged.patch removed from -mm tree
The quilt patch titled
Subject: khugepaged: reduce race probability between migration and khugepaged
has been removed from the -mm tree. Its filename was
khugepaged-reduce-race-probability-between-migration-and-khugepaged.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: Dev Jain <[email protected]>
Subject: khugepaged: reduce race probability between migration and khugepaged
Date: Fri, 4 Jul 2025 09:34:17 +0530
Suppose a folio is under migration, and khugepaged is also trying to collapse it. collapse_pte_mapped_thp() will retrieve the folio from the page cache via filemap_lock_folio(), thus taking a reference on the folio and sleeping on the folio lock, since the lock is held by the migration path. Migration will then fail in __folio_migrate_mapping -> folio_ref_freeze. Reduce the probability of such a race happening (leading to migration failure) by bailing out if we detect a PMD is marked with a migration entry.
This fixes the migration-shared-anon-thp testcase failure on Apple M3.
Note that, this is not a "fix" since it only reduces the chance of interference of khugepaged with migration, wherein both the kernel functionalities are deemed "best-effort".
---
mm/khugepaged.c | 8 ++++++++ 1 file changed, 8 insertions(+)
mm/khugepaged.c renamed from mm/khugepaged.c~khugepaged-reduce-race-probability-between-migration-and-khugepaged +8 -0
@@ -941,6 +941,14 @@ static inline int check_pmd_state(pmd_tif (pmd_none (pmde))return SCAN_PMD_NONE ; + +/* +* The folio may be under migration when khugepaged is trying to +* collapse it. Migration success or failure will eventually end +* up with a present PMD mapping a folio again. +*/ +if (is_pmd_migration_entry (pmde)) +return SCAN_PMD_MAPPED ;if (!pmd_present (pmde))return SCAN_PMD_NULL ;if (pmd_trans_huge (pmde))
_
Patches currently in -mm which might be from [email protected] are