1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Copyright (c) 1982, 1986, 1989, 1993
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms, with or without
|
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. All advertising materials mentioning features or use of this software
|
2000-03-27 20:41:17 +00:00
|
|
|
* must display the following acknowledgement:
|
1994-05-24 10:09:53 +00:00
|
|
|
* This product includes software developed by the University of
|
|
|
|
* California, Berkeley and its contributors.
|
|
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
|
|
|
*
|
|
|
|
* @(#)vm_swap.c 8.5 (Berkeley) 2/17/94
|
1999-08-28 01:08:13 +00:00
|
|
|
* $FreeBSD$
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
|
|
|
|
1998-01-25 04:13:25 +00:00
|
|
|
#include "opt_swap.h"
|
1998-01-24 02:54:56 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/systm.h>
|
1995-11-12 06:43:28 +00:00
|
|
|
#include <sys/sysproto.h>
|
1994-05-24 10:09:53 +00:00
|
|
|
#include <sys/buf.h>
|
|
|
|
#include <sys/proc.h>
|
|
|
|
#include <sys/namei.h>
|
|
|
|
#include <sys/dmap.h> /* XXX */
|
|
|
|
#include <sys/vnode.h>
|
1997-03-23 03:37:54 +00:00
|
|
|
#include <sys/fcntl.h>
|
1999-01-21 08:29:12 +00:00
|
|
|
#include <sys/blist.h>
|
1995-12-08 11:19:42 +00:00
|
|
|
#include <sys/kernel.h>
|
1999-04-10 17:54:43 +00:00
|
|
|
#include <sys/lock.h>
|
1999-08-08 18:43:05 +00:00
|
|
|
#include <sys/conf.h>
|
1999-10-04 13:09:30 +00:00
|
|
|
#include <sys/stat.h>
|
1995-03-16 18:17:34 +00:00
|
|
|
#include <vm/vm.h>
|
1995-12-07 12:48:31 +00:00
|
|
|
#include <vm/vm_extern.h>
|
1996-03-03 21:11:08 +00:00
|
|
|
#include <vm/swap_pager.h>
|
1995-03-16 18:17:34 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* Indirect driver for multi-controller paging.
|
|
|
|
*/
|
|
|
|
|
1995-05-14 03:00:10 +00:00
|
|
|
#ifndef NSWAPDEV
|
|
|
|
#define NSWAPDEV 4
|
|
|
|
#endif
|
|
|
|
static struct swdevt should_be_malloced[NSWAPDEV];
|
1995-11-20 12:20:02 +00:00
|
|
|
static struct swdevt *swdevt = should_be_malloced;
|
1999-01-21 08:29:12 +00:00
|
|
|
static int nswap; /* first block after the interleaved devs */
|
1995-11-20 12:20:02 +00:00
|
|
|
static int nswdev = NSWAPDEV;
|
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
1995-01-09 16:06:02 +00:00
|
|
|
int vm_swap_size;
|
|
|
|
|
1999-12-28 07:30:55 +00:00
|
|
|
static int swapdev_strategy __P((struct vop_strategy_args *ap));
|
|
|
|
struct vnode *swapdev_vp;
|
|
|
|
|
1999-02-25 05:37:18 +00:00
|
|
|
/*
|
1999-12-28 07:30:55 +00:00
|
|
|
* swapdev_strategy:
|
1999-02-25 05:37:18 +00:00
|
|
|
*
|
1999-12-28 07:30:55 +00:00
|
|
|
* VOP_STRATEGY() for swapdev_vp.
|
|
|
|
* Perform swap strategy interleave device selection.
|
1999-02-25 05:37:18 +00:00
|
|
|
*
|
1999-06-26 02:47:16 +00:00
|
|
|
* The bp is expected to be locked and *not* B_DONE on call.
|
1999-02-25 05:37:18 +00:00
|
|
|
*/
|
|
|
|
|
1999-12-28 07:30:55 +00:00
|
|
|
static int
|
|
|
|
swapdev_strategy(ap)
|
|
|
|
struct vop_strategy_args /* {
|
|
|
|
struct vnode *a_vp;
|
|
|
|
struct buf *a_bp;
|
|
|
|
} */ *ap;
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
1998-02-23 08:22:48 +00:00
|
|
|
int s, sz, off, seg, index;
|
1994-05-24 10:09:53 +00:00
|
|
|
register struct swdevt *sp;
|
|
|
|
struct vnode *vp;
|
1999-12-28 07:30:55 +00:00
|
|
|
struct buf *bp;
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1999-12-28 07:30:55 +00:00
|
|
|
bp = ap->a_bp;
|
1999-01-21 08:29:12 +00:00
|
|
|
sz = howmany(bp->b_bcount, PAGE_SIZE);
|
1999-12-28 07:30:55 +00:00
|
|
|
|
1999-01-21 08:29:12 +00:00
|
|
|
/*
|
|
|
|
* Convert interleaved swap into per-device swap. Note that
|
|
|
|
* the block size is left in PAGE_SIZE'd chunks (for the newswap)
|
|
|
|
* here.
|
|
|
|
*/
|
1994-05-24 10:09:53 +00:00
|
|
|
if (nswdev > 1) {
|
|
|
|
off = bp->b_blkno % dmmax;
|
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
1995-01-09 16:06:02 +00:00
|
|
|
if (off + sz > dmmax) {
|
1994-05-24 10:09:53 +00:00
|
|
|
bp->b_error = EINVAL;
|
2000-04-02 15:24:56 +00:00
|
|
|
bp->b_ioflags |= BIO_ERROR;
|
2000-04-15 05:54:02 +00:00
|
|
|
bufdone(bp);
|
1999-12-28 07:30:55 +00:00
|
|
|
return 0;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
seg = bp->b_blkno / dmmax;
|
|
|
|
index = seg % nswdev;
|
|
|
|
seg /= nswdev;
|
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
1995-01-09 16:06:02 +00:00
|
|
|
bp->b_blkno = seg * dmmax + off;
|
1999-01-21 08:29:12 +00:00
|
|
|
} else {
|
1994-05-24 10:09:53 +00:00
|
|
|
index = 0;
|
1999-01-21 08:29:12 +00:00
|
|
|
}
|
1994-05-24 10:09:53 +00:00
|
|
|
sp = &swdevt[index];
|
1995-05-18 05:09:54 +00:00
|
|
|
if (bp->b_blkno + sz > sp->sw_nblks) {
|
|
|
|
bp->b_error = EINVAL;
|
2000-04-02 15:24:56 +00:00
|
|
|
bp->b_ioflags |= BIO_ERROR;
|
2000-04-15 05:54:02 +00:00
|
|
|
bufdone(bp);
|
1999-12-28 07:30:55 +00:00
|
|
|
return 0;
|
1995-05-18 05:09:54 +00:00
|
|
|
}
|
1999-07-17 19:59:55 +00:00
|
|
|
bp->b_dev = sp->sw_device;
|
1994-05-24 10:09:53 +00:00
|
|
|
if (sp->sw_vp == NULL) {
|
|
|
|
bp->b_error = ENODEV;
|
2000-04-02 15:24:56 +00:00
|
|
|
bp->b_ioflags |= BIO_ERROR;
|
2000-04-15 05:54:02 +00:00
|
|
|
bufdone(bp);
|
1999-12-28 07:30:55 +00:00
|
|
|
return 0;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
1999-01-21 08:29:12 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Convert from PAGE_SIZE'd to DEV_BSIZE'd chunks for the actual I/O
|
|
|
|
*/
|
|
|
|
bp->b_blkno = ctodb(bp->b_blkno);
|
|
|
|
|
1997-08-31 07:32:39 +00:00
|
|
|
vhold(sp->sw_vp);
|
1998-02-23 08:22:48 +00:00
|
|
|
s = splvm();
|
2000-03-20 10:44:49 +00:00
|
|
|
if (bp->b_iocmd == BIO_WRITE) {
|
1994-10-09 01:52:19 +00:00
|
|
|
vp = bp->b_vp;
|
|
|
|
if (vp) {
|
1994-05-24 10:09:53 +00:00
|
|
|
vp->v_numoutput--;
|
|
|
|
if ((vp->v_flag & VBWAIT) && vp->v_numoutput <= 0) {
|
|
|
|
vp->v_flag &= ~VBWAIT;
|
NOTE: libkvm, w, ps, 'top', and any other utility which depends on struct
proc or any VM system structure will have to be rebuilt!!!
Much needed overhaul of the VM system. Included in this first round of
changes:
1) Improved pager interfaces: init, alloc, dealloc, getpages, putpages,
haspage, and sync operations are supported. The haspage interface now
provides information about clusterability. All pager routines now take
struct vm_object's instead of "pagers".
2) Improved data structures. In the previous paradigm, there is constant
confusion caused by pagers being both a data structure ("allocate a
pager") and a collection of routines. The idea of a pager structure has
escentially been eliminated. Objects now have types, and this type is
used to index the appropriate pager. In most cases, items in the pager
structure were duplicated in the object data structure and thus were
unnecessary. In the few cases that remained, a un_pager structure union
was created in the object to contain these items.
3) Because of the cleanup of #1 & #2, a lot of unnecessary layering can now
be removed. For instance, vm_object_enter(), vm_object_lookup(),
vm_object_remove(), and the associated object hash list were some of the
things that were removed.
4) simple_lock's removed. Discussion with several people reveals that the
SMP locking primitives used in the VM system aren't likely the mechanism
that we'll be adopting. Even if it were, the locking that was in the code
was very inadequate and would have to be mostly re-done anyway. The
locking in a uni-processor kernel was a no-op but went a long way toward
making the code difficult to read and debug.
5) Places that attempted to kludge-up the fact that we don't have kernel
thread support have been fixed to reflect the reality that we are really
dealing with processes, not threads. The VM system didn't have complete
thread support, so the comments and mis-named routines were just wrong.
We now use tsleep and wakeup directly in the lock routines, for instance.
6) Where appropriate, the pagers have been improved, especially in the
pager_alloc routines. Most of the pager_allocs have been rewritten and
are now faster and easier to maintain.
7) The pagedaemon pageout clustering algorithm has been rewritten and
now tries harder to output an even number of pages before and after
the requested page. This is sort of the reverse of the ideal pagein
algorithm and should provide better overall performance.
8) Unnecessary (incorrect) casts to caddr_t in calls to tsleep & wakeup
have been removed. Some other unnecessary casts have also been removed.
9) Some almost useless debugging code removed.
10) Terminology of shadow objects vs. backing objects straightened out.
The fact that the vm_object data structure escentially had this
backwards really confused things. The use of "shadow" and "backing
object" throughout the code is now internally consistent and correct
in the Mach terminology.
11) Several minor bug fixes, including one in the vm daemon that caused
0 RSS objects to not get purged as intended.
12) A "default pager" has now been created which cleans up the transition
of objects to the "swap" type. The previous checks throughout the code
for swp->pg_data != NULL were really ugly. This change also provides
the rudiments for future backing of "anonymous" memory by something
other than the swap pager (via the vnode pager, for example), and it
allows the decision about which of these pagers to use to be made
dynamically (although will need some additional decision code to do
this, of course).
13) (dyson) MAP_COPY has been deprecated and the corresponding "copy
object" code has been removed. MAP_COPY was undocumented and non-
standard. It was furthermore broken in several ways which caused its
behavior to degrade to MAP_PRIVATE. Binaries that use MAP_COPY will
continue to work correctly, but via the slightly different semantics
of MAP_PRIVATE.
14) (dyson) Sharing maps have been removed. It's marginal usefulness in a
threads design can be worked around in other ways. Both #12 and #13
were done to simplify the code and improve readability and maintain-
ability. (As were most all of these changes)
TODO:
1) Rewrite most of the vnode pager to use VOP_GETPAGES/PUTPAGES. Doing
this will reduce the vnode pager to a mere fraction of its current size.
2) Rewrite vm_fault and the swap/vnode pagers to use the clustering
information provided by the new haspage pager interface. This will
substantially reduce the overhead by eliminating a large number of
VOP_BMAP() calls. The VOP_BMAP() filesystem interface should be
improved to provide both a "behind" and "ahead" indication of
contiguousness.
3) Implement the extended features of pager_haspage in swap_pager_haspage().
It currently just says 0 pages ahead/behind.
4) Re-implement the swap device (swstrategy) in a more elegant way, perhaps
via a much more general mechanism that could also be used for disk
striping of regular filesystems.
5) Do something to improve the architecture of vm_object_collapse(). The
fact that it makes calls into the swap pager and knows too much about
how the swap pager operates really bothers me. It also doesn't allow
for collapsing of non-swap pager objects ("unnamed" objects backed by
other pagers).
1995-07-13 08:48:48 +00:00
|
|
|
wakeup(&vp->v_numoutput);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
sp->sw_vp->v_numoutput++;
|
|
|
|
}
|
1999-01-21 08:29:12 +00:00
|
|
|
pbreassignbuf(bp, sp->sw_vp);
|
1998-02-23 08:22:48 +00:00
|
|
|
splx(s);
|
2000-03-20 11:29:10 +00:00
|
|
|
BUF_STRATEGY(bp);
|
1999-12-28 07:30:55 +00:00
|
|
|
return 0;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
1999-12-28 07:30:55 +00:00
|
|
|
/*
|
|
|
|
* Create a special vnode op vector for swapdev_vp - we only use
|
|
|
|
* VOP_STRATEGY(), everything else returns an error.
|
|
|
|
*/
|
|
|
|
vop_t **swapdev_vnodeop_p;
|
|
|
|
static struct vnodeopv_entry_desc swapdev_vnodeop_entries[] = {
|
|
|
|
{ &vop_default_desc, (vop_t *) vop_defaultop },
|
|
|
|
{ &vop_strategy_desc, (vop_t *) swapdev_strategy },
|
|
|
|
{ NULL, NULL }
|
|
|
|
};
|
|
|
|
static struct vnodeopv_desc swapdev_vnodeop_opv_desc =
|
|
|
|
{ &swapdev_vnodeop_p, swapdev_vnodeop_entries };
|
|
|
|
|
|
|
|
VNODEOP_SET(swapdev_vnodeop_opv_desc);
|
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/*
|
|
|
|
* System call swapon(name) enables swapping on device name,
|
|
|
|
* which must be in the swdevsw. Return EBUSY
|
|
|
|
* if already swapping on this device.
|
|
|
|
*/
|
1995-11-12 06:43:28 +00:00
|
|
|
#ifndef _SYS_SYSPROTO_H_
|
1994-05-24 10:09:53 +00:00
|
|
|
struct swapon_args {
|
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
1995-01-09 16:06:02 +00:00
|
|
|
char *name;
|
1994-05-24 10:09:53 +00:00
|
|
|
};
|
1995-11-12 06:43:28 +00:00
|
|
|
#endif
|
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
1995-01-09 16:06:02 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
/* ARGSUSED */
|
|
|
|
int
|
1997-11-06 19:29:57 +00:00
|
|
|
swapon(p, uap)
|
1994-05-24 10:09:53 +00:00
|
|
|
struct proc *p;
|
|
|
|
struct swapon_args *uap;
|
|
|
|
{
|
|
|
|
register struct vnode *vp;
|
|
|
|
struct nameidata nd;
|
1995-11-20 12:20:02 +00:00
|
|
|
int error;
|
1994-05-24 10:09:53 +00:00
|
|
|
|
1999-04-27 11:18:52 +00:00
|
|
|
error = suser(p);
|
1994-10-09 01:52:19 +00:00
|
|
|
if (error)
|
1994-05-24 10:09:53 +00:00
|
|
|
return (error);
|
1995-05-14 03:00:10 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
NDINIT(&nd, LOOKUP, FOLLOW, UIO_USERSPACE, uap->name, p);
|
1994-10-09 01:52:19 +00:00
|
|
|
error = namei(&nd);
|
|
|
|
if (error)
|
1994-05-24 10:09:53 +00:00
|
|
|
return (error);
|
1995-05-14 03:00:10 +00:00
|
|
|
|
1999-12-15 23:02:35 +00:00
|
|
|
NDFREE(&nd, NDF_ONLY_PNBUF);
|
1994-05-24 10:09:53 +00:00
|
|
|
vp = nd.ni_vp;
|
1995-05-14 03:00:10 +00:00
|
|
|
|
2000-01-10 12:04:27 +00:00
|
|
|
vn_isdisk(vp, &error);
|
1999-11-22 15:27:09 +00:00
|
|
|
|
|
|
|
if (!error)
|
|
|
|
error = swaponvp(p, vp, vp->v_rdev, 0);
|
1995-05-14 03:00:10 +00:00
|
|
|
|
|
|
|
if (error)
|
|
|
|
vrele(vp);
|
|
|
|
|
|
|
|
return (error);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Swfree(index) frees the index'th portion of the swap map.
|
|
|
|
* Each of the nswdev devices provides 1/nswdev'th of the swap
|
|
|
|
* space, which is laid out with blocks of dmmax pages circularly
|
|
|
|
* among the devices.
|
1999-01-21 08:29:12 +00:00
|
|
|
*
|
|
|
|
* The new swap code uses page-sized blocks. The old swap code used
|
|
|
|
* DEV_BSIZE'd chunks.
|
|
|
|
*
|
|
|
|
* XXX locking when multiple swapon's run in parallel
|
1994-05-24 10:09:53 +00:00
|
|
|
*/
|
|
|
|
int
|
1995-05-14 03:00:10 +00:00
|
|
|
swaponvp(p, vp, dev, nblks)
|
1994-05-24 10:09:53 +00:00
|
|
|
struct proc *p;
|
1995-05-14 03:00:10 +00:00
|
|
|
struct vnode *vp;
|
|
|
|
dev_t dev;
|
|
|
|
u_long nblks;
|
1994-05-24 10:09:53 +00:00
|
|
|
{
|
1995-05-14 03:00:10 +00:00
|
|
|
int index;
|
1994-05-24 10:09:53 +00:00
|
|
|
register struct swdevt *sp;
|
|
|
|
register swblk_t vsbase;
|
|
|
|
register long blk;
|
1995-05-14 03:00:10 +00:00
|
|
|
swblk_t dvbase;
|
1994-05-24 10:09:53 +00:00
|
|
|
int error;
|
1995-05-14 03:00:10 +00:00
|
|
|
|
2000-01-25 17:49:12 +00:00
|
|
|
if (!swapdev_vp) {
|
|
|
|
error = getnewvnode(VT_NON, NULL, swapdev_vnodeop_p,
|
|
|
|
&swapdev_vp);
|
|
|
|
if (error)
|
|
|
|
panic("Cannot get vnode for swapdev");
|
|
|
|
swapdev_vp->v_type = VNON; /* Untyped */
|
|
|
|
}
|
|
|
|
|
1999-04-10 17:54:43 +00:00
|
|
|
ASSERT_VOP_UNLOCKED(vp, "swaponvp");
|
1995-05-14 03:00:10 +00:00
|
|
|
for (sp = swdevt, index = 0 ; index < nswdev; index++, sp++) {
|
|
|
|
if (sp->sw_vp == vp)
|
|
|
|
return EBUSY;
|
|
|
|
if (!sp->sw_vp)
|
|
|
|
goto found;
|
|
|
|
|
|
|
|
}
|
|
|
|
return EINVAL;
|
|
|
|
found:
|
1999-04-10 17:54:43 +00:00
|
|
|
(void) vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, p);
|
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
1995-01-09 16:06:02 +00:00
|
|
|
error = VOP_OPEN(vp, FREAD | FWRITE, p->p_ucred, p);
|
1999-04-10 17:54:43 +00:00
|
|
|
(void) VOP_UNLOCK(vp, 0, p);
|
1994-10-09 01:52:19 +00:00
|
|
|
if (error)
|
1994-05-24 10:09:53 +00:00
|
|
|
return (error);
|
1995-05-30 08:16:23 +00:00
|
|
|
|
1999-08-13 10:29:38 +00:00
|
|
|
if (nblks == 0 && dev != NODEV && (devsw(dev)->d_psize == 0 ||
|
|
|
|
(nblks = (*devsw(dev)->d_psize) (dev)) == -1)) {
|
1995-05-14 03:00:10 +00:00
|
|
|
(void) VOP_CLOSE(vp, FREAD | FWRITE, p->p_ucred, p);
|
|
|
|
return (ENXIO);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
|
|
|
if (nblks == 0) {
|
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
1995-01-09 16:06:02 +00:00
|
|
|
(void) VOP_CLOSE(vp, FREAD | FWRITE, p->p_ucred, p);
|
1995-05-14 03:00:10 +00:00
|
|
|
return (ENXIO);
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
1999-01-21 08:29:12 +00:00
|
|
|
/*
|
|
|
|
* nblks is in DEV_BSIZE'd chunks, convert to PAGE_SIZE'd chunks.
|
|
|
|
* First chop nblks off to page-align it, then convert.
|
|
|
|
*
|
|
|
|
* sw->sw_nblks is in page-sized chunks now too.
|
|
|
|
*/
|
|
|
|
nblks &= ~(ctodb(1) - 1);
|
|
|
|
nblks = dbtoc(nblks);
|
|
|
|
|
1995-05-14 03:00:10 +00:00
|
|
|
sp->sw_vp = vp;
|
1999-11-29 21:37:18 +00:00
|
|
|
sp->sw_dev = dev2udev(dev);
|
1999-07-17 19:59:55 +00:00
|
|
|
sp->sw_device = dev;
|
1995-05-14 03:00:10 +00:00
|
|
|
sp->sw_flags |= SW_FREED;
|
|
|
|
sp->sw_nblks = nblks;
|
|
|
|
|
1999-01-21 08:29:12 +00:00
|
|
|
/*
|
|
|
|
* nblks, nswap, and dmmax are PAGE_SIZE'd parameters now, not
|
|
|
|
* DEV_BSIZE'd.
|
|
|
|
*/
|
|
|
|
|
1995-05-14 03:00:10 +00:00
|
|
|
if (nblks * nswdev > nswap)
|
1995-05-18 05:09:54 +00:00
|
|
|
nswap = (nblks+1) * nswdev;
|
1995-05-14 03:00:10 +00:00
|
|
|
|
1999-01-21 08:29:12 +00:00
|
|
|
if (swapblist == NULL)
|
|
|
|
swapblist = blist_create(nswap);
|
|
|
|
else
|
|
|
|
blist_resize(&swapblist, nswap, 0);
|
|
|
|
|
1994-11-22 08:47:20 +00:00
|
|
|
for (dvbase = dmmax; dvbase < nblks; dvbase += dmmax) {
|
1999-01-21 08:29:12 +00:00
|
|
|
blk = min(nblks - dvbase, dmmax);
|
1995-05-18 05:09:54 +00:00
|
|
|
vsbase = index * dmmax + dvbase * nswdev;
|
1999-01-21 08:29:12 +00:00
|
|
|
blist_free(swapblist, vsbase, blk);
|
1994-05-25 09:21:21 +00:00
|
|
|
vm_swap_size += blk;
|
1994-05-24 10:09:53 +00:00
|
|
|
}
|
1995-05-19 03:27:08 +00:00
|
|
|
|
1994-05-24 10:09:53 +00:00
|
|
|
return (0);
|
|
|
|
}
|