Skip to content

Commit cfccd2e

Browse files
gormanmakpm00
authored andcommitted
mm, compaction: finish pageblocks on complete migration failure
Commit 7efc3b7 ("mm/compaction: fix set skip in fast_find_migrateblock") address an issue where a pageblock selected by fast_find_migrateblock() was ignored. Unfortunately, the same fix resulted in numerous reports of khugepaged or kcompactd stalling for long periods of time or consuming 100% of CPU. Tracing showed that there was a lot of rescanning between a small subset of pageblocks because the conditions for marking the block skip are not met. The scan is not reaching the end of the pageblock because enough pages were isolated but none were migrated successfully. Eventually it circles back to the same block. Pageblock skip tracking tries to minimise both latency and excessive scanning but tracking exactly when a block is fully scanned requires an excessive amount of state. This patch forcibly rescans a pageblock when all isolated pages fail to migrate even though it could be for transient reasons such as page writeback or page dirty. This will sometimes migrate too many pages but pageblocks will be marked skip and forward progress will be made. "Usemen" from the mmtests configuration workload-usemem-stress-numa-compact was used to stress compaction. The compaction trace events were recorded using a 6.2-rc5 kernel that includes commit 7efc3b7 and count of unique ranges were measured. The top 5 ranges were 3076 range=(0x10ca00-0x10cc00) 3076 range=(0x110a00-0x110c00) 3098 range=(0x13b600-0x13b800) 3104 range=(0x141c00-0x141e00) 11424 range=(0x11b600-0x11b800) While this workload is very different than what the bugs reported, the pattern of the same subset of blocks being repeatedly scanned is observed. At one point, *only* the range range=(0x11b600 ~ 0x11b800) was scanned for 2 seconds. 14 seconds passed between the first migration-related event and the last. With the series applied including this patch, the top 5 ranges were 1 range=(0x11607e-0x116200) 1 range=(0x116200-0x116278) 1 range=(0x116278-0x116400) 1 range=(0x116400-0x116424) 1 range=(0x116424-0x116600) Only unique ranges were scanned and the time between the first migration-related event was 0.11 milliseconds. Link: https://lkml.kernel.org/r/[email protected] Fixes: 7efc3b7 ("mm/compaction: fix set skip in fast_find_migrateblock") Signed-off-by: Mel Gorman <[email protected]> Cc: Chuyi Zhou <[email protected]> Cc: Jiri Slaby <[email protected]> Cc: Maxim Levitsky <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Paolo Bonzini <[email protected]> Cc: Pedro Falcato <[email protected]> Cc: Vlastimil Babka <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent f9d7fc1 commit cfccd2e

File tree

1 file changed

+22
-8
lines changed

1 file changed

+22
-8
lines changed

mm/compaction.c

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2392,6 +2392,7 @@ compact_zone(struct compact_control *cc, struct capture_control *capc)
23922392
cc->finish_pageblock = true;
23932393
}
23942394

2395+
rescan:
23952396
switch (isolate_migratepages(cc)) {
23962397
case ISOLATE_ABORT:
23972398
ret = COMPACT_CONTENDED;
@@ -2434,15 +2435,28 @@ compact_zone(struct compact_control *cc, struct capture_control *capc)
24342435
goto out;
24352436
}
24362437
/*
2437-
* We failed to migrate at least one page in the current
2438-
* order-aligned block, so skip the rest of it.
2438+
* If an ASYNC or SYNC_LIGHT fails to migrate a page
2439+
* within the current order-aligned block, scan the
2440+
* remainder of the pageblock. This will mark the
2441+
* pageblock "skip" to avoid rescanning in the near
2442+
* future. This will isolate more pages than necessary
2443+
* for the request but avoid loops due to
2444+
* fast_find_migrateblock revisiting blocks that were
2445+
* recently partially scanned.
24392446
*/
2440-
if (cc->direct_compaction &&
2441-
(cc->mode == MIGRATE_ASYNC)) {
2442-
cc->migrate_pfn = block_end_pfn(
2443-
cc->migrate_pfn - 1, cc->order);
2444-
/* Draining pcplists is useless in this case */
2445-
last_migrated_pfn = 0;
2447+
if (cc->direct_compaction && !cc->finish_pageblock &&
2448+
(cc->mode < MIGRATE_SYNC)) {
2449+
cc->finish_pageblock = true;
2450+
2451+
/*
2452+
* Draining pcplists does not help THP if
2453+
* any page failed to migrate. Even after
2454+
* drain, the pageblock will not be free.
2455+
*/
2456+
if (cc->order == COMPACTION_HPAGE_ORDER)
2457+
last_migrated_pfn = 0;
2458+
2459+
goto rescan;
24462460
}
24472461
}
24482462

0 commit comments

Comments
 (0)