From owner-svn-src-all@FreeBSD.ORG  Sat Mar  6 21:24:32 2010
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AB8FC106564A;
	Sat,  6 Mar 2010 21:24:32 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BBD58FC0A;
	Sat,  6 Mar 2010 21:24:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o26LOWpd041360;
	Sat, 6 Mar 2010 21:24:32 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o26LOWnG041358;
	Sat, 6 Mar 2010 21:24:32 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201003062124.o26LOWnG041358@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 6 Mar 2010 21:24:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r204807 - head/sys/netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 06 Mar 2010 21:24:32 -0000

Author: bz
Date: Sat Mar  6 21:24:32 2010
New Revision: 204807
URL: http://svn.freebsd.org/changeset/base/204807

Log:
  Destroy UDP UMA zones (empty or not) upon network stack teardown
  to not leak them making the VM subsystem unhappy with every stoped vnet(*).
  We will still leak pages (especially as zones are marked NOFREE).
  
  (*) This will also keep vmstat -z more usable.
  
  Sponsored by:	ISPsystem
  MFC after:	5 days

Modified:
  head/sys/netinet/udp_usrreq.c

Modified: head/sys/netinet/udp_usrreq.c
==============================================================================
--- head/sys/netinet/udp_usrreq.c	Sat Mar  6 21:24:11 2010	(r204806)
+++ head/sys/netinet/udp_usrreq.c	Sat Mar  6 21:24:32 2010	(r204807)
@@ -245,6 +245,9 @@ udp_destroy(void)
 	    V_udbinfo.ipi_hashmask);
 	hashdestroy(V_udbinfo.ipi_porthashbase, M_PCB,
 	    V_udbinfo.ipi_porthashmask);
+
+	uma_zdestroy(V_udpcb_zone);
+	uma_zdestroy(V_udbinfo.ipi_zone);
 	INP_INFO_LOCK_DESTROY(&V_udbinfo);
 }
 #endif