summaryrefslogtreecommitdiffstats
path: root/mm/migrate.c
diff options
context:
space:
mode:
authorRik van Riel <riel@redhat.com>2013-10-07 11:29:23 +0100
committerIngo Molnar <mingo@kernel.org>2013-10-09 14:47:51 +0200
commit7851a45cd3f6198bf542c30e27b330e8eeb3736c (patch)
tree6e81020606c34c95aeded72620738e3a22032e13 /mm/migrate.c
parente29cf08b05dc0b8151d65704d96d525a9e179a6b (diff)
downloadop-kernel-dev-7851a45cd3f6198bf542c30e27b330e8eeb3736c.zip
op-kernel-dev-7851a45cd3f6198bf542c30e27b330e8eeb3736c.tar.gz
mm: numa: Copy cpupid on page migration
After page migration, the new page has the nidpid unset. This makes every fault on a recently migrated page look like a first numa fault, leading to another page migration. Copying over the nidpid at page migration time should prevent erroneous migrations of recently migrated pages. Signed-off-by: Rik van Riel <riel@redhat.com> Signed-off-by: Mel Gorman <mgorman@suse.de> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1381141781-10992-46-git-send-email-mgorman@suse.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/migrate.c')
-rw-r--r--mm/migrate.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/mm/migrate.c b/mm/migrate.c
index ff53774..44c1fa9 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -443,6 +443,8 @@ int migrate_huge_page_move_mapping(struct address_space *mapping,
*/
void migrate_page_copy(struct page *newpage, struct page *page)
{
+ int cpupid;
+
if (PageHuge(page) || PageTransHuge(page))
copy_huge_page(newpage, page);
else
@@ -479,6 +481,13 @@ void migrate_page_copy(struct page *newpage, struct page *page)
__set_page_dirty_nobuffers(newpage);
}
+ /*
+ * Copy NUMA information to the new page, to prevent over-eager
+ * future migrations of this same page.
+ */
+ cpupid = page_cpupid_xchg_last(page, -1);
+ page_cpupid_xchg_last(newpage, cpupid);
+
mlock_migrate_page(newpage, page);
ksm_migrate_page(newpage, page);
/*
OpenPOWER on IntegriCloud