These changes embody the support of the fully coherent merged VM buffer cache,

much higher filesystem I/O performance, and much better paging performance. It
represents the culmination of over 6 months of R&D.

The majority of the merged VM/cache work is by John Dyson.

The following highlights the most significant changes. Additionally, there are
(mostly minor) changes to the various filesystem modules (nfs, msdosfs, etc) to
support the new VM/buffer scheme.

vfs_bio.c:
Significant rewrite of most of vfs_bio to support the merged VM buffer cache
scheme.  The scheme is almost fully compatible with the old filesystem
interface.  Significant improvement in the number of opportunities for write
clustering.

vfs_cluster.c, vfs_subr.c
Upgrade and performance enhancements in vfs layer code to support merged
VM/buffer cache.  Fixup of vfs_cluster to eliminate the bogus pagemove stuff.

vm_object.c:
Yet more improvements in the collapse code.  Elimination of some windows that
can cause list corruption.

vm_pageout.c:
Fixed it, it really works better now.  Somehow in 2.0, some "enhancements"
broke the code.  This code has been reworked from the ground-up.

vm_fault.c, vm_page.c, pmap.c, vm_object.c
Support for small-block filesystems with merged VM/buffer cache scheme.

pmap.c vm_map.c
Dynamic kernel VM size, now we dont have to pre-allocate excessive numbers of
kernel PTs.

vm_glue.c
Much simpler and more effective swapping code.  No more gratuitous swapping.

proc.h
Fixed the problem that the p_lock flag was not being cleared on a fork.

swap_pager.c, vnode_pager.c
Removal of old vfs_bio cruft to support the past pseudo-coherency.  Now the
code doesn't need it anymore.

machdep.c
Changes to better support the parameter values for the merged VM/buffer cache
scheme.

machdep.c, kern_exec.c, vm_glue.c
Implemented a seperate submap for temporary exec string space and another one
to contain process upages. This eliminates all map fragmentation problems
that previously existed.

ffs_inode.c, ufs_inode.c, ufs_readwrite.c
Changes for merged VM/buffer cache.  Add "bypass" support for sneaking in on
busy buffers.

Submitted by:	John Dyson and David Greenman

1 files changed, 75 insertions, 79 deletions

diff --git a/sys/vm/vm_extern.h b/sys/vm/vm_extern.h
index 74a80d5..e55a5f4 100644
--- a/sys/vm/vm_extern.h
+++ b/sys/vm/vm_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_extern.h	8.2 (Berkeley) 1/12/94
- * $Id: vm_extern.h,v 1.6 1994/09/27 18:00:26 davidg Exp $
+ * $Id: vm_extern.h,v 1.7 1994/12/30 08:02:16 bde Exp $
  */
 
 #ifndef _VM_EXTERN_H_
@@ -46,13 +46,15 @@ struct mount;
 struct vnode;
 
 #ifdef KGDB
-void		 chgkprot __P((caddr_t, int, int));
+void chgkprot __P((caddr_t, int, int));
+
 #endif
 
 /*
  * Try to get semi-meaningful wait messages into thread_sleep...
  */
 void thread_sleep_ __P((int, simple_lock_t, char *));
+
 #if __GNUC__ >= 2
 #define thread_sleep(a,b,c) thread_sleep_((a), (b), __FUNCTION__)
 #else
@@ -61,83 +63,77 @@ void thread_sleep_ __P((int, simple_lock_t, char *));
 
 #ifdef KERNEL
 #ifdef TYPEDEF_FOR_UAP
-int		 getpagesize __P((struct proc *p, void *, int *));
-int		 madvise __P((struct proc *, void *, int *));
-int		 mincore __P((struct proc *, void *, int *));
-int		 mprotect __P((struct proc *, void *, int *));
-int		 msync __P((struct proc *, void *, int *));
-int		 munmap __P((struct proc *, void *, int *));
-int		 obreak __P((struct proc *, void *, int *));
-int		 sbrk __P((struct proc *, void *, int *));
-int		 smmap __P((struct proc *, void *, int *));
-int		 sstk __P((struct proc *, void *, int *));
+int getpagesize __P((struct proc * p, void *, int *));
+int madvise __P((struct proc *, void *, int *));
+int mincore __P((struct proc *, void *, int *));
+int mprotect __P((struct proc *, void *, int *));
+int msync __P((struct proc *, void *, int *));
+int munmap __P((struct proc *, void *, int *));
+int obreak __P((struct proc *, void *, int *));
+int sbrk __P((struct proc *, void *, int *));
+int smmap __P((struct proc *, void *, int *));
+int sstk __P((struct proc *, void *, int *));
+
 #endif
 
