The patch titled
Subject: mm-mempolicy-handle-vma-with-unmovable-pages-mapped-correctly-in-mbind-v4
has been removed from the -mm tree. Its filename was
mm-mempolicy-handle-vma-with-unmovable-pages-mapped-correctly-in-mbind-v4.patch
This patch was dropped because it was folded into mm-mempolicy-handle-vma-with-unmovable-pages-mapped-correctly-in-mbind.patch
------------------------------------------------------
From: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Subject: mm-mempolicy-handle-vma-with-unmovable-pages-mapped-correctly-in-mbind-v4
fix review comments from Vlastimil
Link: http://lkml.kernel.org/r/1563556862-54056-3-git-send-email-yang.shi@xxxxxxxxxxxxxxxxx
Signed-off-by: Yang Shi <yang.shi@xxxxxxxxxxxxxxxxx>
Reviewed-by: Vlastimil Babka <vbabka@xxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Mel Gorman <mgorman@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/mempolicy.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
--- a/mm/mempolicy.c~mm-mempolicy-handle-vma-with-unmovable-pages-mapped-correctly-in-mbind-v4
+++ a/mm/mempolicy.c
@@ -538,7 +538,7 @@ static int queue_pages_pte_range(pmd_t *
* need migrate other LRU pages.
*/
if (migrate_page_add(page, qp->pagelist, flags))
- has_unmovable |= true;
+ has_unmovable = true;
} else
break;
}
@@ -971,17 +971,6 @@ static int migrate_page_add(struct page
unsigned long flags)
{
struct page *head = compound_head(page);
-
- /*
- * Non-movable page may reach here. And, there may be
- * temporaty off LRU pages or non-LRU movable pages.
- * Treat them as unmovable pages since they can't be
- * isolated, so they can't be moved at the moment. It
- * should return -EIO for this case too.
- */
- if (!PageLRU(head) && (flags & MPOL_MF_STRICT))
- return -EIO;
-
/*
* Avoid migrating a page that is shared with others.
*/
@@ -991,6 +980,15 @@ static int migrate_page_add(struct page
mod_node_page_state(page_pgdat(head),
NR_ISOLATED_ANON + page_is_file_cache(head),
hpage_nr_pages(head));
+ } else if (flags & MPOL_MF_STRICT) {
+ /*
+ * Non-movable page may reach here. And, there may be
+ * temporary off LRU pages or non-LRU movable pages.
+ * Treat them as unmovable pages since they can't be
+ * isolated, so they can't be moved at the moment. It
+ * should return -EIO for this case too.
+ */
+ return -EIO;
}
}
_
Patches currently in -mm which might be from yang.shi@xxxxxxxxxxxxxxxxx are
mm-mempolicy-make-the-behavior-consistent-when-mpol_mf_move-and-mpol_mf_strict-were-specified.patch
mm-mempolicy-handle-vma-with-unmovable-pages-mapped-correctly-in-mbind.patch
mm-thp-extract-split_queue_-into-a-struct.patch
mm-move-mem_cgroup_uncharge-out-of-__page_cache_release.patch
mm-shrinker-make-shrinker-not-depend-on-memcg-kmem.patch
mm-thp-make-deferred-split-shrinker-memcg-aware.patch
