From owner-svn-src-user@FreeBSD.ORG  Thu Nov  1 17:22:41 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D04ECF64;
 Thu,  1 Nov 2012 17:22:41 +0000 (UTC)
 (envelope-from alfred@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id B8FDB8FC12;
 Thu,  1 Nov 2012 17:22:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id qA1HMfvo040769;
 Thu, 1 Nov 2012 17:22:41 GMT (envelope-from alfred@svn.freebsd.org)
Received: (from alfred@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id qA1HMfNS040767;
 Thu, 1 Nov 2012 17:22:41 GMT (envelope-from alfred@svn.freebsd.org)
Message-Id: <201211011722.qA1HMfNS040767@svn.freebsd.org>
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Thu, 1 Nov 2012 17:22:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r242443 - user/alfred/9-alfred/sys/kern
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Nov 2012 17:22:41 -0000

Author: alfred
Date: Thu Nov  1 17:22:41 2012
New Revision: 242443
URL: http://svn.freebsd.org/changeset/base/242443

Log:
  Merge r242029: scale maxusers past 384 for mbufs.

Modified:
  user/alfred/9-alfred/sys/kern/subr_param.c
Directory Properties:
  user/alfred/9-alfred/sys/   (props changed)

Modified: user/alfred/9-alfred/sys/kern/subr_param.c
==============================================================================
--- user/alfred/9-alfred/sys/kern/subr_param.c	Thu Nov  1 17:19:07 2012	(r242442)
+++ user/alfred/9-alfred/sys/kern/subr_param.c	Thu Nov  1 17:22:41 2012	(r242443)
@@ -278,8 +278,16 @@ init_param2(long physpages)
 		maxusers = physpages / (2 * 1024 * 1024 / PAGE_SIZE);
 		if (maxusers < 32)
 			maxusers = 32;
-		if (maxusers > 384)
-			maxusers = 384;
+		/*
+		 * Clips maxusers to 384 on machines with <= 4GB RAM or 32bit.
+		 * Scales it down 6x for large memory machines.
+		 */
+		if (maxusers > 384) {
+			if (sizeof(void *) <= 4)
+			    maxusers = 384;
+			else
+			    maxusers = 384 + ((maxusers - 384) / 6);
+		}
 	}
 
 	/*