Skip to content

Commit b2eef8c

Browse files
aagittorvalds
authored andcommitted
mm: compaction: minimise the time IRQs are disabled while isolating pages for migration
compaction_alloc() isolates pages for migration in isolate_migratepages. While it's scanning, IRQs are disabled on the mistaken assumption the scanning should be short. Tests show this to be true for the most part but contention times on the LRU lock can be increased. Before this patch, the IRQ disabled times for a simple test looked like Total sampled time IRQs off (not real total time): 5493 Event shrink_inactive_list..shrink_zone 1596 us count 1 Event shrink_inactive_list..shrink_zone 1530 us count 1 Event shrink_inactive_list..shrink_zone 956 us count 1 Event shrink_inactive_list..shrink_zone 541 us count 1 Event shrink_inactive_list..shrink_zone 531 us count 1 Event split_huge_page..add_to_swap 232 us count 1 Event save_args..call_softirq 36 us count 1 Event save_args..call_softirq 35 us count 2 Event __wake_up..__wake_up 1 us count 1 This patch reduces the worst-case IRQs-disabled latencies by releasing the lock every SWAP_CLUSTER_MAX pages that are scanned and releasing the CPU if necessary. The cost of this is that the processing performing compaction will be slower but IRQs being disabled for too long a time has worse consequences as the following report shows; Total sampled time IRQs off (not real total time): 4367 Event shrink_inactive_list..shrink_zone 881 us count 1 Event shrink_inactive_list..shrink_zone 875 us count 1 Event shrink_inactive_list..shrink_zone 868 us count 1 Event shrink_inactive_list..shrink_zone 555 us count 1 Event split_huge_page..add_to_swap 495 us count 1 Event compact_zone..compact_zone_order 269 us count 1 Event split_huge_page..add_to_swap 266 us count 1 Event shrink_inactive_list..shrink_zone 85 us count 1 Event save_args..call_softirq 36 us count 2 Event __wake_up..__wake_up 1 us count 1 [[email protected]: simplify with s/unlocked/locked/] Signed-off-by: Andrea Arcangeli <[email protected]> Signed-off-by: Mel Gorman <[email protected]> Cc: Johannes Weiner <[email protected]> Cc: Arthur Marsh <[email protected]> Cc: Clemens Ladisch <[email protected]> Cc: KAMEZAWA Hiroyuki <[email protected]> Cc: Minchan Kim <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 602605a commit b2eef8c

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

mm/compaction.c

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,9 +277,27 @@ static unsigned long isolate_migratepages(struct zone *zone,
277277
}
278278

279279
/* Time to isolate some pages for migration */
280+
cond_resched();
280281
spin_lock_irq(&zone->lru_lock);
281282
for (; low_pfn < end_pfn; low_pfn++) {
282283
struct page *page;
284+
bool locked = true;
285+
286+
/* give a chance to irqs before checking need_resched() */
287+
if (!((low_pfn+1) % SWAP_CLUSTER_MAX)) {
288+
spin_unlock_irq(&zone->lru_lock);
289+
locked = false;
290+
}
291+
if (need_resched() || spin_is_contended(&zone->lru_lock)) {
292+
if (locked)
293+
spin_unlock_irq(&zone->lru_lock);
294+
cond_resched();
295+
spin_lock_irq(&zone->lru_lock);
296+
if (fatal_signal_pending(current))
297+
break;
298+
} else if (!locked)
299+
spin_lock_irq(&zone->lru_lock);
300+
283301
if (!pfn_valid_within(low_pfn))
284302
continue;
285303
nr_scanned++;

0 commit comments

Comments
 (0)