Commit 77f1fe6b authored by Mel Gorman's avatar Mel Gorman Committed by Linus Torvalds
Browse files

mm: migration: allow migration to operate asynchronously and avoid synchronous... 


mm: migration: allow migration to operate asynchronously and avoid synchronous compaction in the faster path

Migration synchronously waits for writeback if the initial passes fails.
Callers of memory compaction do not necessarily want this behaviour if the
caller is latency sensitive or expects that synchronous migration is not
going to have a significantly better success rate.

This patch adds a sync parameter to migrate_pages() allowing the caller to
indicate if wait_on_page_writeback() is allowed within migration or not.
For reclaim/compaction, try_to_compact_pages() is first called
asynchronously, direct reclaim runs and then try_to_compact_pages() is
called synchronously as there is a greater expectation that it'll succeed.

[akpm@linux-foundation.org: build/merge fix]
Signed-off-by: default avatarMel Gorman <mel@csn.ul.ie>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Rik van Riel <riel@redhat.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3e7d3449

include/linux/compaction.h

+6 −4
Original line number Diff line number Diff line
@@ -21,10 +21,11 @@ extern int sysctl_extfrag_handler(struct ctl_table *table, int write, 


extern int fragmentation_index(struct zone *zone, unsigned int order);

extern unsigned long try_to_compact_pages(struct zonelist *zonelist,

			int order, gfp_t gfp_mask, nodemask_t *mask);

			int order, gfp_t gfp_mask, nodemask_t *mask,

			bool sync);

extern unsigned long compaction_suitable(struct zone *zone, int order);

extern unsigned long compact_zone_order(struct zone *zone, int order,

						gfp_t gfp_mask);

						gfp_t gfp_mask, bool sync);



/* Do not skip compaction more than 64 times */

#define COMPACT_MAX_DEFER_SHIFT 6
@@ -57,7 +58,8 @@ static inline bool compaction_deferred(struct zone *zone) 


#else

static inline unsigned long try_to_compact_pages(struct zonelist *zonelist,

			int order, gfp_t gfp_mask, nodemask_t *nodemask)

			int order, gfp_t gfp_mask, nodemask_t *nodemask,

			bool sync)

{

	return COMPACT_CONTINUE;

}
@@ -68,7 +70,7 @@ static inline unsigned long compaction_suitable(struct zone *zone, int order) 
}



static inline unsigned long compact_zone_order(struct zone *zone, int order,

						gfp_t gfp_mask)

						gfp_t gfp_mask, bool sync)

{

	return 0;

}

include/linux/migrate.h

+8 −4
Original line number Diff line number Diff line
@@ -13,9 +13,11 @@ extern void putback_lru_pages(struct list_head *l); 
extern int migrate_page(struct address_space *,

			struct page *, struct page *);

extern int migrate_pages(struct list_head *l, new_page_t x,

			unsigned long private, int offlining);

			unsigned long private, int offlining,

			bool sync);

extern int migrate_huge_pages(struct list_head *l, new_page_t x,

			unsigned long private, int offlining);

			unsigned long private, int offlining,

			bool sync);



extern int fail_migrate_page(struct address_space *,

			struct page *, struct page *);
@@ -33,9 +35,11 @@ extern int migrate_huge_page_move_mapping(struct address_space *mapping, 


static inline void putback_lru_pages(struct list_head *l) {}

static inline int migrate_pages(struct list_head *l, new_page_t x,

		unsigned long private, int offlining) { return -ENOSYS; }

		unsigned long private, int offlining,

		bool sync) { return -ENOSYS; }

static inline int migrate_huge_pages(struct list_head *l, new_page_t x,

		unsigned long private, int offlining) { return -ENOSYS; }

		unsigned long private, int offlining,

		bool sync) { return -ENOSYS; }



static inline int migrate_prep(void) { return -ENOSYS; }

static inline int migrate_prep_local(void) { return -ENOSYS; }

mm/compaction.c

