From: David Rientjes Date: Tue, 12 Aug 2014 20:46:07 +0000 (-0700) Subject: mm, hugetlb_cgroup: align hugetlb cgroup limit to hugepage size X-Git-Tag: omap-for-v3.17/fixes-against-rc2~64^2~2 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=24d7cd207f8e0d6864a314d5f03b5434403ff940;p=pandora-kernel.git mm, hugetlb_cgroup: align hugetlb cgroup limit to hugepage size Memcg aligns memory.limit_in_bytes to PAGE_SIZE as part of the resource counter since it makes no sense to allow a partial page to be charged. As a result of the hugetlb cgroup using the resource counter, it is also aligned to PAGE_SIZE but makes no sense unless aligned to the size of the hugepage being limited. Align hugetlb cgroup limit to hugepage size. Signed-off-by: David Rientjes Acked-by: Michal Hocko Cc: "Aneesh Kumar K.V" Cc: Tejun Heo Cc: Li Zefan Cc: Michal Hocko Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c index 9aae6f47433f..9eebfadeeee1 100644 --- a/mm/hugetlb_cgroup.c +++ b/mm/hugetlb_cgroup.c @@ -275,6 +275,7 @@ static ssize_t hugetlb_cgroup_write(struct kernfs_open_file *of, ret = res_counter_memparse_write_strategy(buf, &val); if (ret) break; + val = ALIGN(val, 1ULL << huge_page_shift(&hstates[idx])); ret = res_counter_set_limit(&h_cg->hugepage[idx], val); break; default: