From owner-svn-src-user@FreeBSD.ORG Tue Nov 13 16:37:24 2012 Return-Path: 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 ABAB1407; Tue, 13 Nov 2012 16:37:24 +0000 (UTC) (envelope-from andre@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 8CD658FC15; Tue, 13 Nov 2012 16:37:24 +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 qADGbO4T080929; Tue, 13 Nov 2012 16:37:24 GMT (envelope-from andre@svn.freebsd.org) Received: (from andre@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qADGbOYn080928; Tue, 13 Nov 2012 16:37:24 GMT (envelope-from andre@svn.freebsd.org) Message-Id: <201211131637.qADGbOYn080928@svn.freebsd.org> From: Andre Oppermann Date: Tue, 13 Nov 2012 16:37:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r242981 - user/andre/tcp_workqueue/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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2012 16:37:24 -0000 Author: andre Date: Tue Nov 13 16:37:24 2012 New Revision: 242981 URL: http://svnweb.freebsd.org/changeset/base/242981 Log: Scaling maxfiles to physpages / 8 seems more appropriate. Modified: user/andre/tcp_workqueue/sys/kern/subr_param.c Modified: user/andre/tcp_workqueue/sys/kern/subr_param.c ============================================================================== --- user/andre/tcp_workqueue/sys/kern/subr_param.c Tue Nov 13 16:35:44 2012 (r242980) +++ user/andre/tcp_workqueue/sys/kern/subr_param.c Tue Nov 13 16:37:24 2012 (r242981) @@ -309,11 +309,11 @@ init_param2(long physpages) * physical page but not less than 16 times maxusers. * At most it can be 1/6 the number of physical pages. */ - maxfiles = imax(MAXFILES, physpages / 12); + maxfiles = imax(MAXFILES, physpages / 8); TUNABLE_INT_FETCH("kern.maxfiles", &maxfiles); - if (maxfiles > (physpages / 6)) - maxfiles = physpages / 6; - maxfilesperproc = (maxfiles * 9) / 10; + if (maxfiles > (physpages / 4)) + maxfiles = physpages / 4; + maxfilesperproc = (maxfiles / 10) * 9; /* * Cannot be changed after boot. @@ -337,8 +337,8 @@ init_param2(long physpages) VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS); maxmbufmem = realmem / 2; TUNABLE_LONG_FETCH("kern.maxmbufmem", &maxmbufmem); - if (maxmbufmem > realmem / 4 * 3) - maxmbufmem = realmem / 4 * 3; + if (maxmbufmem > (realmem / 4) * 3) + maxmbufmem = (realmem / 4) * 3; /* * The default for maxpipekva is min(1/64 of the kernel address space,