Commit 74485cf2 authored by Johannes Weiner's avatar Johannes Weiner Committed by Linus Torvalds

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: default avatarJohannes Weiner <hannes@cmpxchg.org>
Suggested-by: default avatarHugh Dickins <hughd@google.com>
Acked-by: default avatarVladimir Davydov <vdavydov@virtuozzo.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Mateusz Guzik <mguzik@redhat.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7cf91a98
......@@ -331,8 +331,6 @@ int migrate_page_move_mapping(struct address_space *mapping,
if (PageSwapBacked(page))
SetPageSwapBacked(newpage);
mem_cgroup_migrate(page, newpage);
return MIGRATEPAGE_SUCCESS;
}
......@@ -428,8 +426,6 @@ int migrate_page_move_mapping(struct address_space *mapping,
}
local_irq_enable();
mem_cgroup_migrate(page, newpage);
return MIGRATEPAGE_SUCCESS;
}
......@@ -471,8 +467,6 @@ int migrate_huge_page_move_mapping(struct address_space *mapping,
spin_unlock_irq(&mapping->tree_lock);
mem_cgroup_migrate(page, newpage);
return MIGRATEPAGE_SUCCESS;
}
......@@ -586,6 +580,8 @@ void migrate_page_copy(struct page *newpage, struct page *page)
end_page_writeback(newpage);
copy_page_owner(page, newpage);
mem_cgroup_migrate(page, newpage);
}
/************************************************************
......@@ -1846,7 +1842,6 @@ fail_putback:
}
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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment