Commit 5bead2a0 authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

mm: mark the correct zone as full when scanning zonelists 



The iterator for_each_zone_zonelist() uses a struct zoneref *z cursor when
scanning zonelists to keep track of where in the zonelist it is.  The
zoneref that is returned corresponds to the the next zone that is to be
scanned, not the current one.  It was intended to be treated as an opaque
list.

When the page allocator is scanning a zonelist, it marks elements in the
zonelist corresponding to zones that are temporarily full.  As the
zonelist is being updated, it uses the cursor here;

  if (NUMA_BUILD)
        zlc_mark_zone_full(zonelist, z);

This is intended to prevent rescanning in the near future but the zoneref
cursor does not correspond to the zone that has been found to be full.
This is an easy misunderstanding to make so this patch corrects the
problem by changing zoneref cursor to be the current zone being scanned
instead of the next one.

Signed-off-by: default avatarMel Gorman <mel@csn.ul.ie>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: <stable@kernel.org>		[2.6.26.x]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7e964455

include/linux/mmzone.h

+6 −6
Original line number Original line Diff line number Diff line
@@ -751,8 +751,9 @@ static inline int zonelist_node_idx(struct zoneref *zoneref) 
 *

 *

 * This function returns the next zone at or below a given zone index that is

 * This function returns the next zone at or below a given zone index that is

 * within the allowed nodemask using a cursor as the starting point for the

 * within the allowed nodemask using a cursor as the starting point for the

 * search. The zoneref returned is a cursor that is used as the next starting

 * search. The zoneref returned is a cursor that represents the current zone

 * point for future calls to next_zones_zonelist().

 * being examined. It should be advanced by one before calling

 * next_zones_zonelist again.

 */

 */

struct zoneref *next_zones_zonelist(struct zoneref *z,

struct zoneref *next_zones_zonelist(struct zoneref *z,

					enum zone_type highest_zoneidx,

					enum zone_type highest_zoneidx,
@@ -768,9 +769,8 @@ struct zoneref *next_zones_zonelist(struct zoneref *z, 
 *

 *

 * This function returns the first zone at or below a given zone index that is

 * This function returns the first zone at or below a given zone index that is

 * within the allowed nodemask. The zoneref returned is a cursor that can be

 * within the allowed nodemask. The zoneref returned is a cursor that can be

 * used to iterate the zonelist with next_zones_zonelist. The cursor should

 * used to iterate the zonelist with next_zones_zonelist by advancing it by

 * not be used by the caller as it does not match the value of the zone

 * one before calling.

 * returned.

 */

 */

static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist,

static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist,

					enum zone_type highest_zoneidx,

					enum zone_type highest_zoneidx,
@@ -795,7 +795,7 @@ static inline struct zoneref *first_zones_zonelist(struct zonelist *zonelist, 
#define for_each_zone_zonelist_nodemask(zone, z, zlist, highidx, nodemask) \

#define for_each_zone_zonelist_nodemask(zone, z, zlist, highidx, nodemask) \

	for (z = first_zones_zonelist(zlist, highidx, nodemask, &zone);	\

	for (z = first_zones_zonelist(zlist, highidx, nodemask, &zone);	\

		zone;							\

		zone;							\

		z = next_zones_zonelist(z, highidx, nodemask, &zone))	\

		z = next_zones_zonelist(++z, highidx, nodemask, &zone))	\





/**

/**

 * for_each_zone_zonelist - helper macro to iterate over valid zones in a zonelist at or below a given zone index

 * for_each_zone_zonelist - helper macro to iterate over valid zones in a zonelist at or below a given zone index

mm/mmzone.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -69,6 +69,6 @@ struct zoneref *next_zones_zonelist(struct zoneref *z, 
				(z->zone && !zref_in_nodemask(z, nodes)))

				(z->zone && !zref_in_nodemask(z, nodes)))

			z++;

			z++;





	*zone = zonelist_zone(z++);

	*zone = zonelist_zone(z);

	return z;

	return z;

}
 
}

CRA Git | Maintained and supported by SUSTech CRA and CCSE