From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wanpeng Li Subject: [PATCH] mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge Date: Wed, 11 Jul 2012 11:03:16 +0800 Message-ID: <1341975796-5730-1-git-send-email-liwp.linux@gmail.com> Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=DfEVUfC0fw38hu1EGVF+06IsFRrrA0MoFTM/oNf2Sg0=; b=OFBIE3EbquacPV/86eBTKcnQgEhmPGDHpyJlrCBUmk5vNIkozhu7kcuV12dfA4MAj4 OAn02jv0Hd+3Yh537yBg7DZGPFa+RR3k6f4ca9BNilGPbZ48n0YzDB2LMYLzQAe1X9BJ a5EIz/s0+ToonoMxiA0mLGrkZV8nhmmJoIG4C2TOD5WdQrJwwf2KhQYtpEg+ZjNa9uh5 fdHZONa3p+QWyqL62DxOExNdJmKo81un4aqMpqFJagQIm+D0Fpb2GfvyI9u3pjIybhKd HQ/yIVrzTQFqhZi8pIHlLbTt5hcU5lu0U4voig4qW25TT9+W8HVFwuuq4STwTbyldigg gVvw== Sender: owner-linux-mm@kvack.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Andrew Morton Cc: linux-mm@kvack.org, Li Zefan , Tejun Heo , "Aneesh Kumar K.V" , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Wanpeng Li From: Wanpeng Li Against linux-next: Function alloc_huge_page will call hugetlb_cgroup_charge_cgroup to charge pages, the compound page have less than 3 pages will not charge to hugetlb cgroup. When alloc_huge_page fails it will call hugetlb_cgroup_uncharge_cgroup to uncharge pages, however, hugetlb_cgroup_uncharge_cgroup doesn't have huge_page_order check. That means it will uncharge pages even if the compound page have less than 3 pages. Add huge_page_order check to avoid this incorrectly uncharge. Reviewed-by: Michal Hocko Reviewed-by: Aneesh Kumar K.V Signed-off-by: Wanpeng Li --- mm/hugetlb_cgroup.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/mm/hugetlb_cgroup.c b/mm/hugetlb_cgroup.c index b834e8d..2b9e214 100644 --- a/mm/hugetlb_cgroup.c +++ b/mm/hugetlb_cgroup.c @@ -252,6 +252,9 @@ void hugetlb_cgroup_uncharge_cgroup(int idx, unsigned long nr_pages, if (hugetlb_cgroup_disabled() || !h_cg) return; + + if (huge_page_order(&hstates[idx]) < HUGETLB_CGROUP_MIN_ORDER) + return; res_counter_uncharge(&h_cg->hugepage[idx], csize); return; -- 1.7.5.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org