Commit c6a140bf authored by Andrea Arcangeli's avatar Andrea Arcangeli Committed by Linus Torvalds

mm/compaction: reverse the change that forbade sync migraton with __GFP_NO_KSWAPD

It's uncertain this has been beneficial, so it's safer to undo it.  All
other compaction users would still go in synchronous mode if a first
attempt at async compaction failed.  Hopefully we don't need to force
special behavior for THP (which is the only __GFP_NO_KSWAPD user so far
and it's the easier to exercise and to be noticeable).  This also make
__GFP_NO_KSWAPD return to its original strict semantics specific to bypass
kswapd, as THP allocations have khugepaged for the async THP
allocations/compactions.
Signed-off-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
Cc: Alex Villacis Lasso <avillaci@fiec.espol.edu.ec>
Cc: Mel Gorman <mel@csn.ul.ie>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a6cccdc3
......@@ -2107,7 +2107,7 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order,
sync_migration);
if (page)
goto got_pg;
sync_migration = !(gfp_mask & __GFP_NO_KSWAPD);
sync_migration = true;
/* Try direct reclaim and then allocating */
page = __alloc_pages_direct_reclaim(gfp_mask, order,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment