From owner-svn-src-user@FreeBSD.ORG  Thu Nov  8 23:24:03 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 6CC51B09;
 Thu,  8 Nov 2012 23:24:03 +0000 (UTC)
 (envelope-from alfred@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 383F88FC16;
 Thu,  8 Nov 2012 23:24:03 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qA8NO3Yb046826;
 Thu, 8 Nov 2012 23:24:03 GMT (envelope-from alfred@svn.freebsd.org)
Received: (from alfred@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qA8NO3h5046824;
 Thu, 8 Nov 2012 23:24:03 GMT (envelope-from alfred@svn.freebsd.org)
Message-Id: <201211082324.qA8NO3h5046824@svn.freebsd.org>
From: Alfred Perlstein <alfred@FreeBSD.org>
Date: Thu, 8 Nov 2012 23:24:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r242805 - in user/alfred/9-alfred/sys: i386/include 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, 08 Nov 2012 23:24:03 -0000

Author: alfred
Date: Thu Nov  8 23:24:02 2012
New Revision: 242805
URL: http://svnweb.freebsd.org/changeset/base/242805

Log:
  clip maxusers based on MD VM_MAX_AUTOTUNE_MAXUSERS.

Modified:
  user/alfred/9-alfred/sys/i386/include/vmparam.h
  user/alfred/9-alfred/sys/kern/subr_param.c

Modified: user/alfred/9-alfred/sys/i386/include/vmparam.h
==============================================================================
--- user/alfred/9-alfred/sys/i386/include/vmparam.h	Thu Nov  8 23:21:02 2012	(r242804)
+++ user/alfred/9-alfred/sys/i386/include/vmparam.h	Thu Nov  8 23:24:02 2012	(r242805)
@@ -202,9 +202,14 @@
 
 #define	ZERO_REGION_SIZE	(64 * 1024)	/* 64KB */
 
+#ifndef VM_MAX_AUTOTUNE_MAXUSERS
+#define VM_MAX_AUTOTUNE_MAXUSERS 384
+#endif
+
 #ifndef MAX_AUTOTUNE_NMBCLUSTERS
 /* old maxusers max value. */
 #define MAX_AUTOTUNE_NMBCLUSTERS (1024 + 384 * 64)
 #endif
 
+
 #endif /* _MACHINE_VMPARAM_H_ */

Modified: user/alfred/9-alfred/sys/kern/subr_param.c
==============================================================================
--- user/alfred/9-alfred/sys/kern/subr_param.c	Thu Nov  8 23:21:02 2012	(r242804)
+++ user/alfred/9-alfred/sys/kern/subr_param.c	Thu Nov  8 23:24:02 2012	(r242805)
@@ -278,16 +278,16 @@ init_param2(long physpages)
 		maxusers = physpages / (2 * 1024 * 1024 / PAGE_SIZE);
 		if (maxusers < 32)
 			maxusers = 32;
+#ifdef VM_MAX_AUTOTUNE_MAXUSERS
+		if (maxusers > VM_MAX_AUTOTUNE_MAXUSERS)
+			maxusers = VM_MAX_AUTOTUNE_MAXUSERS;
+#endif
 		/*
-		 * Clips maxusers to 384 on machines with <= 4GB RAM or 32bit.
-		 * Scales it down 6x for large memory machines.
+		 * Scales down the function in which maxusers grows once
+		 * we hit 384
 		 */
-		if (maxusers > 384) {
-			if (sizeof(void *) <= 4)
-			    maxusers = 384;
-			else
-			    maxusers = 384 + ((maxusers - 384) / 6);
-		}
+		if (maxusers > 384)
+			maxusers = 384 + ((maxusers - 384) / 4);
 	}
 
 	/*