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, 13 insertions, 17 deletions

diff --git a/vm/vm_kern.c b/vm/vm_kern.c
index cfa33ff..fd46e98 100644
--- a/vm/vm_kern.c
+++ b/vm/vm_kern.c
@@ -58,7 +58,8 @@
  *	Variables exported by this module.
  */
 
-vm_map_t	kernel_map;
+static struct vm_map	kernel_map_store;
+vm_map_t		kernel_map = &kernel_map_store;
 vm_map_t	kernel_pageable_map;
 
 extern void kmem_alloc_pages();
@@ -811,27 +812,27 @@ kmem_remap_pages(object, offset, start, end, protection)
 }
 
 /*
- *	kmem_suballoc:
+ *	kmem_submap:
  *
- *	Allocates a map to manage a subrange
+ *	Initializes a map to manage a subrange
  *	of the kernel virtual address space.
  *
  *	Arguments are as follows:
  *
+ *	map		Map to initialize
  *	parent		Map to take range from
  *	size		Size of range to find
  *	min, max	Returned endpoints of map
  *	pageable	Can the region be paged
  */
 
-vm_map_t
-kmem_suballoc(parent, min, max, size, pageable)
-	vm_map_t parent;
+void
+kmem_submap(map, parent, min, max, size, pageable)
+	vm_map_t map, parent;
 	vm_offset_t *min, *max;
 	vm_size_t size;
 	boolean_t pageable;
 {
-	vm_map_t map;
 	vm_offset_t addr;
 	kern_return_t kr;
 
@@ -850,20 +851,16 @@ kmem_suballoc(parent, min, max, size, pageable)
 			  vm_submap_object, (vm_offset_t) 0, FALSE,
 			  VM_PROT_DEFAULT, VM_PROT_ALL, VM_INHERIT_DEFAULT);
 	if (kr != KERN_SUCCESS)
-		panic("kmem_suballoc");
+		panic("kmem_submap");
 
 	pmap_reference(vm_map_pmap(parent));
-	map = vm_map_create(vm_map_pmap(parent), addr, addr + size, pageable);
-	if (map == VM_MAP_NULL)
-		panic("kmem_suballoc");
-
+	vm_map_setup(map, vm_map_pmap(parent), addr, addr + size, pageable);
 	kr = vm_map_submap(parent, addr, addr + size, map);
 	if (kr != KERN_SUCCESS)
-		panic("kmem_suballoc");
+		panic("kmem_submap");
 
 	*min = addr;
 	*max = addr + size;
-	return map;
 }
 
 /*
@@ -876,9 +873,8 @@ void kmem_init(start, end)
 	vm_offset_t	start;
 	vm_offset_t	end;
 {
-	kernel_map = vm_map_create(pmap_kernel(),
-				   VM_MIN_KERNEL_ADDRESS, end,
-				   FALSE);
+	vm_map_setup(kernel_map, pmap_kernel(), VM_MIN_KERNEL_ADDRESS, end,
+		     FALSE);
 
 	/*
 	 *	Reserve virtual memory allocated up to this time.