The patch titled
Subject: mm: support MIGRATE_DISCARD
has been removed from the -mm tree. Its filename was
mm-support-migrate_discard.patch
This patch was dropped because it had testing failures
------------------------------------------------------
From: Minchan Kim <minchan@xxxxxxxxxx>
Subject: mm: support MIGRATE_DISCARD
Introduce MIGRATE_DISCARD mode in migration. It drops *clean cache pages*
instead of migration so that migration latency could be reduced by
avoiding (memcpy + page remapping). It's useful for CMA because latency
of migration is very important rather than eviction of background
processes's workingset. In addition, it needs less free pages for
migration targets so it could avoid memory reclaiming to get free pages,
which is another factor increase latency.
[akpm@xxxxxxxxxxxxxxxxxxxx: whitespace fixlet]
Signed-off-by: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
Cc: Michal Nazarewicz <mina86@xxxxxxxxxx>
Cc: Rik van Riel <riel@xxxxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/migrate_mode.h | 7 +++++
mm/migrate.c | 41 ++++++++++++++++++++++++++++++---
mm/page_alloc.c | 2 -
3 files changed, 46 insertions(+), 4 deletions(-)
diff -puN include/linux/migrate_mode.h~mm-support-migrate_discard include/linux/migrate_mode.h
--- a/include/linux/migrate_mode.h~mm-support-migrate_discard
+++ a/include/linux/migrate_mode.h
@@ -14,6 +14,13 @@
*/
#define MIGRATE_SYNC ((__force migrate_mode_t)0x4)
+/*
+ * MIGRTATE_DISCARD will discard clean cache page instead of migration.
+ * MIGRATE_ASYNC, MIGRATE_SYNC_LIGHT, MIGRATE_SYNC shouldn't be used
+ * together with OR flag in current implementation.
+ */
+#define MIGRATE_DISCARD ((__force migrate_mode_t)0x8)
+
typedef unsigned __bitwise__ migrate_mode_t;
#endif /* MIGRATE_MODE_H_INCLUDED */
diff -puN mm/migrate.c~mm-support-migrate_discard mm/migrate.c
--- a/mm/migrate.c~mm-support-migrate_discard
+++ a/mm/migrate.c
@@ -678,6 +678,19 @@ static int move_to_new_page(struct page
return rc;
}
+static int discard_page(struct page *page)
+{
+ int ret = -EAGAIN;
+ struct address_space *mapping = page_mapping(page);
+
+ if (page_has_private(page))
+ if (!try_to_release_page(page, GFP_KERNEL))
+ return ret;
+ if (remove_mapping(mapping, page))
+ ret = 0;
+ return ret;
+}
+
static int __unmap_and_move(struct page *page, struct page *newpage,
int force, bool offlining, migrate_mode_t mode)
{
@@ -685,6 +698,9 @@ static int __unmap_and_move(struct page
int remap_swapcache = 1;
struct mem_cgroup *mem;
struct anon_vma *anon_vma = NULL;
+ enum ttu_flags ttu_flags;
+ bool discard_mode = false;
+ bool file = false;
if (!trylock_page(page)) {
if (!force || (mode & MIGRATE_ASYNC))
@@ -799,12 +815,31 @@ static int __unmap_and_move(struct page
goto skip_unmap;
}
+ file = page_is_file_cache(page);
+ ttu_flags = TTU_IGNORE_ACCESS;
+retry:
+ if (!(mode & MIGRATE_DISCARD) || !file || PageDirty(page))
+ ttu_flags |= (TTU_MIGRATION | TTU_IGNORE_MLOCK);
+ else
+ discard_mode = true;
+
/* Establish migration ptes or remove ptes */
- try_to_unmap(page, TTU_MIGRATION|TTU_IGNORE_MLOCK|TTU_IGNORE_ACCESS);
+ rc = try_to_unmap(page, ttu_flags);
skip_unmap:
- if (!page_mapped(page))
- rc = move_to_new_page(newpage, page, remap_swapcache, mode);
+ if (rc == SWAP_SUCCESS) {
+ if (!discard_mode) {
+ rc = move_to_new_page(newpage, page,
+ remap_swapcache, mode);
+ } else {
+ rc = discard_page(page);
+ goto uncharge;
+ }
+ } else if (rc == SWAP_MLOCK && discard_mode) {
+ mode &= ~MIGRATE_DISCARD;
+ discard_mode = false;
+ goto retry;
+ }
if (rc && remap_swapcache)
remove_migration_ptes(page, page);
diff -puN mm/page_alloc.c~mm-support-migrate_discard mm/page_alloc.c
--- a/mm/page_alloc.c~mm-support-migrate_discard
+++ a/mm/page_alloc.c
@@ -5701,7 +5701,7 @@ static int __alloc_contig_migrate_range(
ret = migrate_pages(&cc.migratepages,
__alloc_contig_migrate_alloc,
- 0, false, MIGRATE_SYNC);
+ 0, false, MIGRATE_SYNC|MIGRATE_DISCARD);
}
putback_lru_pages(&cc.migratepages);
_
Patches currently in -mm which might be from minchan@xxxxxxxxxx are
memory-hotplug-reset-pgdat-kswapd-to-null-if-creating-kernel-thread-fails.patch
linux-next.patch
mm-remove-__gfp_no_kswapd.patch
mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer.patch
mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix.patch
mm-fix-nonuniform-page-status-when-writing-new-file-with-small-buffer-fix-fix.patch
mm-compaction-update-comment-in-try_to_compact_pages.patch
mm-vmscan-scale-number-of-pages-reclaimed-by-reclaim-compaction-based-on-failures.patch
mm-vmscan-scale-number-of-pages-reclaimed-by-reclaim-compaction-based-on-failures-fix.patch
mm-compaction-capture-a-suitable-high-order-page-immediately-when-it-is-made-available.patch
mm-change-enum-migrate_mode-with-bitwise-type.patch
mm-page_alloc-use-get_freepage_migratetype-instead-of-page_private.patch
mm-remain-migratetype-in-freed-page.patch
memory-hotplug-bug-fix-race-between-isolation-and-allocation.patch
memory-hotplug-fix-pages-missed-by-race-rather-than-failing.patch
memory-hotplug-fix-pages-missed-by-race-rather-than-failng-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
