Adjust VM initialization

Unlike the zone allocator, the slab code can't be fed with an initial
chunk of memory. Some VM objects used early during startup now have to
be statically allocated, and kernel map entries need a special path
to avoid recursion when being allocated.

* vm/vm_map.c (vm_submap_object_store): New variable.
(vm_submap_object): Point to vm_submap_object_store.
(kentry_data_size): Initialize to arbitrary value.
(kentry_count): Remove variable.
(kentry_pagealloc): New function.
(vm_map_setup): Likewise.
(vm_map_create): Replace initialization with a call to vm_map_setup().
* vm/vm_map.h (vm_map_setup): New prototype.
* vm/vm_kern.c (kernel_map_store): New variable.
(kernel_map): Point to kernel_map_store.
(kmem_suballoc): Remove function. Replaced with...
(kmem_submap): New function.
(kmem_init): Call vm_map_setup() instead of vm_map_create().
* vm/vm_kern.h (kmem_suballoc): Remove prototype.
(kmem_submap): New prototype.
* vm/vm_object.c (kernel_object_store): New variable.
(kernel_object): Point to kernel_object_store.
(vm_object_template): Change type from vm_object_t to struct vm_object.
(_vm_object_setup): New function.
(_vm_object_allocate): Replace initialization with a call to
_vm_object_setup().
(vm_object_bootstrap): Don't allocate vm_object_template, and use it as
a structure instead of a pointer. Initialize kernel_object and
vm_submap_object with _vm_object_setup() instead of
_vm_object_allocate().
* vm/vm_resident.c (vm_page_bootstrap): Don't initialize
kentry_data_size.
* device/ds_routines.c (device_io_map_store): New variable.
(device_io_map): Point to device_io_map_store.
(mach_device_init): Call kmem_submap() instead of kmem_suballoc().
* ipc/ipc_init.c (ipc_kernel_map_store): New variable.
(ipc_kernel_map): Point to ipc_kernel_map_store.

1 files changed, 46 insertions, 41 deletions

diff --git a/vm/vm_object.c b/vm/vm_object.c
index 1c6e431..d80124a 100644
--- a/vm/vm_object.c
+++ b/vm/vm_object.c
@@ -147,7 +147,8 @@ struct kmem_cache	vm_object_cache; /* vm backing store cache */
  *	All wired-down kernel memory belongs to a single virtual
  *	memory object (kernel_object) to avoid wasting data structures.
  */
-vm_object_t	kernel_object;
+static struct vm_object	kernel_object_store;
+vm_object_t		kernel_object = &kernel_object_store;
 
 /*
  *	Virtual memory objects that are not referenced by
@@ -198,7 +199,7 @@ decl_simple_lock_data(,vm_object_cached_lock_data)
  *	object structure, be sure to add initialization
  *	(see vm_object_init).
  */
-vm_object_t	vm_object_template;
+struct vm_object	vm_object_template;
 
 /*
  *	vm_object_allocate:
@@ -206,6 +207,16 @@ vm_object_t	vm_object_template;
  *	Returns a new object with the given size.
  */
 
