Commit f33261d7 authored Jan 25, 2011 by David Rientjes Committed by Linus Torvalds Jan 26, 2011

mm: fix deferred congestion timeout if preferred zone is not allowed



Before 0e093d99 ("writeback: do not sleep on the congestion queue if
there are no congested BDIs or if significant congestion is not being
encountered in the current zone"), preferred_zone was only used for NUMA
statistics, to determine the zoneidx from which to allocate from given
the type requested, and whether to utilize memory compaction.

wait_iff_congested(), though, uses preferred_zone to determine if the
congestion wait should be deferred because its dirty pages are backed by
a congested bdi.  This incorrectly defers the timeout and busy loops in
the page allocator with various cond_resched() calls if preferred_zone
is not allowed in the current context, usually consuming 100% of a cpu.

This patch ensures preferred_zone is an allowed zone in the fastpath
depending on whether current is constrained by its cpuset or nodes in
its mempolicy (when the nodemask passed is non-NULL).  This is correct
since the fastpath allocation always passes ALLOC_CPUSET when trying to
allocate memory.  In the slowpath, this patch resets preferred_zone to
the first zone of the allowed type when the allocation is not
constrained by current's cpuset, i.e.  it does not pass ALLOC_CPUSET.

This patch also ensures preferred_zone is from the set of allowed nodes
when called from within direct reclaim since allocations are always
constrained by cpusets in this context (it is blockable).

Both of these uses of cpuset_current_mems_allowed are protected by
get_mems_allowed().

Signed-off-by: David Rientjes <rientjes@google.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Minchan Kim <minchan.kim@gmail.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Acked-by: Rik van Riel <riel@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 4f542e3d

mm/page_alloc.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -2034,6 +2034,14 @@ restart:
		*/
		alloc_flags = gfp_to_alloc_flags(gfp_mask);

		/*
		* Find the true preferred zone if the allocation is unconstrained by
		* cpusets.
		*/
		if (!(alloc_flags & ALLOC_CPUSET) && !nodemask)
		first_zones_zonelist(zonelist, high_zoneidx, NULL,
		&preferred_zone);

		/* This is the last chance, in general, before the goto nopage. */
		page = get_page_from_freelist(gfp_mask, nodemask, order, zonelist,
		high_zoneidx, alloc_flags & ~ALLOC_NO_WATERMARKS,
		@@ -2192,7 +2200,9 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,

		get_mems_allowed();
		/* The preferred zone is used for statistics later */
		first_zones_zonelist(zonelist, high_zoneidx, nodemask, &preferred_zone);
		first_zones_zonelist(zonelist, high_zoneidx,
		nodemask ? : &cpuset_current_mems_allowed,
		&preferred_zone);
		if (!preferred_zone) {
		put_mems_allowed();
		return NULL;

mm/vmscan.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2083,7 +2083,8 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,
		struct zone *preferred_zone;

		first_zones_zonelist(zonelist, gfp_zone(sc->gfp_mask),
		NULL, &preferred_zone);
		&cpuset_current_mems_allowed,
		&preferred_zone);
		wait_iff_congested(preferred_zone, BLK_RW_ASYNC, HZ/10);
		}
		}

Admin message