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, 29 insertions, 43 deletions

diff --git a/sys/vm/vm_pager.h b/sys/vm/vm_pager.h
index ea204a1b03bf..939b727bb4be 100644
--- a/sys/vm/vm_pager.h
+++ b/sys/vm/vm_pager.h
@@ -37,7 +37,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vm_pager.h	8.4 (Berkeley) 1/12/94
- * $Id: vm_pager.h,v 1.3 1994/08/02 07:55:36 davidg Exp $
+ * $Id: vm_pager.h,v 1.4 1994/10/09 01:52:17 phk Exp $
  */
 
 /*
@@ -50,13 +50,12 @@
 
 TAILQ_HEAD(pagerlst, pager_struct);
 
-struct	pager_struct {
+struct pager_struct {
 	TAILQ_ENTRY(pager_struct) pg_list;	/* links for list management */
-	caddr_t			  pg_handle;	/* ext. handle (vp, dev, fp) */
-	int			  pg_type;	/* type of pager */
-	int			  pg_flags;	/* flags */
-	struct pagerops		  *pg_ops;	/* pager operations */
-	void			  *pg_data;	/* private pager data */
+	caddr_t pg_handle;		/* ext. handle (vp, dev, fp) */
+	int pg_type;			/* type of pager */
+	struct pagerops *pg_ops;	/* pager operations */
+	void *pg_data;			/* private pager data */
 };
 
 /* pager types */
@@ -69,23 +68,15 @@ struct	pager_struct {
 #define PG_CLUSTERGET	1
 #define PG_CLUSTERPUT	2
 
-struct	pagerops {
-	void		(*pgo_init)		/* Initialize pager. */
-			    __P((void));
-	vm_pager_t	(*pgo_alloc)		/* Allocate pager. */
-			    __P((caddr_t, vm_size_t, vm_prot_t, vm_offset_t));
-	void		(*pgo_dealloc)		/* Disassociate. */
-			    __P((vm_pager_t));
-	int		(*pgo_getpage)
-			    __P((vm_pager_t, vm_page_t, boolean_t));
-	int		(*pgo_getpages)		/* Get (read) page. */
-			    __P((vm_pager_t, vm_page_t *, int, int, boolean_t));
-	int		(*pgo_putpage)
-			    __P((vm_pager_t, vm_page_t, boolean_t));
-	int		(*pgo_putpages)		/* Put (write) page. */
-			    __P((vm_pager_t, vm_page_t *, int, boolean_t, int *));
-	boolean_t  	(*pgo_haspage)		/* Does pager have page? */
-			    __P((vm_pager_t, vm_offset_t));
+struct pagerops {
+	void (*pgo_init) __P((void));		/* Initialize pager. */
+	vm_pager_t(*pgo_alloc) __P((caddr_t, vm_size_t, vm_prot_t, vm_offset_t));	/* Allocate pager. */
+	void (*pgo_dealloc) __P((vm_pager_t));	/* Disassociate. */
+	int (*pgo_getpage) __P((vm_pager_t, vm_page_t, boolean_t));
+	int (*pgo_getpages) __P((vm_pager_t, vm_page_t *, int, int, boolean_t));	/* Get (read) page. */
+	int (*pgo_putpage) __P((vm_pager_t, vm_page_t, boolean_t));
+	int (*pgo_putpages) __P((vm_pager_t, vm_page_t *, int, boolean_t, int *)); /* Put (write) page. */
+	boolean_t(*pgo_haspage) __P((vm_pager_t, vm_offset_t)); /* Does pager have page? */
 };
 
 #define	VM_PAGER_ALLOC(h, s, p, o)		(*(pg)->pg_ops->pgo_alloc)(h, s, p, o)
@@ -115,24 +106,19 @@ struct	pagerops {
 #ifdef KERNEL
 extern struct pagerops *dfltpagerops;
 
-vm_pager_t	 vm_pager_allocate
-		    __P((int, caddr_t, vm_size_t, vm_prot_t, vm_offset_t));
-vm_page_t	 vm_pager_atop __P((vm_offset_t));
-void		 vm_pager_deallocate __P((vm_pager_t));
-int		 vm_pager_get_pages
-		    __P((vm_pager_t, vm_page_t *, int, int, boolean_t));
-boolean_t	 vm_pager_has_page __P((vm_pager_t, vm_offset_t));
-void		 vm_pager_init __P((void));
-vm_pager_t	 vm_pager_lookup __P((struct pagerlst *, caddr_t));
-vm_offset_t	 vm_pager_map_pages __P((vm_page_t *, int, boolean_t));
-vm_offset_t	 vm_pager_map_page __P((vm_page_t));
-int		 vm_pager_put_pages
-		    __P((vm_pager_t, vm_page_t *, int, boolean_t, int *));
-void		 vm_pager_sync __P((void));
-void		 vm_pager_unmap_pages __P((vm_offset_t, int));
-void		 vm_pager_unmap_page __P((vm_offset_t));
-
-#define vm_pager_cancluster(p, b)	((p)->pg_flags & (b))
+vm_pager_t vm_pager_allocate __P((int, caddr_t, vm_size_t, vm_prot_t, vm_offset_t));
+vm_page_t vm_pager_atop __P((vm_offset_t));
+void vm_pager_deallocate __P((vm_pager_t));
+int vm_pager_get_pages __P((vm_pager_t, vm_page_t *, int, int, boolean_t));
+boolean_t vm_pager_has_page __P((vm_pager_t, vm_offset_t));
+void vm_pager_init __P((void));
+vm_pager_t vm_pager_lookup __P((struct pagerlst *, caddr_t));
+vm_offset_t vm_pager_map_pages __P((vm_page_t *, int, boolean_t));
+vm_offset_t vm_pager_map_page __P((vm_page_t));
+int vm_pager_put_pages __P((vm_pager_t, vm_page_t *, int, boolean_t, int *));
+void vm_pager_sync __P((void));
+void vm_pager_unmap_pages __P((vm_offset_t, int));
+void vm_pager_unmap_page __P((vm_offset_t));
 
 /*
  * XXX compat with old interface
@@ -154,4 +140,4 @@ void		 vm_pager_unmap_page __P((vm_offset_t));
 })
 #endif
 
-#endif	/* _VM_PAGER_ */
+#endif				/* _VM_PAGER_ */