+static void _vm_object_setup(
+	vm_object_t	object,
+	vm_size_t	size)
+{
+	*object = vm_object_template;
+	queue_init(&object->memq);
+	vm_object_lock_init(object);
+	object->size = size;
+}
+
 vm_object_t _vm_object_allocate(
 	vm_size_t		size)
 {
@@ -213,10 +224,7 @@ vm_object_t _vm_object_allocate(
 
 	object = (vm_object_t) kmem_cache_alloc(&vm_object_cache);
 
-	*object = *vm_object_template;
-	queue_init(&object->memq);
-	vm_object_lock_init(object);
-	object->size = size;
+	_vm_object_setup(object, size);
 
 	return object;
 }
@@ -254,53 +262,50 @@ void vm_object_bootstrap(void)
 	 *	Fill in a template object, for quick initialization
 	 */
 
-	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;
-	vm_object_template->size = 0;
-	vm_object_template->resident_page_count = 0;
-	vm_object_template->copy = VM_OBJECT_NULL;
-	vm_object_template->shadow = VM_OBJECT_NULL;
-	vm_object_template->shadow_offset = (vm_offset_t) 0;
+	vm_object_template.ref_count = 1;
+	vm_object_template.size = 0;
+	vm_object_template.resident_page_count = 0;
+	vm_object_template.copy = VM_OBJECT_NULL;
+	vm_object_template.shadow = VM_OBJECT_NULL;
+	vm_object_template.shadow_offset = (vm_offset_t) 0;
 
-	vm_object_template->pager = IP_NULL;
-	vm_object_template->paging_offset = 0;
-	vm_object_template->pager_request = PAGER_REQUEST_NULL;
-	vm_object_template->pager_name = IP_NULL;
+	vm_object_template.pager = IP_NULL;
+	vm_object_template.paging_offset = 0;
+	vm_object_template.pager_request = PAGER_REQUEST_NULL;
+	vm_object_template.pager_name = IP_NULL;
 
-	vm_object_template->pager_created = FALSE;
-	vm_object_template->pager_initialized = FALSE;
-	vm_object_template->pager_ready = FALSE;
+	vm_object_template.pager_created = FALSE;
+	vm_object_template.pager_initialized = FALSE;
+	vm_object_template.pager_ready = FALSE;
 
-	vm_object_template->copy_strategy = MEMORY_OBJECT_COPY_NONE;
+	vm_object_template.copy_strategy = MEMORY_OBJECT_COPY_NONE;
 		/* ignored if temporary, will be reset before
 		 * permanent object becomes ready */
-	vm_object_template->use_shared_copy = FALSE;
-	vm_object_template->shadowed = FALSE;
-
-	vm_object_template->absent_count = 0;
-	vm_object_template->all_wanted = 0; /* all bits FALSE */
-
-	vm_object_template->paging_in_progress = 0;
-	vm_object_template->can_persist = FALSE;
-	vm_object_template->internal = TRUE;
-	vm_object_template->temporary = TRUE;
-	vm_object_template->alive = TRUE;
-	vm_object_template->lock_in_progress = FALSE;
-	vm_object_template->lock_restart = FALSE;
-	vm_object_template->use_old_pageout = TRUE; /* XXX change later */
-	vm_object_template->last_alloc = (vm_offset_t) 0;
+	vm_object_template.use_shared_copy = FALSE;
+	vm_object_template.shadowed = FALSE;
+
+	vm_object_template.absent_count = 0;
+	vm_object_template.all_wanted = 0; /* all bits FALSE */
+
+	vm_object_template.paging_in_progress = 0;
+	vm_object_template.can_persist = FALSE;
+	vm_object_template.internal = TRUE;
+	vm_object_template.temporary = TRUE;
+	vm_object_template.alive = TRUE;
+	vm_object_template.lock_in_progress = FALSE;
+	vm_object_template.lock_restart = FALSE;
+	vm_object_template.use_old_pageout = TRUE; /* XXX change later */
+	vm_object_template.last_alloc = (vm_offset_t) 0;
 
 #if	MACH_PAGEMAP
-	vm_object_template->existence_info = VM_EXTERNAL_NULL;
+	vm_object_template.existence_info = VM_EXTERNAL_NULL;
 #endif	/* MACH_PAGEMAP */
 
 		/*
 	 *	Initialize the "kernel object"
 	 */
 
-	kernel_object = _vm_object_allocate(
+	_vm_object_setup(kernel_object,
 		VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS);
 
 	/*
@@ -308,7 +313,7 @@ void vm_object_bootstrap(void)
 	 *	kernel object so that no limit is imposed on submap sizes.
 	 */
 
-	vm_submap_object = _vm_object_allocate(
+	_vm_object_setup(vm_submap_object,
 		VM_MAX_KERNEL_ADDRESS - VM_MIN_KERNEL_ADDRESS);
 
 #if	MACH_PAGEMAP