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.

2 files changed, 15 insertions, 16 deletions

diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index 9f34f2d..94d2e9c 100644
--- a/i386/intel/pmap.c
+++ b/i386/intel/pmap.c
@@ -63,7 +63,7 @@
 #include <kern/debug.h>
 #include <kern/printf.h>
 #include <kern/thread.h>
-#include <kern/zalloc.h>
+#include <kern/slab.h>
 
 #include <kern/lock.h>
 
@@ -113,7 +113,7 @@ pv_entry_t	pv_head_table;		/* array of entries, one per page */
 /*
  *	pv_list entries are kept on a list that can only be accessed
  *	with the pmap system locked (at SPLVM, not in the cpus_active set).
- *	The list is refilled from the pv_list_zone if it becomes empty.
+ *	The list is refilled from the pv_list_cache if it becomes empty.
  */
 pv_entry_t	pv_free_list;		/* free list at SPLVM */
 decl_simple_lock_data(, pv_free_list_lock)
@@ -133,7 +133,7 @@ decl_simple_lock_data(, pv_free_list_lock)
 	simple_unlock(&pv_free_list_lock); \
 }
 
-zone_t		pv_list_zone;		/* zone of pv_entry structures */
+struct kmem_cache	pv_list_cache;		/* cache of pv_entry structures */
 
 /*
  *	Each entry in the pv_head_table is locked by a bit in the
@@ -400,7 +400,7 @@ struct pmap_update_list	cpu_update_list[NCPUS];
 struct pmap	kernel_pmap_store;
 pmap_t		kernel_pmap;
 
-struct zone	*pmap_zone;		/* zone of pmap structures */
+struct kmem_cache	pmap_cache;		/* cache of pmap structures */
 
 int		pmap_debug = 0;		/* flag for debugging prints */
 
@@ -937,13 +937,13 @@ void pmap_init()
 	pmap_phys_attributes = (char *) addr;
 
 	/*
-	 *	Create the zone of physical maps,
+	 *	Create the cache of physical maps,
 	 *	and of the physical-to-virtual entries.
 	 */
 	s = (vm_size_t) sizeof(struct pmap);
-	pmap_zone = zinit(s, 0, 400*s, 4096, 0, "pmap"); /* XXX */
+	kmem_cache_init(&pmap_cache, "pmap", s, 0, NULL, NULL, NULL, 0);
 	s = (vm_size_t) sizeof(struct pv_entry);
-	pv_list_zone = zinit(s, 0, 10000*s, 4096, 0, "pv_list"); /* XXX */
+	kmem_cache_init(&pv_list_cache, "pv_entry", s, 0, NULL, NULL, NULL, 0);
 
 #if	NCPUS > 1
 	/*
@@ -1009,7 +1009,7 @@ pmap_page_table_page_alloc()
 
 	/*
 	 *	We cannot allocate the pmap_object in pmap_init,
-	 *	because it is called before the zone package is up.
+	 *	because it is called before the cache package is up.
 	 *	Allocate it now if it is missing.
 	 */
 	if (pmap_object == VM_OBJECT_NULL)
@@ -1113,11 +1113,11 @@ pmap_t pmap_create(size)
 	}
 
 /*
- *	Allocate a pmap struct from the pmap_zone.  Then allocate
- *	the page descriptor table from the pd_zone.
+ *	Allocate a pmap struct from the pmap_cache.  Then allocate
+ *	the page descriptor table.
  */
 
-	p = (pmap_t) zalloc(pmap_zone);
+	p = (pmap_t) kmem_cache_alloc(&pmap_cache);
 	if (p == PMAP_NULL)
 		panic("pmap_create");
 
@@ -1232,7 +1232,7 @@ void pmap_destroy(p)
 #endif	/* MACH_XEN */
 	kmem_free(kernel_map, (vm_offset_t)p->pdpbase, INTEL_PGBYTES);
 #endif	/* PAE */
-	zfree(pmap_zone, (vm_offset_t) p);
+	kmem_cache_free(&pmap_cache, (vm_offset_t) p);
 }
 
 /*
@@ -1782,7 +1782,7 @@ if (pmap_debug) printf("pmap(%x, %x)\n", v, pa);
 
 	/*
 	 *	Must allocate a new pvlist entry while we're unlocked;
-	 *	zalloc may cause pageout (which will lock the pmap system).
+	 *	Allocating may cause pageout (which will lock the pmap system).
 	 *	If we determine we need a pvlist entry, we will unlock
 	 *	and allocate one.  Then we will retry, throughing away
 	 *	the allocated entry later (if we no longer need it).
@@ -1966,9 +1966,9 @@ Retry:
 			    PMAP_READ_UNLOCK(pmap, spl);
 
 			    /*
-			     * Refill from zone.
+			     * Refill from cache.
 			     */
-			    pv_e = (pv_entry_t) zalloc(pv_list_zone);
+			    pv_e = (pv_entry_t) kmem_cache_alloc(&pv_list_cache);
 			    goto Retry;
 			}
 		    }
diff --git a/i386/intel/pmap.h b/i386/intel/pmap.h
index 7ba7d2c..e02ad36 100644
--- a/i386/intel/pmap.h
+++ b/i386/intel/pmap.h
@@ -37,7 +37,6 @@
 
 #ifndef	__ASSEMBLER__
 
-#include <kern/zalloc.h>
 #include <kern/lock.h>
 #include <mach/machine/vm_param.h>
 #include <mach/vm_statistics.h>