-void		 assert_wait __P((int, boolean_t));
-int		 grow __P((struct proc *, u_int));
-void		 iprintf __P((const char *, ...));
-int		 kernacc __P((caddr_t, int, int));
-int		 kinfo_loadavg __P((int, char *, int *, int, int *));
-int		 kinfo_meter __P((int, caddr_t, int *, int, int *));
-vm_offset_t	 kmem_alloc __P((vm_map_t, vm_size_t));
-vm_offset_t	 kmem_alloc_pageable __P((vm_map_t, vm_size_t));
-vm_offset_t	 kmem_alloc_wait __P((vm_map_t, vm_size_t));
-void		 kmem_free __P((vm_map_t, vm_offset_t, vm_size_t));
-void		 kmem_free_wakeup __P((vm_map_t, vm_offset_t, vm_size_t));
-void		 kmem_init __P((vm_offset_t, vm_offset_t));
-vm_offset_t	 kmem_malloc __P((vm_map_t, vm_size_t, boolean_t));
-vm_map_t	 kmem_suballoc __P((vm_map_t, vm_offset_t *, vm_offset_t *,
-		    vm_size_t, boolean_t));
-void		 loadav __P((struct loadavg *));
-void		 munmapfd __P((struct proc *, int));
-int		 pager_cache __P((vm_object_t, boolean_t));
-void		 sched __P((void));
-int		 svm_allocate __P((struct proc *, void *, int *));
-int		 svm_deallocate __P((struct proc *, void *, int *));
-int		 svm_inherit __P((struct proc *, void *, int *));
-int		 svm_protect __P((struct proc *, void *, int *));
-void		 swapinit __P((void));
-int		 swapon __P((struct proc *, void *, int *));
-void		 swapout __P((struct proc *));
-void		 swapout_threads __P((void));
-int		 swfree __P((struct proc *, int));
-void		 swstrategy __P((struct buf *));
-void		 thread_block __P((char *));
-void		 thread_sleep __P((int, simple_lock_t, boolean_t));
-void		 thread_wakeup __P((int));
-int		 useracc __P((caddr_t, int, int));
-int		 vm_allocate __P((vm_map_t,
-		    vm_offset_t *, vm_size_t, boolean_t));
-int		 vm_allocate_with_pager __P((vm_map_t, vm_offset_t *,
-		    vm_size_t, boolean_t, vm_pager_t, vm_offset_t, boolean_t));
-int		 vm_deallocate __P((vm_map_t, vm_offset_t, vm_size_t));
-int		 vm_fault __P((vm_map_t, vm_offset_t, vm_prot_t, boolean_t));
-void		 vm_fault_copy_entry __P((vm_map_t,
-		    vm_map_t, vm_map_entry_t, vm_map_entry_t));
-void		 vm_fault_unwire __P((vm_map_t, vm_offset_t, vm_offset_t));
-int		 vm_fault_wire __P((vm_map_t, vm_offset_t, vm_offset_t));
-int		 vm_fork __P((struct proc *, struct proc *, int));
-int		 vm_inherit __P((vm_map_t,
-		    vm_offset_t, vm_size_t, vm_inherit_t));
-void		 vm_init_limits __P((struct proc *));
-void		 vm_mem_init __P((void));
-int		 vm_mmap __P((vm_map_t, vm_offset_t *, vm_size_t,
-		    vm_prot_t, vm_prot_t, int, caddr_t, vm_offset_t));
-vm_offset_t	 vm_page_alloc_contig __P((vm_offset_t, vm_offset_t,
-		    vm_offset_t, vm_offset_t));
-int		 vm_protect __P((vm_map_t,
-		    vm_offset_t, vm_size_t, boolean_t, vm_prot_t));
-void		 vm_set_page_size __P((void));
-void		 vmmeter __P((void));
-struct vmspace	*vmspace_alloc __P((vm_offset_t, vm_offset_t, int));
-struct vmspace	*vmspace_fork __P((struct vmspace *));
-void		 vmspace_free __P((struct vmspace *));
-void		 vmtotal __P((struct vmtotal *));
-void		 vnode_pager_setsize __P((struct vnode *, u_long));
-void		 vnode_pager_umount __P((struct mount *));
-boolean_t	 vnode_pager_uncache __P((struct vnode *));
-void		 vslock __P((caddr_t, u_int));
-void		 vsunlock __P((caddr_t, u_int, int));
-#endif /* KERNEL */
+void assert_wait __P((int, boolean_t));
+int grow __P((struct proc *, u_int));
+void iprintf __P((const char *,...));
+int kernacc __P((caddr_t, int, int));
+int kinfo_loadavg __P((int, char *, int *, int, int *));
+int kinfo_meter __P((int, caddr_t, int *, int, int *));
+vm_offset_t kmem_alloc __P((vm_map_t, vm_size_t));
+vm_offset_t kmem_alloc_pageable __P((vm_map_t, vm_size_t));
+vm_offset_t kmem_alloc_wait __P((vm_map_t, vm_size_t));
+void kmem_free __P((vm_map_t, vm_offset_t, vm_size_t));
+void kmem_free_wakeup __P((vm_map_t, vm_offset_t, vm_size_t));
+void kmem_init __P((vm_offset_t, vm_offset_t));
+vm_offset_t kmem_malloc __P((vm_map_t, vm_size_t, boolean_t));
+vm_map_t kmem_suballoc __P((vm_map_t, vm_offset_t *, vm_offset_t *, vm_size_t, boolean_t));
+void loadav __P((struct loadavg *));
+void munmapfd __P((struct proc *, int));
+int pager_cache __P((vm_object_t, boolean_t));
+void sched __P((void));
+int svm_allocate __P((struct proc *, void *, int *));
+int svm_deallocate __P((struct proc *, void *, int *));
+int svm_inherit __P((struct proc *, void *, int *));
+int svm_protect __P((struct proc *, void *, int *));
+void swapinit __P((void));
+int swapon __P((struct proc *, void *, int *));
+void swapout __P((struct proc *));
+void swapout_threads __P((void));
+int swfree __P((struct proc *, int));
+void swstrategy __P((struct buf *));
+void thread_block __P((char *));
+void thread_sleep __P((int, simple_lock_t, boolean_t));
+void thread_wakeup __P((int));
+int useracc __P((caddr_t, int, int));
+int vm_allocate __P((vm_map_t, vm_offset_t *, vm_size_t, boolean_t));
+int vm_allocate_with_pager __P((vm_map_t, vm_offset_t *, vm_size_t, boolean_t, vm_pager_t, vm_offset_t, boolean_t));
+int vm_deallocate __P((vm_map_t, vm_offset_t, vm_size_t));
+int vm_fault __P((vm_map_t, vm_offset_t, vm_prot_t, boolean_t));
+void vm_fault_copy_entry __P((vm_map_t, vm_map_t, vm_map_entry_t, vm_map_entry_t));
+void vm_fault_unwire __P((vm_map_t, vm_offset_t, vm_offset_t));
+int vm_fault_wire __P((vm_map_t, vm_offset_t, vm_offset_t));
+int vm_fork __P((struct proc *, struct proc *, int));
+int vm_inherit __P((vm_map_t, vm_offset_t, vm_size_t, vm_inherit_t));
+void vm_init_limits __P((struct proc *));
+void vm_mem_init __P((void));
+int vm_mmap __P((vm_map_t, vm_offset_t *, vm_size_t, vm_prot_t, vm_prot_t, int, caddr_t, vm_offset_t));
+vm_offset_t vm_page_alloc_contig __P((vm_offset_t, vm_offset_t, vm_offset_t, vm_offset_t));
+int vm_protect __P((vm_map_t, vm_offset_t, vm_size_t, boolean_t, vm_prot_t));
+void vm_set_page_size __P((void));
+void vmmeter __P((void));
+struct vmspace *vmspace_alloc __P((vm_offset_t, vm_offset_t, int));
+struct vmspace *vmspace_fork __P((struct vmspace *));
+void vmspace_free __P((struct vmspace *));
+void vmtotal __P((struct vmtotal *));
+void vnode_pager_setsize __P((struct vnode *, u_long));
+void vnode_pager_umount __P((struct mount *));
+boolean_t vnode_pager_uncache __P((struct vnode *));
+void vslock __P((caddr_t, u_int));
+void vsunlock __P((caddr_t, u_int, int));
+
+#endif				/* KERNEL */
 
-#endif /* !_VM_EXTERN_H_ */
+#endif				/* !_VM_EXTERN_H_ */