From owner-p4-projects@FreeBSD.ORG  Sat Feb 11 18:26:23 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9A68916A423; Sat, 11 Feb 2006 18:26:22 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6F8E016A420
	for <perforce@freebsd.org>; Sat, 11 Feb 2006 18:26:22 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3D73943D48
	for <perforce@freebsd.org>; Sat, 11 Feb 2006 18:26:22 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k1BIQMTW082595
	for <perforce@freebsd.org>; Sat, 11 Feb 2006 18:26:22 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k1BIQLrI082592
	for perforce@freebsd.org; Sat, 11 Feb 2006 18:26:21 GMT
	(envelope-from peter@freebsd.org)
Date: Sat, 11 Feb 2006 18:26:21 GMT
Message-Id: <200602111826.k1BIQLrI082592@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 91580 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Feb 2006 18:26:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=91580

Change 91580 by peter@peter_daintree on 2006/02/11 18:25:50

	Try making the nmbclusters sysctl actually do something.  Out of paranoia,
	do not allow it to reduce the current value - ie: increase only.  It would
	probably work, but wouldn't be healthy to the network stack if we allowed it
	to be run into the ground.

Affected files ...

.. //depot/projects/hammer/sys/kern/kern_mbuf.c#15 edit

Differences ...

==== //depot/projects/hammer/sys/kern/kern_mbuf.c#15 (text+ko) ====

@@ -111,9 +111,24 @@
 SYSINIT(tunable_mbinit, SI_SUB_TUNABLES, SI_ORDER_ANY, tunable_mbinit, NULL);
 
 SYSCTL_DECL(_kern_ipc);
-/* XXX: These should be tuneables. Can't change UMA limits on the fly. */
-SYSCTL_INT(_kern_ipc, OID_AUTO, nmbclusters, CTLFLAG_RW, &nmbclusters, 0,
-    "Maximum number of mbuf clusters allowed");
+static int
+nmbcheck(SYSCTL_HANDLER_ARGS)
+{
+	int error, oldnmbclusters;
+
+	oldnmbclusters = nmbclusters;
+	error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
+	if (error == 0 && req->newptr) {
+		if (nmbclusters < oldnmbclusters) {
+			nmbclusters = oldnmbclusters;
+			return (EINVAL);
+		}
+		uma_zone_set_max(zone_clust, nmbclusters);
+	}
+	return (error);
+}
+SYSCTL_PROC(_kern_ipc, OID_AUTO, nmbclusters, CTLTYPE_INT|CTLFLAG_RW,
+    &nmbclusters, 0, nmbcheck, "IU", "Maximum number of mbuf clusters allowed");
 SYSCTL_INT(_kern_ipc, OID_AUTO, nmbjumbo4, CTLFLAG_RW, &nmbjumbo4, 0,
     "Maximum number of mbuf 4k jumbo clusters allowed");
 SYSCTL_INT(_kern_ipc, OID_AUTO, nmbjumbo9, CTLFLAG_RW, &nmbjumbo9, 0,