From: Mel Gorman Date: Tue, 7 Jan 2014 14:00:48 +0000 (+0000) Subject: mm: numa: defer TLB flush for THP migration as long as possible X-Git-Tag: submit/tizen_common/20140905.094502~1130 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c612a77032a98b264d12fd6e3df2ca530d968d2;p=sdk%2Femulator%2Femulator-kernel.git 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 Reviewed-by: Rik van Riel Cc: Alex Thorlton Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 07b7eb3984b3..47962456ed87 100644 --- 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 6609413b7429..d455cab0b81c 100644 --- 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);