mm: migrate: consolidate mem_cgroup_migrate() calls
Rather than scattering mem_cgroup_migrate() calls all over the place,
have a single call from a safe place where every migration operation
eventually ends up in - migrate_page_copy().
Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Suggested-by: Hugh Dickins <hughd@google.com>
Acked-by: Vladimir Davydov <vdavydov@virtuozzo.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: Mateusz Guzik <mguzik@redhat.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/mm/migrate.c b/mm/migrate.c
index 848327d..568284e 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -331,8 +331,6 @@
if (PageSwapBacked(page))
SetPageSwapBacked(newpage);
- mem_cgroup_migrate(page, newpage);
-
return MIGRATEPAGE_SUCCESS;
}
@@ -428,8 +426,6 @@
}
local_irq_enable();
- mem_cgroup_migrate(page, newpage);
-
return MIGRATEPAGE_SUCCESS;
}
@@ -471,8 +467,6 @@
spin_unlock_irq(&mapping->tree_lock);
- mem_cgroup_migrate(page, newpage);
-
return MIGRATEPAGE_SUCCESS;
}
@@ -586,6 +580,8 @@
end_page_writeback(newpage);
copy_page_owner(page, newpage);
+
+ mem_cgroup_migrate(page, newpage);
}
/************************************************************
@@ -1846,7 +1842,6 @@
}
mlock_migrate_page(new_page, page);
- mem_cgroup_migrate(page, new_page);
page_remove_rmap(page, true);
set_page_owner_migrate_reason(new_page, MR_NUMA_MISPLACED);