From owner-p4-projects@FreeBSD.ORG  Fri Sep 14 19:03:21 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EC88F16A469; Fri, 14 Sep 2007 19:03:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A1BF116A418
	for <perforce@freebsd.org>; Fri, 14 Sep 2007 19:03:20 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A68F813C457
	for <perforce@freebsd.org>; Fri, 14 Sep 2007 19:03:20 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8EJ3Kxq022789
	for <perforce@freebsd.org>; Fri, 14 Sep 2007 19:03:20 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8EJ3KCm022786
	for perforce@freebsd.org; Fri, 14 Sep 2007 19:03:20 GMT
	(envelope-from kmacy@freebsd.org)
Date: Fri, 14 Sep 2007 19:03:20 GMT
Message-Id: <200709141903.l8EJ3KCm022786@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 126405 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: Fri, 14 Sep 2007 19:03:21 -0000

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

Change 126405 by kmacy@kmacy_home:ethng on 2007/09/14 19:02:21

	122915 - add contiguous allocator for UMA

Affected files ...

.. //depot/projects/ethng/src/sys/vm/uma.h#2 edit
.. //depot/projects/ethng/src/sys/vm/uma_core.c#2 edit

Differences ...

==== //depot/projects/ethng/src/sys/vm/uma.h#2 (text+ko) ====

@@ -482,6 +482,7 @@
  */
 
 void uma_zone_set_freef(uma_zone_t zone, uma_free freef);
+void uma_zone_set_contig(uma_zone_t zone);
 
 /*
  * These flags are setable in the allocf and visable in the freef.

==== //depot/projects/ethng/src/sys/vm/uma_core.c#2 (text+ko) ====

@@ -957,6 +957,32 @@
 	return (p);
 }
 
+static void *
+uma_zone_contig_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
+{
+	int malloc_flags;
+	
+	*flags = UMA_SLAB_PRIV;
+	malloc_flags = (wait ? M_WAITOK : M_NOWAIT);
+	
+	return (contigmalloc(bytes, M_DEVBUF, malloc_flags, 0x0ULL,
+			     (vm_paddr_t)-1, 1, 0));
+}
+
+static void
+uma_zone_contig_free(void *mem, int size, u_int8_t flags)
+{
+	contigfree(mem, size, M_DEVBUF);
+}
+
+void
+uma_zone_set_contig(uma_zone_t zone)
+{
+	uma_zone_set_allocf(zone, uma_zone_contig_alloc);
+	uma_zone_set_freef(zone, uma_zone_contig_free);
+	
+}
+
 /*
  * Allocates a number of pages from within an object
  *