1 files changed, 9 insertions, 0 deletions

diff --git a/mm/migrate.c b/mm/migrate.c
index ff537749d3b4..44c1fa9d6f54 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);
         /*