From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from d01relay02.pok.ibm.com (d01relay02.pok.ibm.com [9.56.227.234]) by e6.ny.us.ibm.com (8.13.8/8.13.8) with ESMTP id l8HGfoAY023983 for ; Mon, 17 Sep 2007 12:41:50 -0400 Received: from d01av01.pok.ibm.com (d01av01.pok.ibm.com [9.56.224.215]) by d01relay02.pok.ibm.com (8.13.8/8.13.8/NCO v8.5) with ESMTP id l8HGeNN2694154 for ; Mon, 17 Sep 2007 12:40:23 -0400 Received: from d01av01.pok.ibm.com (loopback [127.0.0.1]) by d01av01.pok.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id l8HGeM91012067 for ; Mon, 17 Sep 2007 12:40:23 -0400 From: Adam Litke Subject: [PATCH 4/4] hugetlb: Add hugetlb_dynamic_pool sysctl Date: Mon, 17 Sep 2007 09:40:20 -0700 Message-Id: <20070917164020.32557.41079.stgit@kernel> In-Reply-To: <20070917163935.32557.50840.stgit@kernel> References: <20070917163935.32557.50840.stgit@kernel> Content-Type: text/plain; charset=utf-8; format=fixed Content-Transfer-Encoding: 8bit Sender: owner-linux-mm@kvack.org Return-Path: To: linux-mm@kvack.org Cc: libhugetlbfs-devel@lists.sourceforge.net, Adam Litke , Andy Whitcroft , Mel Gorman , Bill Irwin , Ken Chen , Dave McCracken List-ID: Allowing the hugetlb pool to grow dynamically changes the semantics of the system by permitting more system memory to be used for huge pages than has been explicitly dedicated to the pool. This patch introduces a sysctl which must be enabled to turn on the dynamic pool resizing feature. This will avoid an involuntary change in behavior. When hugetlb pool growth is enabled via the hugetlb_dynamic_pool sysctl, an upper-bound on huge page allocation can be set by constraining the size of the hugetlb filesystem via the 'size' mount option. Signed-off-by: Adam Litke Acked-by: Andy Whitcroft --- include/linux/hugetlb.h | 1 + kernel/sysctl.c | 8 ++++++++ mm/hugetlb.c | 5 +++++ 3 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 3a19b03..ea0f50b 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -33,6 +33,7 @@ void hugetlb_unreserve_pages(struct inode *inode, long offset, long freed); extern unsigned long max_huge_pages; extern unsigned long hugepages_treat_as_movable; +extern int hugetlb_dynamic_pool; extern const unsigned long hugetlb_zero, hugetlb_infinity; extern int sysctl_hugetlb_shm_group; diff --git a/kernel/sysctl.c b/kernel/sysctl.c index 6ace893..45e8045 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@ -889,6 +889,14 @@ static ctl_table vm_table[] = { .mode = 0644, .proc_handler = &hugetlb_treat_movable_handler, }, + { + .ctl_name = CTL_UNNUMBERED, + .procname = "hugetlb_dynamic_pool", + .data = &hugetlb_dynamic_pool, + .maxlen = sizeof(hugetlb_dynamic_pool), + .mode = 0644, + .proc_handler = &proc_dointvec, + }, #endif { .ctl_name = VM_LOWMEM_RESERVE_RATIO, diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 1e78574..cd8f710 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -31,6 +31,7 @@ static unsigned int surplus_huge_pages_node[MAX_NUMNODES]; static unsigned long unused_surplus_pages; static gfp_t htlb_alloc_mask = GFP_HIGHUSER; unsigned long hugepages_treat_as_movable; +int hugetlb_dynamic_pool; /* * Protects updates to hugepage_freelists, nr_huge_pages, and free_huge_pages @@ -165,6 +166,10 @@ static struct page *alloc_buddy_huge_page(struct vm_area_struct *vma, { struct page *page; + /* Check if the dynamic pool is enabled */ + if (!hugetlb_dynamic_pool) + return NULL; + page = alloc_pages(htlb_alloc_mask|__GFP_COMP|__GFP_NOWARN, HUGETLB_PAGE_ORDER); if (page) { -- 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