From owner-svn-src-all@FreeBSD.ORG  Mon Feb 18 01:22:21 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 311BA1C4;
 Mon, 18 Feb 2013 01:22:21 +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 237B6254;
 Mon, 18 Feb 2013 01:22:21 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r1I1MKq3055756;
 Mon, 18 Feb 2013 01:22:20 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r1I1MKMD055755;
 Mon, 18 Feb 2013 01:22:20 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <201302180122.r1I1MKMD055755@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Mon, 18 Feb 2013 01:22:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246929 - head/sys/arm/include
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Feb 2013 01:22:21 -0000

Author: alc
Date: Mon Feb 18 01:22:20 2013
New Revision: 246929
URL: http://svnweb.freebsd.org/changeset/base/246929

Log:
  Place a cap on the size of the kernel's heap, also known as the kmem
  submap.  Otherwise, after r246204, the auto-scaling logic in kern_malloc.c
  tries to create a kmem submap that consumes the entire kernel map on a
  Pandaboard with 1 GB of RAM.
  
  Tested by:	gonzo

Modified:
  head/sys/arm/include/vmparam.h

Modified: head/sys/arm/include/vmparam.h
==============================================================================
--- head/sys/arm/include/vmparam.h	Mon Feb 18 01:14:21 2013	(r246928)
+++ head/sys/arm/include/vmparam.h	Mon Feb 18 01:22:20 2013	(r246929)
@@ -145,6 +145,14 @@
 #define VM_KMEM_SIZE_SCALE	(2)
 #endif
 
+/*
+ * Ceiling on the size of the kmem submap: 60% of the kernel map.
+ */
+#ifndef VM_KMEM_SIZE_MAX
+#define	VM_KMEM_SIZE_MAX	((vm_max_kernel_address - \
+    VM_MIN_KERNEL_ADDRESS + 1) * 3 / 5)
+#endif
+
 #define MAXTSIZ 	(16*1024*1024)
 #ifndef DFLDSIZ
 #define DFLDSIZ         (128*1024*1024)