+10 −4
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ struct compact_control { 
	unsigned long nr_migratepages;	/* Number of pages to migrate */

	unsigned long free_pfn;		/* isolate_freepages search base */

	unsigned long migrate_pfn;	/* isolate_migratepages search base */

	bool sync;			/* Synchronous migration */



	/* Account for isolated anon and file pages */

	unsigned long nr_anon;
@@ -455,7 +456,8 @@ static int compact_zone(struct zone *zone, struct compact_control *cc) 


		nr_migrate = cc->nr_migratepages;

		migrate_pages(&cc->migratepages, compaction_alloc,

						(unsigned long)cc, 0);

				(unsigned long)cc, 0,

				cc->sync);

		update_nr_listpages(cc);

		nr_remaining = cc->nr_migratepages;
@@ -482,7 +484,8 @@ static int compact_zone(struct zone *zone, struct compact_control *cc) 
}



unsigned long compact_zone_order(struct zone *zone,

						int order, gfp_t gfp_mask)

						int order, gfp_t gfp_mask,

						bool sync)

{

	struct compact_control cc = {

		.nr_freepages = 0,
@@ -490,6 +493,7 @@ unsigned long compact_zone_order(struct zone *zone, 
		.order = order,

		.migratetype = allocflags_to_migratetype(gfp_mask),

		.zone = zone,

		.sync = sync,

	};

	INIT_LIST_HEAD(&cc.freepages);

	INIT_LIST_HEAD(&cc.migratepages);
@@ -505,11 +509,13 @@ int sysctl_extfrag_threshold = 500; 
 * @order: The order of the current allocation

 * @gfp_mask: The GFP mask of the current allocation

 * @nodemask: The allowed nodes to allocate from

 * @sync: Whether migration is synchronous or not

 *

 * This is the main entry point for direct page compaction.

 */

unsigned long try_to_compact_pages(struct zonelist *zonelist,

			int order, gfp_t gfp_mask, nodemask_t *nodemask)

			int order, gfp_t gfp_mask, nodemask_t *nodemask,

			bool sync)

{

	enum zone_type high_zoneidx = gfp_zone(gfp_mask);

	int may_enter_fs = gfp_mask & __GFP_FS;
@@ -533,7 +539,7 @@ unsigned long try_to_compact_pages(struct zonelist *zonelist, 
								nodemask) {

		int status;



		status = compact_zone_order(zone, order, gfp_mask);

		status = compact_zone_order(zone, order, gfp_mask, sync);

		rc = max(status, rc);



		/* If a normal allocation would succeed, stop compacting */

mm/memory-failure.c

+5 −3
Original line number Diff line number Diff line
@@ -1290,7 +1290,8 @@ static int soft_offline_huge_page(struct page *page, int flags) 
	/* Keep page count to indicate a given hugepage is isolated. */



	list_add(&hpage->lru, &pagelist);

	ret = migrate_huge_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, 0);

	ret = migrate_huge_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, 0,

				true);

	if (ret) {

		putback_lru_pages(&pagelist);

		pr_debug("soft offline: %#lx: migration failed %d, type %lx\n",
@@ -1413,7 +1414,8 @@ int soft_offline_page(struct page *page, int flags) 
		LIST_HEAD(pagelist);



		list_add(&page->lru, &pagelist);

		ret = migrate_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL, 0);

		ret = migrate_pages(&pagelist, new_page, MPOL_MF_MOVE_ALL,

								0, true);

		if (ret) {

			pr_info("soft offline: %#lx: migration failed %d, type %lx\n",

				pfn, ret, page->flags);

mm/memory_hotplug.c

+2 −1
Original line number Diff line number Diff line
@@ -733,7 +733,8 @@ do_migrate_range(unsigned long start_pfn, unsigned long end_pfn) 
			goto out;

		}

		/* this function returns # of failed pages */

		ret = migrate_pages(&source, hotremove_migrate_alloc, 0, 1);

		ret = migrate_pages(&source, hotremove_migrate_alloc, 0,

								1, true);

		if (ret)

			putback_lru_pages(&source);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE