mm: numa: defer TLB flush for THP migration as long as possible

commit b0943d61b8fa420180f92f64ef67662b4f6cc493 upstream.

THP migration can fail for a variety of reasons.  Avoid flushing the TLB
to deal with THP migration races until the copy is ready to start.

Signed-off-by: Mel Gorman <mgorman@suse.de>
Reviewed-by: Rik van Riel <riel@redhat.com>
Cc: Alex Thorlton <athorlton@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 07b7eb3984b3adc2d4b2d0c37f05cb31b1fb4c37..47962456ed874e012e3631937baa01cabff2fc71 100644 (file)
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1359,13 +1359,6 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
                goto clear_pmdnuma;
        }
 
-       /*
-        * The page_table_lock above provides a memory barrier
-        * with change_protection_range.
-        */
-       if (mm_tlb_flush_pending(mm))
-               flush_tlb_range(vma, haddr, haddr + HPAGE_PMD_SIZE);
-
        /*
         * Migrate the THP to the requested node, returns with page unlocked
         * and pmd_numa cleared.

diff --git a/mm/migrate.c b/mm/migrate.c
index 6609413b74291d89c4cf6cd05350995b13ca6ee4..d455cab0b81ca07bf0ca5a0a314ee53e820602c2 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1705,6 +1705,9 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
                goto out_fail;
        }
 
+       if (mm_tlb_flush_pending(mm))
+               flush_tlb_range(vma, mmun_start, mmun_end);
+
        /* Prepare a page as a migration target */
        __set_page_locked(new_page);
        SetPageSwapBacked(new_page);