Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8118b82e authored by Andrey Ryabinin's avatar Andrey Ryabinin Committed by Linus Torvalds
Browse files

mm/page_alloc.c: fix never set ALLOC_NOFRAGMENT flag 

Commit 0a79cdad ("mm: use alloc_flags to record if kswapd can wake")
removed setting of the ALLOC_NOFRAGMENT flag.  Bring it back.

The runtime effect is that ALLOC_NOFRAGMENT behaviour is restored so
that allocations are spread across local zones to avoid fragmentation
due to mixing pageblocks as long as possible.

Link: http://lkml.kernel.org/r/20190423120806.3503-2-aryabinin@virtuozzo.com


Fixes: 0a79cdad ("mm: use alloc_flags to record if kswapd can wake")
Signed-off-by: default avatarAndrey Ryabinin <aryabinin@virtuozzo.com>
Acked-by: default avatarMel Gorman <mgorman@techsingularity.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8139ad04

mm/page_alloc.c

+3 −3
Original line number Diff line number Diff line
@@ -3436,7 +3436,7 @@ alloc_flags_nofragment(struct zone *zone, gfp_t gfp_mask) 
		return alloc_flags;



	if (zone_idx(zone) != ZONE_NORMAL)

		goto out;

		return alloc_flags;



	/*

	 * If ZONE_DMA32 exists, assume it is the one after ZONE_NORMAL and
@@ -3445,9 +3445,9 @@ alloc_flags_nofragment(struct zone *zone, gfp_t gfp_mask) 
	 */

	BUILD_BUG_ON(ZONE_NORMAL - ZONE_DMA32 != 1);

	if (nr_online_nodes > 1 && !populated_zone(--zone))

		goto out;

		return alloc_flags;



out:

	alloc_flags |= ALLOC_NOFRAGMENT;

#endif /* CONFIG_ZONE_DMA32 */

	return alloc_flags;

}