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

Commit 6d4a4916 authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Marek Szyprowski
Browse files

mm: page_alloc: change fallbacks array handling 



This commit adds a row for MIGRATE_ISOLATE type to the fallbacks array
which was missing from it.  It also, changes the array traversal logic
a little making MIGRATE_RESERVE an end marker.  The letter change,
removes the implicit MIGRATE_UNMOVABLE from the end of each row which
was read by __rmqueue_fallback() function.

Signed-off-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Signed-off-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
Reviewed-by: default avatarKAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Tested-by: default avatarRob Clark <rob.clark@linaro.org>
Tested-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
Tested-by: default avatarBenjamin Gaignard <benjamin.gaignard@linaro.org>
Tested-by: default avatarRobert Nelson <robertcnelson@gmail.com>
Tested-by: default avatarBarry Song <Baohua.Song@csr.com>
parent 041d3a8c

mm/page_alloc.c

+5 −4
Original line number Diff line number Diff line
@@ -875,11 +875,12 @@ struct page *__rmqueue_smallest(struct zone *zone, unsigned int order, 
 * This array describes the order lists are fallen back to when

 * the free lists for the desirable migrate type are depleted

 */

static int fallbacks[MIGRATE_TYPES][MIGRATE_TYPES-1] = {

static int fallbacks[MIGRATE_TYPES][3] = {

	[MIGRATE_UNMOVABLE]   = { MIGRATE_RECLAIMABLE, MIGRATE_MOVABLE,   MIGRATE_RESERVE },

	[MIGRATE_RECLAIMABLE] = { MIGRATE_UNMOVABLE,   MIGRATE_MOVABLE,   MIGRATE_RESERVE },

	[MIGRATE_MOVABLE]     = { MIGRATE_RECLAIMABLE, MIGRATE_UNMOVABLE, MIGRATE_RESERVE },

	[MIGRATE_RESERVE]     = { MIGRATE_RESERVE,     MIGRATE_RESERVE,   MIGRATE_RESERVE }, /* Never used */

	[MIGRATE_RESERVE]     = { MIGRATE_RESERVE }, /* Never used */

	[MIGRATE_ISOLATE]     = { MIGRATE_RESERVE }, /* Never used */

};



/*
@@ -974,12 +975,12 @@ __rmqueue_fallback(struct zone *zone, int order, int start_migratetype) 
	/* Find the largest possible block of pages in the other list */

	for (current_order = MAX_ORDER-1; current_order >= order;

						--current_order) {

		for (i = 0; i < MIGRATE_TYPES - 1; i++) {

		for (i = 0;; i++) {

			migratetype = fallbacks[start_migratetype][i];



			/* MIGRATE_RESERVE handled later if necessary */

			if (migratetype == MIGRATE_RESERVE)

				continue;

				break;



			area = &(zone->free_area[current_order]);

			if (list_empty(&area->free_list[migratetype]))