From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wanpeng Li Subject: [PATCH RFC] mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge Date: Tue, 10 Jul 2012 18:05:12 +0800 Message-ID: <1341914712-4588-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=952hGRuFsSMU/KvNjjBQxfYQEhX/q+Z8pFyzOL7ihcI=; b=U+gvvnbq8HLbHMyHtXtm2cPVvoXhsSXsUJ99AdBKskH50tQzifztigVGvOciPSbs+I UgUwdQCN+sHmSdT7qSHY4Pey95nycyLvAT4OBOZidNHLXbPqdBS55gYN0AQKdDxV1uyt suLYDYwa+GH2PD+oQy+f9bf8HhjW78uWJDBkf0PP57bZicyt0D7P7WxiMpBuZsZPDSr5 3eR2g0RAint7LavohX7YF40QEGmcmqkPL6xSh9xwXI3V3XKJYoTdwgeXVHLu8XXOzgwP +CYZgmOrfbkPsbw5O1ZMRZOJ2uBXG0b6J5sAzNJQRInh4yKU4WVK4ZCf2T8Fh76/FVsx l0Lg== Sender: owner-linux-mm@kvack.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-mm@kvack.org Cc: Andrew Morton , 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. 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 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752338Ab2GJKFo (ORCPT ); Tue, 10 Jul 2012 06:05:44 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:56984 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751823Ab2GJKFm (ORCPT ); Tue, 10 Jul 2012 06:05:42 -0400 From: Wanpeng Li To: linux-mm@kvack.org Cc: Andrew Morton , Li Zefan , Tejun Heo , "Aneesh Kumar K.V" , cgroups@vger.kernel.org, linux-kernel@vger.kernel.org, Wanpeng Li Subject: [PATCH RFC] mm/hugetlb_cgroup: Add huge_page_order check to avoid incorrectly uncharge Date: Tue, 10 Jul 2012 18:05:12 +0800 Message-Id: <1341914712-4588-1-git-send-email-liwp.linux@gmail.com> X-Mailer: git-send-email 1.7.5.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. 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