Skip to content

Commit 7717fc1

Browse files
Longlong Xiaakpm00
authored andcommitted
mm/swapfile: add cond_resched() in get_swap_pages()
The softlockup still occurs in get_swap_pages() under memory pressure. 64 CPU cores, 64GB memory, and 28 zram devices, the disksize of each zram device is 50MB with same priority as si. Use the stress-ng tool to increase memory pressure, causing the system to oom frequently. The plist_for_each_entry_safe() loops in get_swap_pages() could reach tens of thousands of times to find available space (extreme case: cond_resched() is not called in scan_swap_map_slots()). Let's add cond_resched() into get_swap_pages() when failed to find available space to avoid softlockup. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Longlong Xia <[email protected]> Reviewed-by: "Huang, Ying" <[email protected]> Cc: Chen Wandun <[email protected]> Cc: Huang Ying <[email protected]> Cc: Kefeng Wang <[email protected]> Cc: Nanyong Sun <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 993f57e commit 7717fc1

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

mm/swapfile.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1100,6 +1100,7 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entries[], int entry_size)
11001100
goto check_out;
11011101
pr_debug("scan_swap_map of si %d failed to find offset\n",
11021102
si->type);
1103+
cond_resched();
11031104

11041105
spin_lock(&swap_avail_lock);
11051106
nextsi:

0 commit comments

Comments
 (0)