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, 12 insertions, 21 deletions

diff --git a/device/dev_pager.c b/device/dev_pager.c
index 447781e..dc5ba73 100644
--- a/device/dev_pager.c
+++ b/device/dev_pager.c
@@ -44,7 +44,7 @@
 #include <kern/debug.h>
 #include <kern/printf.h>
 #include <kern/queue.h>
-#include <kern/zalloc.h>
+#include <kern/slab.h>
 #include <kern/kalloc.h>
 
 #include <vm/vm_page.h>
@@ -126,7 +126,7 @@ typedef struct dev_pager *dev_pager_t;
 #define	DEV_PAGER_NULL	((dev_pager_t)0)
 
 
-zone_t		dev_pager_zone;
+struct kmem_cache	dev_pager_cache;
 
 void dev_pager_reference(register dev_pager_t	ds)
 {
@@ -144,7 +144,7 @@ void dev_pager_deallocate(register dev_pager_t	ds)
 	}
 
 	simple_unlock(&ds->lock);
-	zfree(dev_pager_zone, (vm_offset_t)ds);
+	kmem_cache_free(&dev_pager_cache, (vm_offset_t)ds);
 }
 
 /*
@@ -161,7 +161,7 @@ struct dev_pager_entry {
 typedef struct dev_pager_entry *dev_pager_entry_t;
 
 queue_head_t	dev_pager_hashtable[DEV_PAGER_HASH_COUNT];
-zone_t		dev_pager_hash_zone;
+struct kmem_cache	dev_pager_hash_cache;
 decl_simple_lock_data(,
 		dev_pager_hash_lock)
 
@@ -174,13 +174,8 @@ void dev_pager_hash_init(void)
 	register vm_size_t	size;
 
 	size = sizeof(struct dev_pager_entry);
-	dev_pager_hash_zone = zinit(
-				size,
-				0,
-				size * 1000,
-				PAGE_SIZE,
-				FALSE,
-				"dev_pager port hash");
+	kmem_cache_init(&dev_pager_hash_cache, "dev_pager_entry", size, 0,
+			NULL, NULL, NULL, 0);
 	for (i = 0; i < DEV_PAGER_HASH_COUNT; i++)
 	    queue_init(&dev_pager_hashtable[i]);
 	simple_lock_init(&dev_pager_hash_lock);
@@ -192,7 +187,7 @@ void dev_pager_hash_insert(
 {
 	register dev_pager_entry_t new_entry;
 
-	new_entry = (dev_pager_entry_t) zalloc(dev_pager_hash_zone);
+	new_entry = (dev_pager_entry_t) kmem_cache_alloc(&dev_pager_hash_cache);
 	new_entry->name = name_port;
 	new_entry->pager_rec = rec;
 
@@ -220,7 +215,7 @@ void dev_pager_hash_delete(ipc_port_t	name_port)
 	}
 	simple_unlock(&dev_pager_hash_lock);
 	if (entry)
-	    zfree(dev_pager_hash_zone, (vm_offset_t)entry);
+	    kmem_cache_free(&dev_pager_hash_cache, (vm_offset_t)entry);
 }
 
 dev_pager_t dev_pager_hash_lookup(ipc_port_t	name_port)
@@ -273,7 +268,7 @@ kern_return_t	device_pager_setup(
 		return (D_SUCCESS);
 	}
 
-	d = (dev_pager_t) zalloc(dev_pager_zone);
+	d = (dev_pager_t) kmem_cache_alloc(&dev_pager_cache);
 	if (d == DEV_PAGER_NULL)
 		return (KERN_RESOURCE_SHORTAGE);
 
@@ -726,15 +721,11 @@ void device_pager_init(void)
 	register vm_size_t	size;
 
 	/*
-	 * Initialize zone of paging structures.
+	 * Initialize cache of paging structures.
 	 */
 	size = sizeof(struct dev_pager);
-	dev_pager_zone = zinit(size,
-				0,
-				(vm_size_t) size * 1000,
-				PAGE_SIZE,
-				FALSE,
-				"device pager structures");
+	kmem_cache_init(&dev_pager_cache, "dev_pager", size, 0,
+			NULL, NULL, NULL, 0);
 
 	/*
 	 *	Initialize the name port hashing stuff.