Skip to content

Commit f0eea18

Browse files
yhuang-inteltorvalds
authored andcommitted
mm, THP, swap: don't allocate huge cluster for file backed swap device
It's hard to write a whole transparent huge page (THP) to a file backed swap device during swapping out and the file backed swap device isn't very popular. So the huge cluster allocation for the file backed swap device is disabled. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: "Huang, Ying" <[email protected]> Cc: Johannes Weiner <[email protected]> Cc: Minchan Kim <[email protected]> Cc: Hugh Dickins <[email protected]> Cc: Shaohua Li <[email protected]> Cc: Rik van Riel <[email protected]> Cc: "Kirill A . Shutemov" <[email protected]> Cc: Andrea Arcangeli <[email protected]> Cc: Dan Williams <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Michal Hocko <[email protected]> Cc: Ross Zwisler <[email protected]> [for brd.c, zram_drv.c, pmem.c] Cc: Vishal L Verma <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent ba3c4ce commit f0eea18

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

mm/swapfile.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -948,9 +948,10 @@ int get_swap_pages(int n_goal, bool cluster, swp_entry_t swp_entries[])
948948
spin_unlock(&si->lock);
949949
goto nextsi;
950950
}
951-
if (cluster)
952-
n_ret = swap_alloc_cluster(si, swp_entries);
953-
else
951+
if (cluster) {
952+
if (!(si->flags & SWP_FILE))
953+
n_ret = swap_alloc_cluster(si, swp_entries);
954+
} else
954955
n_ret = scan_swap_map_slots(si, SWAP_HAS_CACHE,
955956
n_goal, swp_entries);
956957
spin_unlock(&si->lock);

0 commit comments

Comments
 (0)