Adjust the kernel to use the slab allocator

* device/dev_lookup.c: Replace zalloc header, types and function calls
with their slab counterparts.
* device/dev_pager.c: Likewise.
* device/ds_routines.c: Likewise.
* device/io_req.h: Likewise.
* device/net_io.c: Likewise.
* i386/i386/fpu.c: Likewise.
* i386/i386/io_perm.c: Likewise.
* i386/i386/machine_task.c: Likewise.
* i386/i386/pcb.c: Likewise.
* i386/i386/task.h: Likewise.
* i386/intel/pmap.c: Likewise.
* i386/intel/pmap.h: Remove #include <kernel/zalloc.h>.
* include/mach_debug/mach_debug.defs (host_zone_info): Replace
routine declaration with skip directive.
(host_slab_info): New routine declaration.
* include/mach_debug/mach_debug_types.defs (zone_name_t)
(zone_name_array_t, zone_info_t, zone_info_array_t): Remove types.
(cache_info_t, cache_info_array_t): New types.
* include/mach_debug/mach_debug_types.h: Replace #include
<mach_debug/zone_info.h> with <mach_debug/slab_info.h>.
* ipc/ipc_entry.c: Replace zalloc header, types and function calls with
their slab counterparts.
* ipc/ipc_entry.h: Likewise.
* ipc/ipc_init.c: Likewise.
* ipc/ipc_marequest.c: Likewise.
* ipc/ipc_object.c: Likewise.
* ipc/ipc_object.h: Likewise.
* ipc/ipc_space.c: Likewise.
* ipc/ipc_space.h: Likewise.
* ipc/ipc_table.c (kalloc_map): Remove extern declaration.
* kern/act.c: Replace zalloc header, types and function calls with their
slab counterparts.
* kern/kalloc.h: Add #include <vm/vm_types.h>.
(MINSIZE): Remove definition.
(kalloc_map): Add extern declaration.
(kget): Remove prototype.
* kern/mach_clock.c: Adjust comment.
* kern/processor.c: Replace zalloc header, types and function calls with
their slab counterparts.
* kern/startup.c: Remove #include <kernel/zalloc.h>.
* kern/task.c: Replace zalloc header, types and function calls with
their slab counterparts.
* kern/thread.c: Likewise.
* vm/memory_object_proxy.c: Likewise.
* vm/vm_external.c: Likewise.
* vm/vm_fault.c: Likewise.
* vm/vm_init.c: Likewise.
* vm/vm_map.c: Likewise.
* vm/vm_object.c: Likewise.
* vm/vm_page.h: Remove #include <kernel/zalloc.h>.
* vm/vm_pageout.c: Replace zalloc header, types and function calls with
their slab counterparts.
* vm/vm_resident.c: Likewise.
(zdata, zdata_size): Remove declarations.
(vm_page_bootstrap): Don't steal memory for the zone system.

1 files changed, 16 insertions, 22 deletions

diff --git a/device/ds_routines.c b/device/ds_routines.c
index d4a08fb..f0f8c59 100644
--- a/device/ds_routines.c
+++ b/device/ds_routines.c
@@ -73,7 +73,7 @@
 #include <kern/debug.h>
 #include <kern/printf.h>
 #include <kern/queue.h>
-#include <kern/zalloc.h>
+#include <kern/slab.h>
 #include <kern/thread.h>
 #include <kern/task.h>
 #include <kern/sched_prim.h>
