From owner-svn-src-head@FreeBSD.ORG  Thu Apr 18 05:34:33 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id BFE71A9A;
 Thu, 18 Apr 2013 05:34:33 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id B3530BD5;
 Thu, 18 Apr 2013 05:34:33 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3I5YXO0015578;
 Thu, 18 Apr 2013 05:34:33 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3I5YXK4015577;
 Thu, 18 Apr 2013 05:34:33 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201304180534.r3I5YXK4015577@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Thu, 18 Apr 2013 05:34:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249605 - head/sys/vm
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Apr 2013 05:34:33 -0000

Author: alc
Date: Thu Apr 18 05:34:33 2013
New Revision: 249605
URL: http://svnweb.freebsd.org/changeset/base/249605

Log:
  When calculating the number of reserved nodes, discount the pages that will
  be used to store the nodes.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/sys/vm/vm_radix.c

Modified: head/sys/vm/vm_radix.c
==============================================================================
--- head/sys/vm/vm_radix.c	Thu Apr 18 05:12:11 2013	(r249604)
+++ head/sys/vm/vm_radix.c	Thu Apr 18 05:34:33 2013	(r249605)
@@ -360,10 +360,17 @@ vm_radix_node_zone_init(void *mem, int s
 static void
 vm_radix_prealloc(void *arg __unused)
 {
+	int nodes;
 
-	if (!uma_zone_reserve_kva(vm_radix_node_zone, cnt.v_page_count))
+	/*
+	 * Calculate the number of reserved nodes, discounting the pages that
+	 * are needed to store them.
+	 */
+	nodes = ((vm_paddr_t)cnt.v_page_count * PAGE_SIZE) / (PAGE_SIZE +
+	    sizeof(struct vm_radix_node));
+	if (!uma_zone_reserve_kva(vm_radix_node_zone, nodes))
 		panic("%s: unable to create new zone", __func__);
-	uma_prealloc(vm_radix_node_zone, cnt.v_page_count);
+	uma_prealloc(vm_radix_node_zone, nodes);
 }
 SYSINIT(vm_radix_prealloc, SI_SUB_KMEM, SI_ORDER_SECOND, vm_radix_prealloc,
     NULL);