diff options
author | Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> | 2012-07-31 19:42:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-31 21:42:41 -0400 |
commit | 8e6ac7fab374816de9a8b0a8fbb02ef761a30ff4 (patch) | |
tree | 94439bfcceb9e11af842da63f18f608aff4919c4 /mm/hugetlb_cgroup.c | |
parent | abb8206cb07734d0b7bf033c715995d6371a94c3 (diff) |
hugetlb/cgroup: migrate hugetlb cgroup info from oldpage to new page during migration
With HugeTLB pages, hugetlb cgroup is uncharged in compound page
destructor. Since we are holding a hugepage reference, we can be sure
that old page won't get uncharged till the last put_page().
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Hillf Danton <dhillf@gmail.com>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/hugetlb_cgroup.c')
-rw-r--r-- | mm/hugetlb_cgroup.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c index d1ca1196e62f..680e4819e077 100644 --- a/mm/hugetlb_cgroup.c +++ b/mm/hugetlb_cgroup.c | |||
@@ -386,6 +386,26 @@ int __init hugetlb_cgroup_file_init(int idx) | |||
386 | return 0; | 386 | return 0; |
387 | } | 387 | } |
388 | 388 | ||
389 | void hugetlb_cgroup_migrate(struct page *oldhpage, struct page *newhpage) | ||
390 | { | ||
391 | struct hugetlb_cgroup *h_cg; | ||
392 | |||
393 | if (hugetlb_cgroup_disabled()) | ||
394 | return; | ||
395 | |||
396 | VM_BUG_ON(!PageHuge(oldhpage)); | ||
397 | spin_lock(&hugetlb_lock); | ||
398 | h_cg = hugetlb_cgroup_from_page(oldhpage); | ||
399 | set_hugetlb_cgroup(oldhpage, NULL); | ||
400 | cgroup_exclude_rmdir(&h_cg->css); | ||
401 | |||
402 | /* move the h_cg details to new cgroup */ | ||
403 | set_hugetlb_cgroup(newhpage, h_cg); | ||
404 | spin_unlock(&hugetlb_lock); | ||
405 | cgroup_release_and_wakeup_rmdir(&h_cg->css); | ||
406 | return; | ||
407 | } | ||
408 | |||
389 | struct cgroup_subsys hugetlb_subsys = { | 409 | struct cgroup_subsys hugetlb_subsys = { |
390 | .name = "hugetlb", | 410 | .name = "hugetlb", |
391 | .create = hugetlb_cgroup_create, | 411 | .create = hugetlb_cgroup_create, |