@@ -855,7 +855,7 @@ device_write_get(ior, wait)
 	 */
 	if (ior->io_op & IO_INBAND) {
 	    assert(ior->io_count <= sizeof (io_buf_ptr_inband_t));
-	    new_addr = zalloc(io_inband_zone);
+	    new_addr = kmem_cache_alloc(&io_inband_cache);
 	    memcpy((void*)new_addr, ior->io_data, ior->io_count);
 	    ior->io_data = (io_buf_ptr_t)new_addr;
 	    ior->io_alloc_size = sizeof (io_buf_ptr_inband_t);
@@ -935,7 +935,7 @@ device_write_dealloc(ior)
 	 * Inband case.
 	 */
 	if (ior->io_op & IO_INBAND) {
-	    zfree(io_inband_zone, (vm_offset_t)ior->io_data);
+	    kmem_cache_free(&io_inband_cache, (vm_offset_t)ior->io_data);
 
 	    return (TRUE);
 	}
@@ -1245,7 +1245,7 @@ kern_return_t device_read_alloc(ior, size)
 	    return (KERN_SUCCESS);
 
 	if (ior->io_op & IO_INBAND) {
-	    ior->io_data = (io_buf_ptr_t) zalloc(io_inband_zone);
+	    ior->io_data = (io_buf_ptr_t) kmem_cache_alloc(&io_inband_cache);
 	    ior->io_alloc_size = sizeof(io_buf_ptr_inband_t);
 	} else {
 	    size = round_page(size);
@@ -1338,7 +1338,7 @@ boolean_t ds_read_done(ior)
 	if (ior->io_count != 0) {
 	    if (ior->io_op & IO_INBAND) {
 		if (ior->io_alloc_size > 0)
-		    zfree(io_inband_zone, (vm_offset_t)ior->io_data);
+		    kmem_cache_free(&io_inband_cache, (vm_offset_t)ior->io_data);
 	    } else {
 		register vm_offset_t	end_alloc;
 
@@ -1575,11 +1575,8 @@ void mach_device_init()
 	 */
 	device_io_map->wait_for_space = TRUE;
 
-	io_inband_zone = zinit(sizeof(io_buf_ptr_inband_t), 0,
-			    1000 * sizeof(io_buf_ptr_inband_t),
-			    10 * sizeof(io_buf_ptr_inband_t),
-			    FALSE,
-			    "io inband read buffers");
+	kmem_cache_init(&io_inband_cache, "io_buf_ptr_inband",
+			sizeof(io_buf_ptr_inband_t), 0, NULL, NULL, NULL, 0);
 
 	mach_device_trap_init();
 }
@@ -1615,7 +1612,7 @@ void iowait(ior)
  */
 #define IOTRAP_REQSIZE 2048
 
-zone_t io_trap_zone;
+struct kmem_cache io_trap_cache;
 
 /*
  * Initialization.  Called from mach_device_init().
@@ -1623,24 +1620,21 @@ zone_t io_trap_zone;
 static void
 mach_device_trap_init(void)
 {
-	io_trap_zone = zinit(IOTRAP_REQSIZE, 0,
-			     256 * IOTRAP_REQSIZE,
-			     16 * IOTRAP_REQSIZE,
-			     FALSE,
-			     "wired device trap buffers");
+	kmem_cache_init(&io_trap_cache, "io_req", IOTRAP_REQSIZE, 0,
+			NULL, NULL, NULL, 0);
 }
 
 /*
  * Allocate an io_req_t.
- * Currently zalloc's from io_trap_zone.
+ * Currently allocates from io_trap_cache.
  *
- * Could have lists of different size zones.
+ * Could have lists of different size caches.
  * Could call a device-specific routine.
  */
 io_req_t
 ds_trap_req_alloc(mach_device_t device, vm_size_t data_size)
 {
-	return (io_req_t) zalloc(io_trap_zone);
+	return (io_req_t) kmem_cache_alloc(&io_trap_cache);
 }
 
 /*
@@ -1656,7 +1650,7 @@ ds_trap_write_done(io_req_t ior)
 	/*
 	 * Should look at reply port and maybe send a message.
 	 */
-	zfree(io_trap_zone, (vm_offset_t) ior);
+	kmem_cache_free(&io_trap_cache, (vm_offset_t) ior);
 
 	/*
 	 * Give up device reference from ds_write_trap.
@@ -1732,7 +1726,7 @@ device_write_trap (mach_device_t device, dev_mode_t mode,
 	 */
 	mach_device_deallocate(device);
 
-	zfree(io_trap_zone, (vm_offset_t) ior);
+	kmem_cache_free(&io_trap_cache, (vm_offset_t) ior);
 	return (result);
 }
 
@@ -1823,7 +1817,7 @@ device_writev_trap (mach_device_t device, dev_mode_t mode,
 	 */
 	mach_device_deallocate(device);
 
-	zfree(io_trap_zone, (vm_offset_t) ior);
+	kmem_cache_free(&io_trap_cache, (vm_offset_t) ior);
 	return (result);
 }