Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755172Ab3CMHI7 (ORCPT ); Wed, 13 Mar 2013 03:08:59 -0400 Received: from e28smtp08.in.ibm.com ([122.248.162.8]:37478 "EHLO e28smtp08.in.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751517Ab3CMHI6 (ORCPT ); Wed, 13 Mar 2013 03:08:58 -0400 From: Wanpeng Li To: Andrew Morton Cc: Michal Hocko , "Aneesh Kumar K.V" , Hillf Danton , KAMEZAWA Hiroyuki , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wanpeng Li Subject: [PATCH] mm/hugetlb: fix total hugetlbfs pages count when memory overcommit accouting Date: Wed, 13 Mar 2013 15:08:31 +0800 Message-Id: <1363158511-21272-1-git-send-email-liwanp@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.5.4 X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13031307-2000-0000-0000-00000B49607D Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1796 Lines: 48 After commit 42d7395f ("mm: support more pagesizes for MAP_HUGETLB/SHM_HUGETLB") be merged, kernel permit multiple huge page sizes, and when the system administrator has configured the system to provide huge page pools of different sizes, application can choose the page size used for their allocation. However, just default size of huge page pool is statistical when memory overcommit accouting, the bad is that this will result in innocent processes be killed by oom-killer later. Fix it by statistic all huge page pools of different sizes provided by administrator. Testcase: boot: hugepagesz=1G hugepages=1 before patch: egrep 'CommitLimit' /proc/meminfo CommitLimit: 55434168 kB after patch: egrep 'CommitLimit' /proc/meminfo CommitLimit: 54909880 kB Signed-off-by: Wanpeng Li --- mm/hugetlb.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index cdb64e4..9e25040 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2124,8 +2124,11 @@ int hugetlb_report_node_meminfo(int nid, char *buf) /* Return the number pages of memory we physically have, in PAGE_SIZE units. */ unsigned long hugetlb_total_pages(void) { - struct hstate *h = &default_hstate; - return h->nr_huge_pages * pages_per_huge_page(h); + struct hstate *h; + unsigned long nr_total_pages = 0; + for_each_hstate(h) + nr_total_pages += h->nr_huge_pages * pages_per_huge_page(h); + return nr_total_pages; } static int hugetlb_acct_memory(struct hstate *h, long delta) -- 1.7.11.7 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/