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, 8 insertions, 10 deletions

diff --git a/vm/vm_object.c b/vm/vm_object.c
index 9057973..1c6e431 100644
--- a/vm/vm_object.c
+++ b/vm/vm_object.c
@@ -47,7 +47,7 @@
 #include <kern/lock.h>
 #include <kern/queue.h>
 #include <kern/xpr.h>
-#include <kern/zalloc.h>
+#include <kern/slab.h>
 #include <vm/memory_object.h>
 #include <vm/vm_fault.h>
 #include <vm/vm_map.h>
@@ -141,7 +141,7 @@ void vm_object_deactivate_pages(vm_object_t);
  * ZZZ Continue this comment.
  */
 
-zone_t		vm_object_zone;		/* vm backing store zone */
+struct kmem_cache	vm_object_cache; /* vm backing store cache */
 
 /*
  *	All wired-down kernel memory belongs to a single virtual
@@ -211,7 +211,7 @@ vm_object_t _vm_object_allocate(
 {
 	register vm_object_t object;
 
-	object = (vm_object_t) zalloc(vm_object_zone);
+	object = (vm_object_t) kmem_cache_alloc(&vm_object_cache);
 
 	*object = *vm_object_template;
 	queue_init(&object->memq);
@@ -244,10 +244,8 @@ vm_object_t vm_object_allocate(
  */
 void vm_object_bootstrap(void)
 {
-	vm_object_zone = zinit((vm_size_t) sizeof(struct vm_object), 0,
-				round_page(512*1024),
-				round_page(12*1024),
-				0, "objects");
+	kmem_cache_init(&vm_object_cache, "vm_object",
+			sizeof(struct vm_object), 0, NULL, NULL, NULL, 0);
 
 	queue_init(&vm_object_cached_list);
 	simple_lock_init(&vm_object_cached_lock_data);
@@ -256,7 +254,7 @@ void vm_object_bootstrap(void)
 	 *	Fill in a template object, for quick initialization
 	 */
 
-	vm_object_template = (vm_object_t) zalloc(vm_object_zone);
+	vm_object_template = (vm_object_t) kmem_cache_alloc(&vm_object_cache);
 	memset(vm_object_template, 0, sizeof *vm_object_template);
 
 	vm_object_template->ref_count = 1;
@@ -660,7 +658,7 @@ void vm_object_terminate(
 	 *	Free the space for the object.
 	 */
 
-	zfree(vm_object_zone, (vm_offset_t) object);
+	kmem_cache_free(&vm_object_cache, (vm_offset_t) object);
 }
 
 /*
@@ -2618,7 +2616,7 @@ void vm_object_collapse(
 			vm_object_unlock(object);
 			if (old_name_port != IP_NULL)
 				ipc_port_dealloc_kernel(old_name_port);
-			zfree(vm_object_zone, (vm_offset_t) backing_object);
+			kmem_cache_free(&vm_object_cache, (vm_offset_t) backing_object);
 			vm_object_lock(object);
 
 			object_collapses++;