From: Mel Gorman <mgorman@suse.de>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Alex Thorlton <athorlton@sgi.com>, Rik van Riel <riel@redhat.com>,
Linux-MM <linux-mm@kvack.org>,
LKML <linux-kernel@vger.kernel.org>, Mel Gorman <mgorman@suse.de>
Subject: [PATCH 12/18] mm: numa: Defer TLB flush for THP migration as long as possible
Date: Tue, 10 Dec 2013 15:51:30 +0000 [thread overview]
Message-ID: <1386690695-27380-13-git-send-email-mgorman@suse.de> (raw)
In-Reply-To: <1386690695-27380-1-git-send-email-mgorman@suse.de>
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.
Cc: stable@vger.kernel.org
Signed-off-by: Mel Gorman <mgorman@suse.de>
---
mm/huge_memory.c | 7 -------
mm/migrate.c | 3 +++
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index e3a5ee2..e3b6a75 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1377,13 +1377,6 @@ int do_huge_pmd_numa_page(struct mm_struct *mm, struct vm_area_struct *vma,
}
/*
- * The page_table_lock above provides a memory barrier
- * with change_protection_range.
- */
- if (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 cfb4190..0c4fbf6 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1759,6 +1759,9 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
goto out_fail;
}
+ if (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);
--
1.8.4
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2013-12-10 15:51 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-10 15:51 [PATCH 00/17] NUMA balancing segmentation fault fixes and misc followups v4 Mel Gorman
2013-12-10 15:51 ` [PATCH 01/18] mm: numa: Serialise parallel get_user_page against THP migration Mel Gorman
2013-12-10 15:51 ` [PATCH 02/18] mm: numa: Call MMU notifiers on " Mel Gorman
2013-12-10 15:51 ` [PATCH 03/18] mm: Clear pmd_numa before invalidating Mel Gorman
2013-12-10 15:51 ` [PATCH 04/18] mm: numa: Do not clear PMD during PTE update scan Mel Gorman
2013-12-10 15:51 ` [PATCH 05/18] mm: numa: Do not clear PTE for pte_numa update Mel Gorman
2013-12-16 23:15 ` [PATCH 19/18] mm,numa: write pte_numa pte back to the page tables Rik van Riel
2013-12-10 15:51 ` [PATCH 06/18] mm: numa: Ensure anon_vma is locked to prevent parallel THP splits Mel Gorman
2013-12-10 15:51 ` [PATCH 07/18] mm: numa: Avoid unnecessary work on the failure path Mel Gorman
2013-12-10 15:51 ` [PATCH 08/18] sched: numa: Skip inaccessible VMAs Mel Gorman
2013-12-10 15:51 ` [PATCH 09/18] mm: numa: Clear numa hinting information on mprotect Mel Gorman
2013-12-10 15:51 ` [PATCH 10/18] mm: numa: Avoid unnecessary disruption of NUMA hinting during migration Mel Gorman
2013-12-17 22:53 ` Sasha Levin
2013-12-19 11:59 ` Mel Gorman
2013-12-19 12:00 ` [PATCH] mm: Remove bogus warning in copy_huge_pmd Mel Gorman
2013-12-19 18:36 ` Rik van Riel
2013-12-10 15:51 ` [PATCH 11/18] mm: fix TLB flush race between migration, and change_protection_range Mel Gorman
2013-12-11 19:12 ` [PATCH] mm: fix TLB flush race between migration, and change_protection_range -fix Mel Gorman
2013-12-10 15:51 ` Mel Gorman [this message]
2013-12-10 16:56 ` [PATCH 12/18] mm: numa: Defer TLB flush for THP migration as long as possible Rik van Riel
2013-12-10 15:51 ` [PATCH 13/18] mm: numa: Make NUMA-migrate related functions static Mel Gorman
2013-12-10 15:51 ` [PATCH 14/18] mm: numa: Limit scope of lock for NUMA migrate rate limiting Mel Gorman
2013-12-10 15:51 ` [PATCH 15/18] mm: numa: Trace tasks that fail migration due to " Mel Gorman
2013-12-10 15:51 ` [PATCH 16/18] mm: numa: Do not automatically migrate KSM pages Mel Gorman
2013-12-10 15:51 ` [PATCH 17/18] sched: Add tracepoints related to NUMA task migration Mel Gorman
2013-12-10 22:22 ` Andrew Morton
2013-12-11 8:37 ` Mel Gorman
2013-12-10 15:56 ` [PATCH 00/17] NUMA balancing segmentation fault fixes and misc followups v4 Mel Gorman
2013-12-11 13:21 ` [PATCH] mm: numa: Guarantee that tlb_flush_pending updates are visible before page table updates Mel Gorman
2013-12-11 14:44 ` Paul E. McKenney
2013-12-11 16:40 ` Mel Gorman
2013-12-11 16:56 ` Paul E. McKenney
2013-12-11 15:21 ` Rik van Riel
-- strict thread matches above, loose matches on Subject: below --
2013-12-09 7:08 [PATCH 00/18] NUMA balancing segmentation fault fixes and misc followups v3 Mel Gorman
2013-12-09 7:09 ` [PATCH 12/18] mm: numa: Defer TLB flush for THP migration as long as possible Mel Gorman
2013-12-09 16:13 ` Rik van Riel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1386690695-27380-13-git-send-email-mgorman@suse.de \
--to=mgorman@suse.de \
--cc=akpm@linux-foundation.org \
--cc=athorlton@sgi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=riel@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).