2002-01-26 05:52:19 +03:00
|
|
|
/* $NetBSD: nfs_bio.c,v 1.74 2002/01/26 02:52:19 chs Exp $ */
|
1994-06-29 10:39:25 +04:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
/*
|
1994-06-08 15:33:09 +04:00
|
|
|
* Copyright (c) 1989, 1993
|
|
|
|
* The Regents of the University of California. All rights reserved.
|
1993-03-21 12:45:37 +03:00
|
|
|
*
|
|
|
|
* This code is derived from software contributed to Berkeley by
|
|
|
|
* Rick Macklem at The University of Guelph.
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
* must display the following acknowledgement:
|
|
|
|
* 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.
|
|
|
|
*
|
1996-02-18 14:53:36 +03:00
|
|
|
* @(#)nfs_bio.c 8.9 (Berkeley) 3/30/95
|
1993-03-21 12:45:37 +03:00
|
|
|
*/
|
|
|
|
|
2001-11-10 13:59:08 +03:00
|
|
|
#include <sys/cdefs.h>
|
2002-01-26 05:52:19 +03:00
|
|
|
__KERNEL_RCSID(0, "$NetBSD: nfs_bio.c,v 1.74 2002/01/26 02:52:19 chs Exp $");
|
2001-11-10 13:59:08 +03:00
|
|
|
|
2000-09-19 21:04:50 +04:00
|
|
|
#include "opt_nfs.h"
|
2000-11-27 11:39:39 +03:00
|
|
|
#include "opt_ddb.h"
|
2000-09-19 21:04:50 +04:00
|
|
|
|
1993-12-18 03:40:47 +03:00
|
|
|
#include <sys/param.h>
|
|
|
|
#include <sys/systm.h>
|
1994-06-08 15:33:09 +04:00
|
|
|
#include <sys/resourcevar.h>
|
1996-02-18 14:53:36 +03:00
|
|
|
#include <sys/signalvar.h>
|
1993-12-18 03:40:47 +03:00
|
|
|
#include <sys/proc.h>
|
|
|
|
#include <sys/buf.h>
|
|
|
|
#include <sys/vnode.h>
|
|
|
|
#include <sys/mount.h>
|
1994-06-08 15:33:09 +04:00
|
|
|
#include <sys/kernel.h>
|
1996-02-10 00:48:19 +03:00
|
|
|
#include <sys/namei.h>
|
1997-10-10 05:53:17 +04:00
|
|
|
#include <sys/dirent.h>
|
2000-11-27 11:39:39 +03:00
|
|
|
#include <sys/malloc.h>
|
1994-06-08 15:33:09 +04:00
|
|
|
|
1998-02-05 10:59:28 +03:00
|
|
|
#include <uvm/uvm_extern.h>
|
2000-11-27 11:39:39 +03:00
|
|
|
#include <uvm/uvm.h>
|
1998-02-05 10:59:28 +03:00
|
|
|
|
1994-06-08 15:33:09 +04:00
|
|
|
#include <nfs/rpcv2.h>
|
1996-02-18 14:53:36 +03:00
|
|
|
#include <nfs/nfsproto.h>
|
1993-12-18 03:40:47 +03:00
|
|
|
#include <nfs/nfs.h>
|
|
|
|
#include <nfs/nfsmount.h>
|
1994-06-08 15:33:09 +04:00
|
|
|
#include <nfs/nqnfs.h>
|
1996-02-18 14:53:36 +03:00
|
|
|
#include <nfs/nfsnode.h>
|
1996-02-10 00:48:19 +03:00
|
|
|
#include <nfs/nfs_var.h>
|
1993-03-21 12:45:37 +03:00
|
|
|
|
1994-06-08 15:33:09 +04:00
|
|
|
extern int nfs_numasync;
|
2002-01-26 05:52:19 +03:00
|
|
|
extern int nfs_commitsize;
|
1996-02-18 14:53:36 +03:00
|
|
|
extern struct nfsstats nfsstats;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Vnode op for read using bio
|
|
|
|
* Any similarity to readip() is purely coincidental
|
|
|
|
*/
|
1996-02-10 00:48:19 +03:00
|
|
|
int
|
1997-10-10 05:53:17 +04:00
|
|
|
nfs_bioread(vp, uio, ioflag, cred, cflag)
|
2000-03-30 16:51:13 +04:00
|
|
|
struct vnode *vp;
|
|
|
|
struct uio *uio;
|
1997-10-10 05:53:17 +04:00
|
|
|
int ioflag, cflag;
|
1993-03-21 12:45:37 +03:00
|
|
|
struct ucred *cred;
|
|
|
|
{
|
2000-03-30 16:51:13 +04:00
|
|
|
struct nfsnode *np = VTONFS(vp);
|
1996-02-10 00:48:19 +03:00
|
|
|
struct buf *bp = NULL, *rabp;
|
1993-03-21 12:45:37 +03:00
|
|
|
struct vattr vattr;
|
1994-06-08 15:33:09 +04:00
|
|
|
struct proc *p;
|
1996-02-18 14:53:36 +03:00
|
|
|
struct nfsmount *nmp = VFSTONFS(vp->v_mount);
|
1997-10-19 05:46:15 +04:00
|
|
|
struct nfsdircache *ndp = NULL, *nndp = NULL;
|
1997-10-10 05:53:17 +04:00
|
|
|
caddr_t baddr, ep, edp;
|
2000-11-27 11:39:39 +03:00
|
|
|
int got_buf = 0, error = 0, n = 0, on = 0, en, enn;
|
1997-10-10 05:53:17 +04:00
|
|
|
int enough = 0;
|
|
|
|
struct dirent *dp, *pdp;
|
2000-11-27 11:39:39 +03:00
|
|
|
off_t curoff = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
if (uio->uio_rw != UIO_READ)
|
|
|
|
panic("nfs_read mode");
|
|
|
|
#endif
|
|
|
|
if (uio->uio_resid == 0)
|
|
|
|
return (0);
|
1997-10-10 05:53:17 +04:00
|
|
|
if (vp->v_type != VDIR && uio->uio_offset < 0)
|
1993-03-21 12:45:37 +03:00
|
|
|
return (EINVAL);
|
1994-06-08 15:33:09 +04:00
|
|
|
p = uio->uio_procp;
|
2000-09-19 21:04:50 +04:00
|
|
|
#ifndef NFS_V2_ONLY
|
1997-10-10 05:53:17 +04:00
|
|
|
if ((nmp->nm_flag & NFSMNT_NFSV3) &&
|
|
|
|
!(nmp->nm_iflag & NFSMNT_GOTFSINFO))
|
1996-02-18 14:53:36 +03:00
|
|
|
(void)nfs_fsinfo(nmp, vp, cred, p);
|
2000-09-19 21:04:50 +04:00
|
|
|
#endif
|
1997-10-10 05:53:17 +04:00
|
|
|
if (vp->v_type != VDIR &&
|
|
|
|
(uio->uio_offset + uio->uio_resid) > nmp->nm_maxfilesize)
|
1997-07-18 03:54:27 +04:00
|
|
|
return (EFBIG);
|
2000-11-27 11:39:39 +03:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
/*
|
1994-06-08 15:33:09 +04:00
|
|
|
* For nfs, cache consistency can only be maintained approximately.
|
|
|
|
* Although RFC1094 does not specify the criteria, the following is
|
|
|
|
* believed to be compatible with the reference port.
|
|
|
|
* For nqnfs, full cache consistency is maintained within the loop.
|
|
|
|
* For nfs:
|
1993-03-21 12:45:37 +03:00
|
|
|
* If the file's modify time on the server has changed since the
|
|
|
|
* last read rpc or you have written to the file,
|
|
|
|
* you may have lost data cache consistency with the
|
|
|
|
* server, so flush all of the file's data out of the cache.
|
|
|
|
* Then force a getattr rpc to ensure that you have up to date
|
|
|
|
* attributes.
|
|
|
|
* NB: This implies that cache data can be read when up to
|
|
|
|
* NFS_ATTRTIMEO seconds out of date. If you find that you need current
|
|
|
|
* attributes this could be forced by setting n_attrstamp to 0 before
|
1994-06-08 15:33:09 +04:00
|
|
|
* the VOP_GETATTR() call.
|
1993-03-21 12:45:37 +03:00
|
|
|
*/
|
2000-11-27 11:39:39 +03:00
|
|
|
|
1994-06-08 15:33:09 +04:00
|
|
|
if ((nmp->nm_flag & NFSMNT_NQNFS) == 0 && vp->v_type != VLNK) {
|
1993-03-21 12:45:37 +03:00
|
|
|
if (np->n_flag & NMODIFIED) {
|
1996-02-18 14:53:36 +03:00
|
|
|
if (vp->v_type != VREG) {
|
|
|
|
if (vp->v_type != VDIR)
|
|
|
|
panic("nfs: bioread, not dir");
|
1997-10-19 05:46:15 +04:00
|
|
|
nfs_invaldircache(vp, 0);
|
|
|
|
np->n_direofoffset = 0;
|
1996-02-10 00:48:19 +03:00
|
|
|
error = nfs_vinvalbuf(vp, V_SAVE, cred, p, 1);
|
|
|
|
if (error)
|
1994-06-08 15:33:09 +04:00
|
|
|
return (error);
|
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
np->n_attrstamp = 0;
|
1996-02-10 00:48:19 +03:00
|
|
|
error = VOP_GETATTR(vp, &vattr, cred, p);
|
|
|
|
if (error)
|
1993-03-21 12:45:37 +03:00
|
|
|
return (error);
|
1996-02-01 03:31:05 +03:00
|
|
|
np->n_mtime = vattr.va_mtime.tv_sec;
|
1993-03-21 12:45:37 +03:00
|
|
|
} else {
|
1996-02-18 14:53:36 +03:00
|
|
|
error = VOP_GETATTR(vp, &vattr, cred, p);
|
|
|
|
if (error)
|
1993-03-21 12:45:37 +03:00
|
|
|
return (error);
|
1996-02-01 03:31:05 +03:00
|
|
|
if (np->n_mtime != vattr.va_mtime.tv_sec) {
|
1997-10-19 05:46:15 +04:00
|
|
|
if (vp->v_type == VDIR) {
|
|
|
|
nfs_invaldircache(vp, 0);
|
|
|
|
np->n_direofoffset = 0;
|
|
|
|
}
|
1996-02-10 00:48:19 +03:00
|
|
|
error = nfs_vinvalbuf(vp, V_SAVE, cred, p, 1);
|
|
|
|
if (error)
|
1994-06-08 15:33:09 +04:00
|
|
|
return (error);
|
1996-02-01 03:31:05 +03:00
|
|
|
np->n_mtime = vattr.va_mtime.tv_sec;
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
1994-06-08 15:33:09 +04:00
|
|
|
|
2000-11-27 11:39:39 +03:00
|
|
|
/*
|
|
|
|
* update the cached read creds for this node.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (np->n_rcred) {
|
|
|
|
crfree(np->n_rcred);
|
|
|
|
}
|
|
|
|
np->n_rcred = cred;
|
|
|
|
crhold(cred);
|
|
|
|
|
|
|
|
do {
|
2000-09-20 03:26:25 +04:00
|
|
|
#ifndef NFS_V2_ONLY
|
1994-06-08 15:33:09 +04:00
|
|
|
/*
|
|
|
|
* Get a valid lease. If cached data is stale, flush it.
|
|
|
|
*/
|
|
|
|
if (nmp->nm_flag & NFSMNT_NQNFS) {
|
1996-02-18 14:53:36 +03:00
|
|
|
if (NQNFS_CKINVALID(vp, np, ND_READ)) {
|
1994-06-08 15:33:09 +04:00
|
|
|
do {
|
1996-02-18 14:53:36 +03:00
|
|
|
error = nqnfs_getlease(vp, ND_READ, cred, p);
|
1994-06-08 15:33:09 +04:00
|
|
|
} while (error == NQNFS_EXPIRED);
|
|
|
|
if (error)
|
|
|
|
return (error);
|
|
|
|
if (np->n_lrev != np->n_brev ||
|
|
|
|
(np->n_flag & NQNFSNONCACHE) ||
|
|
|
|
((np->n_flag & NMODIFIED) && vp->v_type == VDIR)) {
|
1997-10-19 05:46:15 +04:00
|
|
|
if (vp->v_type == VDIR) {
|
|
|
|
nfs_invaldircache(vp, 0);
|
|
|
|
np->n_direofoffset = 0;
|
|
|
|
}
|
1996-02-10 00:48:19 +03:00
|
|
|
error = nfs_vinvalbuf(vp, V_SAVE, cred, p, 1);
|
|
|
|
if (error)
|
1994-06-08 15:33:09 +04:00
|
|
|
return (error);
|
|
|
|
np->n_brev = np->n_lrev;
|
|
|
|
}
|
|
|
|
} else if (vp->v_type == VDIR && (np->n_flag & NMODIFIED)) {
|
1997-10-19 05:46:15 +04:00
|
|
|
nfs_invaldircache(vp, 0);
|
1996-02-10 00:48:19 +03:00
|
|
|
error = nfs_vinvalbuf(vp, V_SAVE, cred, p, 1);
|
1997-10-19 05:46:15 +04:00
|
|
|
np->n_direofoffset = 0;
|
1996-02-10 00:48:19 +03:00
|
|
|
if (error)
|
1994-06-08 15:33:09 +04:00
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
}
|
2000-09-20 03:26:25 +04:00
|
|
|
#endif
|
1996-05-24 02:47:27 +04:00
|
|
|
/*
|
|
|
|
* Don't cache symlinks.
|
|
|
|
*/
|
|
|
|
if (np->n_flag & NQNFSNONCACHE
|
|
|
|
|| ((vp->v_flag & VROOT) && vp->v_type == VLNK)) {
|
1994-06-08 15:33:09 +04:00
|
|
|
switch (vp->v_type) {
|
|
|
|
case VREG:
|
2000-11-27 11:39:39 +03:00
|
|
|
return (nfs_readrpc(vp, uio));
|
1994-06-08 15:33:09 +04:00
|
|
|
case VLNK:
|
1996-02-18 14:53:36 +03:00
|
|
|
return (nfs_readlinkrpc(vp, uio, cred));
|
1994-06-08 15:33:09 +04:00
|
|
|
case VDIR:
|
1996-02-10 00:48:19 +03:00
|
|
|
break;
|
1996-02-18 14:53:36 +03:00
|
|
|
default:
|
1996-10-13 05:39:03 +04:00
|
|
|
printf(" NQNFSNONCACHE: type %x unexpected\n",
|
1996-10-11 03:31:17 +04:00
|
|
|
vp->v_type);
|
1994-06-08 15:33:09 +04:00
|
|
|
};
|
|
|
|
}
|
|
|
|
baddr = (caddr_t)0;
|
1993-03-21 12:45:37 +03:00
|
|
|
switch (vp->v_type) {
|
|
|
|
case VREG:
|
|
|
|
nfsstats.biocache_reads++;
|
1994-06-08 15:33:09 +04:00
|
|
|
|
2000-11-27 11:39:39 +03:00
|
|
|
error = 0;
|
2001-04-16 18:37:43 +04:00
|
|
|
if (uio->uio_offset >= np->n_size) {
|
|
|
|
break;
|
|
|
|
}
|
2000-11-27 11:39:39 +03:00
|
|
|
while (uio->uio_resid > 0) {
|
|
|
|
void *win;
|
2001-02-05 15:27:18 +03:00
|
|
|
vsize_t bytelen = MIN(np->n_size - uio->uio_offset,
|
2000-11-27 11:39:39 +03:00
|
|
|
uio->uio_resid);
|
1994-06-08 15:33:09 +04:00
|
|
|
|
2000-11-27 11:39:39 +03:00
|
|
|
if (bytelen == 0)
|
|
|
|
break;
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
win = ubc_alloc(&vp->v_uobj, uio->uio_offset,
|
2000-11-27 11:39:39 +03:00
|
|
|
&bytelen, UBC_READ);
|
|
|
|
error = uiomove(win, bytelen, uio);
|
|
|
|
ubc_release(win, 0);
|
|
|
|
if (error) {
|
|
|
|
break;
|
1994-06-08 15:33:09 +04:00
|
|
|
}
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
2000-11-27 11:39:39 +03:00
|
|
|
n = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
2000-11-27 11:39:39 +03:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
case VLNK:
|
|
|
|
nfsstats.biocache_readlinks++;
|
1994-06-08 15:33:09 +04:00
|
|
|
bp = nfs_getcacheblk(vp, (daddr_t)0, NFS_MAXPATHLEN, p);
|
|
|
|
if (!bp)
|
|
|
|
return (EINTR);
|
|
|
|
if ((bp->b_flags & B_DONE) == 0) {
|
|
|
|
bp->b_flags |= B_READ;
|
2000-11-27 11:39:39 +03:00
|
|
|
error = nfs_doio(bp, p);
|
1996-02-18 14:53:36 +03:00
|
|
|
if (error) {
|
1994-06-08 15:33:09 +04:00
|
|
|
brelse(bp);
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
}
|
2001-02-27 07:37:44 +03:00
|
|
|
n = MIN(uio->uio_resid, NFS_MAXPATHLEN - bp->b_resid);
|
1994-06-08 15:33:09 +04:00
|
|
|
got_buf = 1;
|
|
|
|
on = 0;
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
|
|
|
case VDIR:
|
1997-10-10 05:53:17 +04:00
|
|
|
diragain:
|
1993-03-21 12:45:37 +03:00
|
|
|
nfsstats.biocache_readdirs++;
|
1997-10-19 05:46:15 +04:00
|
|
|
ndp = nfs_searchdircache(vp, uio->uio_offset,
|
|
|
|
(nmp->nm_flag & NFSMNT_XLATECOOKIE), 0);
|
|
|
|
if (!ndp) {
|
|
|
|
/*
|
|
|
|
* We've been handed a cookie that is not
|
|
|
|
* in the cache. If we're not translating
|
|
|
|
* 32 <-> 64, it may be a value that was
|
|
|
|
* flushed out of the cache because it grew
|
|
|
|
* too big. Let the server judge if it's
|
|
|
|
* valid or not. In the translation case,
|
|
|
|
* we have no way of validating this value,
|
|
|
|
* so punt.
|
|
|
|
*/
|
|
|
|
if (nmp->nm_flag & NFSMNT_XLATECOOKIE)
|
|
|
|
return (EINVAL);
|
|
|
|
ndp = nfs_enterdircache(vp, uio->uio_offset,
|
|
|
|
uio->uio_offset, 0, 0);
|
|
|
|
}
|
|
|
|
|
1997-10-10 05:53:17 +04:00
|
|
|
if (uio->uio_offset != 0 &&
|
1997-10-19 05:46:15 +04:00
|
|
|
ndp->dc_cookie == np->n_direofoffset) {
|
|
|
|
nfsstats.direofcache_hits++;
|
1997-10-10 05:53:17 +04:00
|
|
|
return (0);
|
1997-10-19 05:46:15 +04:00
|
|
|
}
|
|
|
|
|
1997-10-10 05:53:17 +04:00
|
|
|
bp = nfs_getcacheblk(vp, ndp->dc_blkno, NFS_DIRBLKSIZ, p);
|
1994-06-08 15:33:09 +04:00
|
|
|
if (!bp)
|
1996-02-18 14:53:36 +03:00
|
|
|
return (EINTR);
|
1994-06-08 15:33:09 +04:00
|
|
|
if ((bp->b_flags & B_DONE) == 0) {
|
1996-02-18 14:53:36 +03:00
|
|
|
bp->b_flags |= B_READ;
|
1997-10-19 05:46:15 +04:00
|
|
|
bp->b_dcookie = ndp->dc_blkcookie;
|
2000-11-27 11:39:39 +03:00
|
|
|
error = nfs_doio(bp, p);
|
1996-02-18 14:53:36 +03:00
|
|
|
if (error) {
|
1997-10-10 05:53:17 +04:00
|
|
|
/*
|
|
|
|
* Yuck! The directory has been modified on the
|
|
|
|
* server. Punt and let the userland code
|
|
|
|
* deal with it.
|
|
|
|
*/
|
1996-02-18 14:53:36 +03:00
|
|
|
brelse(bp);
|
1997-10-10 05:53:17 +04:00
|
|
|
if (error == NFSERR_BAD_COOKIE) {
|
1997-10-19 05:46:15 +04:00
|
|
|
nfs_invaldircache(vp, 0);
|
1997-10-10 05:53:17 +04:00
|
|
|
nfs_vinvalbuf(vp, 0, cred, p, 1);
|
|
|
|
error = EINVAL;
|
1994-06-08 15:33:09 +04:00
|
|
|
}
|
1997-10-10 05:53:17 +04:00
|
|
|
return (error);
|
1996-02-18 14:53:36 +03:00
|
|
|
}
|
1997-11-23 16:52:24 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Just return if we hit EOF right away with this
|
|
|
|
* block. Always check here, because direofoffset
|
|
|
|
* may have been set by an nfsiod since the last
|
|
|
|
* check.
|
|
|
|
*/
|
|
|
|
if (np->n_direofoffset != 0 &&
|
1997-10-23 18:12:14 +04:00
|
|
|
ndp->dc_blkcookie == np->n_direofoffset) {
|
1997-11-23 16:52:24 +03:00
|
|
|
brelse(bp);
|
|
|
|
return (0);
|
1994-06-08 15:33:09 +04:00
|
|
|
}
|
|
|
|
|
1997-10-10 05:53:17 +04:00
|
|
|
/*
|
|
|
|
* Find the entry we were looking for in the block.
|
|
|
|
*/
|
|
|
|
|
|
|
|
en = ndp->dc_entry;
|
|
|
|
|
|
|
|
pdp = dp = (struct dirent *)bp->b_data;
|
2001-04-03 19:07:23 +04:00
|
|
|
edp = bp->b_data + bp->b_bcount - bp->b_resid;
|
1997-10-10 05:53:17 +04:00
|
|
|
enn = 0;
|
|
|
|
while (enn < en && (caddr_t)dp < edp) {
|
|
|
|
pdp = dp;
|
|
|
|
dp = (struct dirent *)((caddr_t)dp + dp->d_reclen);
|
|
|
|
enn++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the entry number was bigger than the number of
|
|
|
|
* entries in the block, or the cookie of the previous
|
|
|
|
* entry doesn't match, the directory cache is
|
|
|
|
* stale. Flush it and try again (i.e. go to
|
|
|
|
* the server).
|
|
|
|
*/
|
|
|
|
if ((caddr_t)dp >= edp || (caddr_t)dp + dp->d_reclen > edp ||
|
1997-10-19 05:46:15 +04:00
|
|
|
(en > 0 && NFS_GETCOOKIE(pdp) != ndp->dc_cookie)) {
|
1997-10-10 05:53:17 +04:00
|
|
|
#ifdef DEBUG
|
1997-10-21 02:08:44 +04:00
|
|
|
printf("invalid cache: %p %p %p off %lx %lx\n",
|
|
|
|
pdp, dp, edp,
|
1997-10-10 05:53:17 +04:00
|
|
|
(unsigned long)uio->uio_offset,
|
|
|
|
(unsigned long)NFS_GETCOOKIE(pdp));
|
|
|
|
#endif
|
|
|
|
brelse(bp);
|
1997-10-19 05:46:15 +04:00
|
|
|
nfs_invaldircache(vp, 0);
|
1997-10-10 05:53:17 +04:00
|
|
|
nfs_vinvalbuf(vp, 0, cred, p, 0);
|
|
|
|
goto diragain;
|
|
|
|
}
|
|
|
|
|
|
|
|
on = (caddr_t)dp - bp->b_data;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Cache all entries that may be exported to the
|
|
|
|
* user, as they may be thrown back at us. The
|
|
|
|
* NFSBIO_CACHECOOKIES flag indicates that all
|
|
|
|
* entries are being 'exported', so cache them all.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (en == 0 && pdp == dp) {
|
|
|
|
dp = (struct dirent *)
|
|
|
|
((caddr_t)dp + dp->d_reclen);
|
|
|
|
enn++;
|
|
|
|
}
|
|
|
|
|
2001-04-03 19:07:23 +04:00
|
|
|
if (uio->uio_resid < (bp->b_bcount - bp->b_resid - on)) {
|
1997-10-10 05:53:17 +04:00
|
|
|
n = uio->uio_resid;
|
|
|
|
enough = 1;
|
|
|
|
} else
|
2001-04-03 19:07:23 +04:00
|
|
|
n = bp->b_bcount - bp->b_resid - on;
|
1997-10-10 05:53:17 +04:00
|
|
|
|
|
|
|
ep = bp->b_data + on + n;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find last complete entry to copy, caching entries
|
|
|
|
* (if requested) as we go.
|
|
|
|
*/
|
|
|
|
|
|
|
|
while ((caddr_t)dp < ep && (caddr_t)dp + dp->d_reclen <= ep) {
|
1997-10-19 05:46:15 +04:00
|
|
|
if (cflag & NFSBIO_CACHECOOKIES) {
|
|
|
|
nndp = nfs_enterdircache(vp, NFS_GETCOOKIE(pdp),
|
|
|
|
ndp->dc_blkcookie, enn, bp->b_lblkno);
|
|
|
|
if (nmp->nm_flag & NFSMNT_XLATECOOKIE) {
|
|
|
|
NFS_STASHCOOKIE32(pdp,
|
|
|
|
nndp->dc_cookie32);
|
|
|
|
}
|
|
|
|
}
|
1997-10-10 05:53:17 +04:00
|
|
|
pdp = dp;
|
|
|
|
dp = (struct dirent *)((caddr_t)dp + dp->d_reclen);
|
|
|
|
enn++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the last requested entry was not the last in the
|
|
|
|
* buffer (happens if NFS_DIRFRAGSIZ < NFS_DIRBLKSIZ),
|
|
|
|
* cache the cookie of the last requested one, and
|
|
|
|
* set of the offset to it.
|
|
|
|
*/
|
|
|
|
|
2001-04-03 19:07:23 +04:00
|
|
|
if ((on + n) < bp->b_bcount - bp->b_resid) {
|
1997-10-10 05:53:17 +04:00
|
|
|
curoff = NFS_GETCOOKIE(pdp);
|
1997-10-19 05:46:15 +04:00
|
|
|
nndp = nfs_enterdircache(vp, curoff, ndp->dc_blkcookie,
|
|
|
|
enn, bp->b_lblkno);
|
|
|
|
if (nmp->nm_flag & NFSMNT_XLATECOOKIE) {
|
|
|
|
NFS_STASHCOOKIE32(pdp, nndp->dc_cookie32);
|
|
|
|
curoff = nndp->dc_cookie32;
|
|
|
|
}
|
1997-10-10 05:53:17 +04:00
|
|
|
} else
|
|
|
|
curoff = bp->b_dcookie;
|
|
|
|
|
1997-10-19 05:46:15 +04:00
|
|
|
/*
|
|
|
|
* Always cache the entry for the next block,
|
|
|
|
* so that readaheads can use it.
|
|
|
|
*/
|
|
|
|
nndp = nfs_enterdircache(vp, bp->b_dcookie, bp->b_dcookie, 0,0);
|
|
|
|
if (nmp->nm_flag & NFSMNT_XLATECOOKIE) {
|
|
|
|
if (curoff == bp->b_dcookie) {
|
|
|
|
NFS_STASHCOOKIE32(pdp, nndp->dc_cookie32);
|
|
|
|
curoff = nndp->dc_cookie32;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1997-10-10 05:53:17 +04:00
|
|
|
n = ((caddr_t)pdp + pdp->d_reclen) - (bp->b_data + on);
|
|
|
|
|
1994-06-08 15:33:09 +04:00
|
|
|
/*
|
|
|
|
* If not eof and read aheads are enabled, start one.
|
|
|
|
* (You need the current block first, so that you have the
|
1996-02-18 14:53:36 +03:00
|
|
|
* directory offset cookie of the next block.)
|
1994-06-08 15:33:09 +04:00
|
|
|
*/
|
|
|
|
if (nfs_numasync > 0 && nmp->nm_readahead > 0 &&
|
1997-10-10 05:53:17 +04:00
|
|
|
np->n_direofoffset == 0 && !(np->n_flag & NQNFSNONCACHE)) {
|
1997-10-19 05:46:15 +04:00
|
|
|
rabp = nfs_getcacheblk(vp, nndp->dc_blkno,
|
1997-10-10 05:53:17 +04:00
|
|
|
NFS_DIRBLKSIZ, p);
|
1994-06-08 15:33:09 +04:00
|
|
|
if (rabp) {
|
|
|
|
if ((rabp->b_flags & (B_DONE | B_DELWRI)) == 0) {
|
1997-10-19 05:46:15 +04:00
|
|
|
rabp->b_dcookie = nndp->dc_cookie;
|
1994-06-08 15:33:09 +04:00
|
|
|
rabp->b_flags |= (B_READ | B_ASYNC);
|
2000-11-27 11:39:39 +03:00
|
|
|
if (nfs_asyncio(rabp)) {
|
1994-06-08 15:33:09 +04:00
|
|
|
rabp->b_flags |= B_INVAL;
|
|
|
|
brelse(rabp);
|
|
|
|
}
|
1995-01-12 15:08:23 +03:00
|
|
|
} else
|
|
|
|
brelse(rabp);
|
1994-06-08 15:33:09 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
got_buf = 1;
|
1993-03-21 12:45:37 +03:00
|
|
|
break;
|
1996-02-18 14:53:36 +03:00
|
|
|
default:
|
1996-10-13 05:39:03 +04:00
|
|
|
printf(" nfsbioread: type %x unexpected\n",vp->v_type);
|
1996-02-10 00:48:19 +03:00
|
|
|
break;
|
2000-11-27 11:39:39 +03:00
|
|
|
}
|
1994-06-08 15:33:09 +04:00
|
|
|
|
|
|
|
if (n > 0) {
|
|
|
|
if (!baddr)
|
|
|
|
baddr = bp->b_data;
|
|
|
|
error = uiomove(baddr + on, (int)n, uio);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
switch (vp->v_type) {
|
1996-02-18 14:53:36 +03:00
|
|
|
case VREG:
|
|
|
|
break;
|
1993-03-21 12:45:37 +03:00
|
|
|
case VLNK:
|
|
|
|
n = 0;
|
|
|
|
break;
|
|
|
|
case VDIR:
|
1996-02-18 14:53:36 +03:00
|
|
|
if (np->n_flag & NQNFSNONCACHE)
|
|
|
|
bp->b_flags |= B_INVAL;
|
1997-10-10 05:53:17 +04:00
|
|
|
uio->uio_offset = curoff;
|
|
|
|
if (enough)
|
|
|
|
n = 0;
|
1996-02-10 00:48:19 +03:00
|
|
|
break;
|
1996-02-18 14:53:36 +03:00
|
|
|
default:
|
1996-10-13 05:39:03 +04:00
|
|
|
printf(" nfsbioread: type %x unexpected\n",vp->v_type);
|
1996-02-18 14:53:36 +03:00
|
|
|
}
|
1994-06-08 15:33:09 +04:00
|
|
|
if (got_buf)
|
|
|
|
brelse(bp);
|
|
|
|
} while (error == 0 && uio->uio_resid > 0 && n > 0);
|
1993-03-21 12:45:37 +03:00
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Vnode op for write using bio
|
|
|
|
*/
|
1996-02-10 00:48:19 +03:00
|
|
|
int
|
|
|
|
nfs_write(v)
|
|
|
|
void *v;
|
|
|
|
{
|
1994-06-08 15:33:09 +04:00
|
|
|
struct vop_write_args /* {
|
1996-02-18 14:53:36 +03:00
|
|
|
struct vnode *a_vp;
|
1994-06-08 15:33:09 +04:00
|
|
|
struct uio *a_uio;
|
|
|
|
int a_ioflag;
|
|
|
|
struct ucred *a_cred;
|
1996-02-10 00:48:19 +03:00
|
|
|
} */ *ap = v;
|
2000-03-30 16:51:13 +04:00
|
|
|
struct uio *uio = ap->a_uio;
|
1994-06-08 15:33:09 +04:00
|
|
|
struct proc *p = uio->uio_procp;
|
2000-03-30 16:51:13 +04:00
|
|
|
struct vnode *vp = ap->a_vp;
|
1993-03-21 12:45:37 +03:00
|
|
|
struct nfsnode *np = VTONFS(vp);
|
2000-03-30 16:51:13 +04:00
|
|
|
struct ucred *cred = ap->a_cred;
|
1994-06-08 15:33:09 +04:00
|
|
|
int ioflag = ap->a_ioflag;
|
1993-03-21 12:45:37 +03:00
|
|
|
struct vattr vattr;
|
1996-02-18 14:53:36 +03:00
|
|
|
struct nfsmount *nmp = VFSTONFS(vp->v_mount);
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
void *win;
|
|
|
|
voff_t oldoff, origoff;
|
|
|
|
vsize_t bytelen;
|
2000-11-27 11:39:39 +03:00
|
|
|
int error = 0, iomode, must_commit;
|
1993-03-21 12:45:37 +03:00
|
|
|
|
|
|
|
#ifdef DIAGNOSTIC
|
|
|
|
if (uio->uio_rw != UIO_WRITE)
|
|
|
|
panic("nfs_write mode");
|
|
|
|
if (uio->uio_segflg == UIO_USERSPACE && uio->uio_procp != curproc)
|
|
|
|
panic("nfs_write proc");
|
|
|
|
#endif
|
|
|
|
if (vp->v_type != VREG)
|
|
|
|
return (EIO);
|
1994-06-08 15:33:09 +04:00
|
|
|
if (np->n_flag & NWRITEERR) {
|
|
|
|
np->n_flag &= ~NWRITEERR;
|
|
|
|
return (np->n_error);
|
|
|
|
}
|
2000-09-19 21:04:50 +04:00
|
|
|
#ifndef NFS_V2_ONLY
|
1997-10-10 05:53:17 +04:00
|
|
|
if ((nmp->nm_flag & NFSMNT_NFSV3) &&
|
|
|
|
!(nmp->nm_iflag & NFSMNT_GOTFSINFO))
|
1996-02-18 14:53:36 +03:00
|
|
|
(void)nfs_fsinfo(nmp, vp, cred, p);
|
2000-09-19 21:04:50 +04:00
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
if (ioflag & (IO_APPEND | IO_SYNC)) {
|
|
|
|
if (np->n_flag & NMODIFIED) {
|
1994-06-08 15:33:09 +04:00
|
|
|
np->n_attrstamp = 0;
|
1996-02-10 00:48:19 +03:00
|
|
|
error = nfs_vinvalbuf(vp, V_SAVE, cred, p, 1);
|
|
|
|
if (error)
|
1994-06-08 15:33:09 +04:00
|
|
|
return (error);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
|
|
|
if (ioflag & IO_APPEND) {
|
|
|
|
np->n_attrstamp = 0;
|
1996-02-10 00:48:19 +03:00
|
|
|
error = VOP_GETATTR(vp, &vattr, cred, p);
|
|
|
|
if (error)
|
1993-03-21 12:45:37 +03:00
|
|
|
return (error);
|
|
|
|
uio->uio_offset = np->n_size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (uio->uio_offset < 0)
|
|
|
|
return (EINVAL);
|
1997-07-18 03:54:27 +04:00
|
|
|
if ((uio->uio_offset + uio->uio_resid) > nmp->nm_maxfilesize)
|
|
|
|
return (EFBIG);
|
1993-03-21 12:45:37 +03:00
|
|
|
if (uio->uio_resid == 0)
|
|
|
|
return (0);
|
|
|
|
/*
|
|
|
|
* Maybe this should be above the vnode op call, but so long as
|
|
|
|
* file servers have no limits, i don't think it matters
|
|
|
|
*/
|
1994-06-08 15:33:09 +04:00
|
|
|
if (p && uio->uio_offset + uio->uio_resid >
|
1993-03-21 12:45:37 +03:00
|
|
|
p->p_rlimit[RLIMIT_FSIZE].rlim_cur) {
|
|
|
|
psignal(p, SIGXFSZ);
|
|
|
|
return (EFBIG);
|
|
|
|
}
|
2000-11-27 11:39:39 +03:00
|
|
|
|
1993-03-21 12:45:37 +03:00
|
|
|
/*
|
2000-11-27 11:39:39 +03:00
|
|
|
* update the cached write creds for this node.
|
1993-03-21 12:45:37 +03:00
|
|
|
*/
|
1994-06-08 15:33:09 +04:00
|
|
|
|
2000-11-27 11:39:39 +03:00
|
|
|
if (np->n_wcred) {
|
|
|
|
crfree(np->n_wcred);
|
|
|
|
}
|
|
|
|
np->n_wcred = cred;
|
|
|
|
crhold(cred);
|
|
|
|
|
|
|
|
if ((np->n_flag & NQNFSNONCACHE) && uio->uio_iovcnt == 1) {
|
|
|
|
iomode = NFSV3WRITE_FILESYNC;
|
|
|
|
error = nfs_writerpc(vp, uio, &iomode, &must_commit);
|
|
|
|
if (must_commit)
|
|
|
|
nfs_clearcommit(vp->v_mount);
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
origoff = uio->uio_offset;
|
2000-11-27 11:39:39 +03:00
|
|
|
do {
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
oldoff = uio->uio_offset;
|
|
|
|
bytelen = uio->uio_resid;
|
1994-07-13 01:03:14 +04:00
|
|
|
|
2000-09-20 03:26:25 +04:00
|
|
|
#ifndef NFS_V2_ONLY
|
1994-06-08 15:33:09 +04:00
|
|
|
/*
|
|
|
|
* Check for a valid write lease.
|
|
|
|
*/
|
|
|
|
if ((nmp->nm_flag & NFSMNT_NQNFS) &&
|
1996-02-18 14:53:36 +03:00
|
|
|
NQNFS_CKINVALID(vp, np, ND_WRITE)) {
|
1994-06-08 15:33:09 +04:00
|
|
|
do {
|
1996-02-18 14:53:36 +03:00
|
|
|
error = nqnfs_getlease(vp, ND_WRITE, cred, p);
|
1994-06-08 15:33:09 +04:00
|
|
|
} while (error == NQNFS_EXPIRED);
|
|
|
|
if (error)
|
|
|
|
return (error);
|
|
|
|
if (np->n_lrev != np->n_brev ||
|
|
|
|
(np->n_flag & NQNFSNONCACHE)) {
|
1996-02-10 00:48:19 +03:00
|
|
|
error = nfs_vinvalbuf(vp, V_SAVE, cred, p, 1);
|
|
|
|
if (error)
|
1994-06-08 15:33:09 +04:00
|
|
|
return (error);
|
|
|
|
np->n_brev = np->n_lrev;
|
|
|
|
}
|
|
|
|
}
|
2000-09-20 03:26:25 +04:00
|
|
|
#endif
|
1993-03-21 12:45:37 +03:00
|
|
|
nfsstats.biocache_writes++;
|
2000-11-27 11:39:39 +03:00
|
|
|
|
1994-06-08 15:33:09 +04:00
|
|
|
np->n_flag |= NMODIFIED;
|
2000-11-27 11:39:39 +03:00
|
|
|
if (np->n_size < uio->uio_offset + bytelen) {
|
|
|
|
np->n_size = uio->uio_offset + bytelen;
|
1994-06-08 15:33:09 +04:00
|
|
|
}
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
if ((uio->uio_offset & PAGE_MASK) == 0 &&
|
|
|
|
((uio->uio_offset + bytelen) & PAGE_MASK) == 0) {
|
|
|
|
win = ubc_alloc(&vp->v_uobj, uio->uio_offset, &bytelen,
|
|
|
|
UBC_WRITE | UBC_FAULTBUSY);
|
|
|
|
} else {
|
|
|
|
win = ubc_alloc(&vp->v_uobj, uio->uio_offset, &bytelen,
|
|
|
|
UBC_WRITE);
|
|
|
|
}
|
2000-11-27 11:39:39 +03:00
|
|
|
error = uiomove(win, bytelen, uio);
|
|
|
|
ubc_release(win, 0);
|
2000-12-27 08:15:43 +03:00
|
|
|
if (error) {
|
2000-11-27 11:39:39 +03:00
|
|
|
break;
|
|
|
|
}
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
|
|
|
|
/*
|
|
|
|
* update UVM's notion of the size now that we've
|
|
|
|
* copied the data into the vnode's pages.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (vp->v_size < uio->uio_offset) {
|
|
|
|
uvm_vnp_setsize(vp, uio->uio_offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((oldoff & ~(nmp->nm_wsize - 1)) !=
|
|
|
|
(uio->uio_offset & ~(nmp->nm_wsize - 1))) {
|
2001-11-30 10:08:53 +03:00
|
|
|
simple_lock(&vp->v_interlock);
|
|
|
|
error = VOP_PUTPAGES(vp,
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
trunc_page(oldoff & ~(nmp->nm_wsize - 1)),
|
|
|
|
round_page((uio->uio_offset + nmp->nm_wsize - 1) &
|
|
|
|
~(nmp->nm_wsize - 1)),
|
2001-11-30 10:08:53 +03:00
|
|
|
PGO_CLEANIT | PGO_WEAK);
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
}
|
2000-11-27 11:39:39 +03:00
|
|
|
} while (uio->uio_resid > 0);
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
if ((np->n_flag & NQNFSNONCACHE) || (ioflag & IO_SYNC)) {
|
2001-11-30 10:08:53 +03:00
|
|
|
simple_lock(&vp->v_interlock);
|
|
|
|
error = VOP_PUTPAGES(vp,
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
trunc_page(origoff & ~(nmp->nm_wsize - 1)),
|
|
|
|
round_page((uio->uio_offset + nmp->nm_wsize - 1) &
|
|
|
|
~(nmp->nm_wsize - 1)),
|
2001-11-30 10:08:53 +03:00
|
|
|
PGO_CLEANIT | PGO_SYNCIO);
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
}
|
2000-11-27 11:39:39 +03:00
|
|
|
return error;
|
1994-06-08 15:33:09 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Get an nfs cache block.
|
|
|
|
* Allocate a new one if the block isn't currently in the cache
|
|
|
|
* and return the block marked busy. If the calling process is
|
|
|
|
* interrupted by a signal for an interruptible mount point, return
|
|
|
|
* NULL.
|
|
|
|
*/
|
|
|
|
struct buf *
|
|
|
|
nfs_getcacheblk(vp, bn, size, p)
|
|
|
|
struct vnode *vp;
|
|
|
|
daddr_t bn;
|
|
|
|
int size;
|
|
|
|
struct proc *p;
|
|
|
|
{
|
2000-03-30 16:51:13 +04:00
|
|
|
struct buf *bp;
|
1994-06-08 15:33:09 +04:00
|
|
|
struct nfsmount *nmp = VFSTONFS(vp->v_mount);
|
|
|
|
|
|
|
|
if (nmp->nm_flag & NFSMNT_INT) {
|
|
|
|
bp = getblk(vp, bn, size, PCATCH, 0);
|
2000-11-27 11:39:39 +03:00
|
|
|
while (bp == NULL) {
|
|
|
|
if (nfs_sigintr(nmp, NULL, p))
|
|
|
|
return (NULL);
|
1994-06-08 15:33:09 +04:00
|
|
|
bp = getblk(vp, bn, size, 0, 2 * hz);
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
bp = getblk(vp, bn, size, 0, 0);
|
|
|
|
return (bp);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Flush and invalidate all dirty buffers. If another process is already
|
|
|
|
* doing the flush, just wait for completion.
|
|
|
|
*/
|
1996-02-10 00:48:19 +03:00
|
|
|
int
|
1994-06-08 15:33:09 +04:00
|
|
|
nfs_vinvalbuf(vp, flags, cred, p, intrflg)
|
|
|
|
struct vnode *vp;
|
|
|
|
int flags;
|
|
|
|
struct ucred *cred;
|
|
|
|
struct proc *p;
|
|
|
|
int intrflg;
|
|
|
|
{
|
2000-03-30 16:51:13 +04:00
|
|
|
struct nfsnode *np = VTONFS(vp);
|
1994-06-08 15:33:09 +04:00
|
|
|
struct nfsmount *nmp = VFSTONFS(vp->v_mount);
|
|
|
|
int error = 0, slpflag, slptimeo;
|
|
|
|
|
|
|
|
if ((nmp->nm_flag & NFSMNT_INT) == 0)
|
|
|
|
intrflg = 0;
|
|
|
|
if (intrflg) {
|
|
|
|
slpflag = PCATCH;
|
|
|
|
slptimeo = 2 * hz;
|
|
|
|
} else {
|
|
|
|
slpflag = 0;
|
|
|
|
slptimeo = 0;
|
|
|
|
}
|
|
|
|
/*
|
|
|
|
* First wait for any other process doing a flush to complete.
|
|
|
|
*/
|
|
|
|
while (np->n_flag & NFLUSHINPROG) {
|
|
|
|
np->n_flag |= NFLUSHWANT;
|
|
|
|
error = tsleep((caddr_t)&np->n_flag, PRIBIO + 2, "nfsvinval",
|
|
|
|
slptimeo);
|
2000-11-27 11:39:39 +03:00
|
|
|
if (error && intrflg && nfs_sigintr(nmp, NULL, p))
|
1994-06-08 15:33:09 +04:00
|
|
|
return (EINTR);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now, flush as required.
|
|
|
|
*/
|
|
|
|
np->n_flag |= NFLUSHINPROG;
|
|
|
|
error = vinvalbuf(vp, flags, cred, p, slpflag, 0);
|
|
|
|
while (error) {
|
2000-11-27 11:39:39 +03:00
|
|
|
if (intrflg && nfs_sigintr(nmp, NULL, p)) {
|
1994-06-08 15:33:09 +04:00
|
|
|
np->n_flag &= ~NFLUSHINPROG;
|
|
|
|
if (np->n_flag & NFLUSHWANT) {
|
|
|
|
np->n_flag &= ~NFLUSHWANT;
|
|
|
|
wakeup((caddr_t)&np->n_flag);
|
|
|
|
}
|
|
|
|
return (EINTR);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1994-06-08 15:33:09 +04:00
|
|
|
error = vinvalbuf(vp, flags, cred, p, 0, slptimeo);
|
1993-03-21 12:45:37 +03:00
|
|
|
}
|
1994-06-08 15:33:09 +04:00
|
|
|
np->n_flag &= ~(NMODIFIED | NFLUSHINPROG);
|
|
|
|
if (np->n_flag & NFLUSHWANT) {
|
|
|
|
np->n_flag &= ~NFLUSHWANT;
|
|
|
|
wakeup((caddr_t)&np->n_flag);
|
|
|
|
}
|
|
|
|
return (0);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Initiate asynchronous I/O. Return an error if no nfsiods are available.
|
|
|
|
* This is mainly to avoid queueing async I/O requests when the nfsiods
|
|
|
|
* are all hung on a dead server.
|
|
|
|
*/
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
|
1996-02-10 00:48:19 +03:00
|
|
|
int
|
2000-11-27 11:39:39 +03:00
|
|
|
nfs_asyncio(bp)
|
2000-03-30 16:51:13 +04:00
|
|
|
struct buf *bp;
|
1994-06-08 15:33:09 +04:00
|
|
|
{
|
2000-03-30 16:51:13 +04:00
|
|
|
int i;
|
|
|
|
struct nfsmount *nmp;
|
1996-12-03 01:55:39 +03:00
|
|
|
int gotiod, slpflag = 0, slptimeo = 0, error;
|
1994-06-08 15:33:09 +04:00
|
|
|
|
|
|
|
if (nfs_numasync == 0)
|
|
|
|
return (EIO);
|
1996-12-03 01:55:39 +03:00
|
|
|
|
|
|
|
nmp = VFSTONFS(bp->b_vp->v_mount);
|
|
|
|
again:
|
|
|
|
if (nmp->nm_flag & NFSMNT_INT)
|
|
|
|
slpflag = PCATCH;
|
|
|
|
gotiod = FALSE;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Find a free iod to process this request.
|
|
|
|
*/
|
|
|
|
|
1994-06-08 15:33:09 +04:00
|
|
|
for (i = 0; i < NFS_MAXASYNCDAEMON; i++)
|
1996-12-03 01:55:39 +03:00
|
|
|
if (nfs_iodwant[i]) {
|
|
|
|
/*
|
|
|
|
* Found one, so wake it up and tell it which
|
|
|
|
* mount to process.
|
|
|
|
*/
|
2000-11-27 11:39:39 +03:00
|
|
|
nfs_iodwant[i] = NULL;
|
1996-12-03 01:55:39 +03:00
|
|
|
nfs_iodmount[i] = nmp;
|
|
|
|
nmp->nm_bufqiods++;
|
|
|
|
wakeup((caddr_t)&nfs_iodwant[i]);
|
|
|
|
gotiod = TRUE;
|
1997-04-20 20:24:44 +04:00
|
|
|
break;
|
1996-12-03 01:55:39 +03:00
|
|
|
}
|
2002-01-26 05:52:19 +03:00
|
|
|
|
1996-12-03 01:55:39 +03:00
|
|
|
/*
|
|
|
|
* If none are free, we may already have an iod working on this mount
|
|
|
|
* point. If so, it will process our request.
|
|
|
|
*/
|
2002-01-26 05:52:19 +03:00
|
|
|
|
1996-12-03 01:55:39 +03:00
|
|
|
if (!gotiod && nmp->nm_bufqiods > 0)
|
|
|
|
gotiod = TRUE;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we have an iod which can process the request, then queue
|
|
|
|
* the buffer.
|
|
|
|
*/
|
2002-01-26 05:52:19 +03:00
|
|
|
|
1996-12-03 01:55:39 +03:00
|
|
|
if (gotiod) {
|
2002-01-26 05:52:19 +03:00
|
|
|
|
1996-12-03 01:55:39 +03:00
|
|
|
/*
|
|
|
|
* Ensure that the queue never grows too large.
|
|
|
|
*/
|
2002-01-26 05:52:19 +03:00
|
|
|
|
1996-12-03 01:55:39 +03:00
|
|
|
while (nmp->nm_bufqlen >= 2*nfs_numasync) {
|
|
|
|
nmp->nm_bufqwant = TRUE;
|
|
|
|
error = tsleep(&nmp->nm_bufq, slpflag | PRIBIO,
|
|
|
|
"nfsaio", slptimeo);
|
|
|
|
if (error) {
|
|
|
|
if (nfs_sigintr(nmp, NULL, bp->b_proc))
|
|
|
|
return (EINTR);
|
|
|
|
if (slpflag == PCATCH) {
|
|
|
|
slpflag = 0;
|
|
|
|
slptimeo = 2 * hz;
|
|
|
|
}
|
|
|
|
}
|
2002-01-26 05:52:19 +03:00
|
|
|
|
1996-12-03 01:55:39 +03:00
|
|
|
/*
|
|
|
|
* We might have lost our iod while sleeping,
|
|
|
|
* so check and loop if nescessary.
|
|
|
|
*/
|
2002-01-26 05:52:19 +03:00
|
|
|
|
1996-12-03 01:55:39 +03:00
|
|
|
if (nmp->nm_bufqiods == 0)
|
|
|
|
goto again;
|
|
|
|
}
|
|
|
|
TAILQ_INSERT_TAIL(&nmp->nm_bufq, bp, b_freelist);
|
|
|
|
nmp->nm_bufqlen++;
|
1994-06-08 15:33:09 +04:00
|
|
|
return (0);
|
2002-01-26 05:52:19 +03:00
|
|
|
}
|
1996-02-18 14:53:36 +03:00
|
|
|
|
|
|
|
/*
|
1996-12-03 01:55:39 +03:00
|
|
|
* All the iods are busy on other mounts, so return EIO to
|
|
|
|
* force the caller to process the i/o synchronously.
|
1996-02-18 14:53:36 +03:00
|
|
|
*/
|
2002-01-26 05:52:19 +03:00
|
|
|
|
1996-12-03 01:55:39 +03:00
|
|
|
return (EIO);
|
1994-06-08 15:33:09 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Do an I/O operation to/from a cache block. This may be called
|
|
|
|
* synchronously or from an nfsiod.
|
|
|
|
*/
|
|
|
|
int
|
2000-11-27 11:39:39 +03:00
|
|
|
nfs_doio(bp, p)
|
2000-03-30 16:51:13 +04:00
|
|
|
struct buf *bp;
|
1994-06-08 15:33:09 +04:00
|
|
|
struct proc *p;
|
|
|
|
{
|
2000-03-30 16:51:13 +04:00
|
|
|
struct uio *uiop;
|
|
|
|
struct vnode *vp;
|
1994-06-08 15:33:09 +04:00
|
|
|
struct nfsnode *np;
|
|
|
|
struct nfsmount *nmp;
|
2000-11-27 11:39:39 +03:00
|
|
|
int error = 0, diff, len, iomode, must_commit = 0;
|
2002-01-26 05:52:19 +03:00
|
|
|
int pushedrange;
|
1994-06-08 15:33:09 +04:00
|
|
|
struct uio uio;
|
|
|
|
struct iovec io;
|
2002-01-26 05:52:19 +03:00
|
|
|
off_t off, cnt;
|
|
|
|
struct uvm_object *uobj;
|
|
|
|
UVMHIST_FUNC("nfs_doio"); UVMHIST_CALLED(ubchist);
|
1994-06-08 15:33:09 +04:00
|
|
|
|
|
|
|
vp = bp->b_vp;
|
2002-01-26 05:52:19 +03:00
|
|
|
uobj = &vp->v_uobj;
|
1994-06-08 15:33:09 +04:00
|
|
|
np = VTONFS(vp);
|
|
|
|
nmp = VFSTONFS(vp->v_mount);
|
|
|
|
uiop = &uio;
|
|
|
|
uiop->uio_iov = &io;
|
|
|
|
uiop->uio_iovcnt = 1;
|
|
|
|
uiop->uio_segflg = UIO_SYSSPACE;
|
|
|
|
uiop->uio_procp = p;
|
|
|
|
|
|
|
|
/*
|
1994-06-22 18:01:45 +04:00
|
|
|
* Historically, paging was done with physio, but no more...
|
1994-06-08 15:33:09 +04:00
|
|
|
*/
|
1994-06-22 18:01:45 +04:00
|
|
|
if (bp->b_flags & B_PHYS) {
|
|
|
|
/*
|
|
|
|
* ...though reading /dev/drum still gets us here.
|
|
|
|
*/
|
|
|
|
io.iov_len = uiop->uio_resid = bp->b_bcount;
|
|
|
|
/* mapping was done by vmapbuf() */
|
|
|
|
io.iov_base = bp->b_data;
|
2000-11-27 11:39:39 +03:00
|
|
|
uiop->uio_offset = ((off_t)bp->b_blkno) << DEV_BSHIFT;
|
1994-06-22 18:01:45 +04:00
|
|
|
if (bp->b_flags & B_READ) {
|
|
|
|
uiop->uio_rw = UIO_READ;
|
|
|
|
nfsstats.read_physios++;
|
2000-11-27 11:39:39 +03:00
|
|
|
error = nfs_readrpc(vp, uiop);
|
1994-06-22 18:01:45 +04:00
|
|
|
} else {
|
1996-02-18 14:53:36 +03:00
|
|
|
iomode = NFSV3WRITE_DATASYNC;
|
1994-06-22 18:01:45 +04:00
|
|
|
uiop->uio_rw = UIO_WRITE;
|
|
|
|
nfsstats.write_physios++;
|
2000-11-27 11:39:39 +03:00
|
|
|
error = nfs_writerpc(vp, uiop, &iomode, &must_commit);
|
1994-06-22 18:01:45 +04:00
|
|
|
}
|
|
|
|
if (error) {
|
|
|
|
bp->b_flags |= B_ERROR;
|
|
|
|
bp->b_error = error;
|
|
|
|
}
|
|
|
|
} else if (bp->b_flags & B_READ) {
|
1994-06-08 15:33:09 +04:00
|
|
|
io.iov_len = uiop->uio_resid = bp->b_bcount;
|
|
|
|
io.iov_base = bp->b_data;
|
|
|
|
uiop->uio_rw = UIO_READ;
|
|
|
|
switch (vp->v_type) {
|
|
|
|
case VREG:
|
2000-11-27 11:39:39 +03:00
|
|
|
uiop->uio_offset = ((off_t)bp->b_blkno) << DEV_BSHIFT;
|
1994-06-08 15:33:09 +04:00
|
|
|
nfsstats.read_bios++;
|
2000-11-27 11:39:39 +03:00
|
|
|
error = nfs_readrpc(vp, uiop);
|
|
|
|
if (!error && uiop->uio_resid) {
|
|
|
|
|
1994-06-08 15:33:09 +04:00
|
|
|
/*
|
|
|
|
* If len > 0, there is a hole in the file and
|
|
|
|
* no writes after the hole have been pushed to
|
|
|
|
* the server yet.
|
|
|
|
* Just zero fill the rest of the valid area.
|
|
|
|
*/
|
2000-11-27 11:39:39 +03:00
|
|
|
|
1994-06-08 15:33:09 +04:00
|
|
|
diff = bp->b_bcount - uiop->uio_resid;
|
2000-11-27 11:39:39 +03:00
|
|
|
len = np->n_size - ((((off_t)bp->b_blkno) << DEV_BSHIFT)
|
1994-06-08 15:33:09 +04:00
|
|
|
+ diff);
|
|
|
|
if (len > 0) {
|
2001-02-27 07:37:44 +03:00
|
|
|
len = MIN(len, uiop->uio_resid);
|
2000-11-27 11:39:39 +03:00
|
|
|
memset((char *)bp->b_data + diff, 0, len);
|
|
|
|
}
|
1994-06-08 15:33:09 +04:00
|
|
|
}
|
|
|
|
if (p && (vp->v_flag & VTEXT) &&
|
|
|
|
(((nmp->nm_flag & NFSMNT_NQNFS) &&
|
1996-02-18 14:53:36 +03:00
|
|
|
NQNFS_CKINVALID(vp, np, ND_READ) &&
|
1994-06-08 15:33:09 +04:00
|
|
|
np->n_lrev != np->n_brev) ||
|
|
|
|
(!(nmp->nm_flag & NFSMNT_NQNFS) &&
|
1997-10-19 05:46:15 +04:00
|
|
|
np->n_mtime != np->n_vattr->va_mtime.tv_sec))) {
|
2000-11-27 11:39:39 +03:00
|
|
|
uprintf("Process killed due to "
|
|
|
|
"text file modification\n");
|
1994-06-08 15:33:09 +04:00
|
|
|
psignal(p, SIGKILL);
|
1994-06-15 23:59:21 +04:00
|
|
|
p->p_holdcnt++;
|
1994-06-08 15:33:09 +04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case VLNK:
|
1996-02-18 14:53:36 +03:00
|
|
|
uiop->uio_offset = (off_t)0;
|
1994-06-08 15:33:09 +04:00
|
|
|
nfsstats.readlink_bios++;
|
2000-11-27 11:39:39 +03:00
|
|
|
error = nfs_readlinkrpc(vp, uiop, curproc->p_ucred);
|
1994-06-08 15:33:09 +04:00
|
|
|
break;
|
|
|
|
case VDIR:
|
|
|
|
nfsstats.readdir_bios++;
|
1997-10-10 05:53:17 +04:00
|
|
|
uiop->uio_offset = bp->b_dcookie;
|
1996-02-18 14:53:36 +03:00
|
|
|
if (nmp->nm_flag & NFSMNT_RDIRPLUS) {
|
2000-11-27 11:39:39 +03:00
|
|
|
error = nfs_readdirplusrpc(vp, uiop, curproc->p_ucred);
|
1996-02-18 14:53:36 +03:00
|
|
|
if (error == NFSERR_NOTSUPP)
|
|
|
|
nmp->nm_flag &= ~NFSMNT_RDIRPLUS;
|
|
|
|
}
|
|
|
|
if ((nmp->nm_flag & NFSMNT_RDIRPLUS) == 0)
|
2000-11-27 11:39:39 +03:00
|
|
|
error = nfs_readdirrpc(vp, uiop, curproc->p_ucred);
|
1997-10-10 05:53:17 +04:00
|
|
|
if (!error) {
|
|
|
|
bp->b_dcookie = uiop->uio_offset;
|
|
|
|
}
|
1996-02-18 14:53:36 +03:00
|
|
|
break;
|
|
|
|
default:
|
1996-10-13 05:39:03 +04:00
|
|
|
printf("nfs_doio: type %x unexpected\n",vp->v_type);
|
1994-06-08 15:33:09 +04:00
|
|
|
break;
|
2000-11-27 11:39:39 +03:00
|
|
|
}
|
1994-06-08 15:33:09 +04:00
|
|
|
if (error) {
|
|
|
|
bp->b_flags |= B_ERROR;
|
|
|
|
bp->b_error = error;
|
|
|
|
}
|
|
|
|
} else {
|
2002-01-26 05:52:19 +03:00
|
|
|
int i, npages = bp->b_bufsize >> PAGE_SHIFT;
|
|
|
|
struct vm_page *pgs[npages];
|
|
|
|
boolean_t needcommit = TRUE;
|
|
|
|
|
|
|
|
if ((bp->b_flags & B_ASYNC) != 0) {
|
|
|
|
iomode = NFSV3WRITE_UNSTABLE;
|
|
|
|
} else {
|
|
|
|
iomode = NFSV3WRITE_FILESYNC;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < npages; i++) {
|
|
|
|
pgs[i] = uvm_pageratop((vaddr_t)bp->b_data +
|
|
|
|
(i << PAGE_SHIFT));
|
|
|
|
if ((pgs[i]->flags & PG_NEEDCOMMIT) == 0) {
|
|
|
|
needcommit = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (!needcommit && iomode == NFSV3WRITE_UNSTABLE) {
|
|
|
|
for (i = 0; i < npages; i++) {
|
|
|
|
pgs[i]->flags |= PG_NEEDCOMMIT | PG_RDONLY;
|
|
|
|
pmap_page_protect(pgs[i], VM_PROT_READ);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
uiop->uio_offset = (((off_t)bp->b_blkno) << DEV_BSHIFT);
|
|
|
|
off = uiop->uio_offset;
|
|
|
|
cnt = bp->b_bcount;
|
|
|
|
|
2000-09-20 02:11:47 +04:00
|
|
|
/*
|
2002-01-26 05:52:19 +03:00
|
|
|
* Send the data to the server if necessary,
|
|
|
|
* otherwise just send a commit rpc.
|
2000-09-20 02:11:47 +04:00
|
|
|
*/
|
2000-11-27 11:39:39 +03:00
|
|
|
|
2002-01-26 05:52:19 +03:00
|
|
|
if (needcommit) {
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If the buffer is in the range that we already committed,
|
|
|
|
* there's nothing to do.
|
|
|
|
*
|
|
|
|
* If it's in the range that we need to commit, push the
|
|
|
|
* whole range at once, otherwise only push the buffer.
|
|
|
|
* In both these cases, acquire the commit lock to avoid
|
|
|
|
* other processes modifying the range.
|
|
|
|
*/
|
|
|
|
|
|
|
|
lockmgr(&np->n_commitlock, LK_EXCLUSIVE, NULL);
|
|
|
|
if (!nfs_in_committed_range(vp, off, bp->b_bcount)) {
|
|
|
|
if (nfs_in_tobecommitted_range(vp, off, bp->b_bcount)) {
|
|
|
|
pushedrange = 1;
|
|
|
|
off = np->n_pushlo;
|
|
|
|
cnt = np->n_pushhi - np->n_pushlo;
|
|
|
|
} else {
|
|
|
|
pushedrange = 0;
|
|
|
|
}
|
|
|
|
error = nfs_commit(vp, off, cnt, bp->b_proc);
|
|
|
|
if (error == 0) {
|
|
|
|
if (pushedrange) {
|
|
|
|
nfs_merge_commit_ranges(vp);
|
|
|
|
} else {
|
|
|
|
nfs_add_committed_range(vp, off, cnt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
lockmgr(&np->n_commitlock, LK_RELEASE, NULL);
|
|
|
|
if (!error) {
|
|
|
|
bp->b_resid = 0;
|
|
|
|
simple_lock(&uobj->vmobjlock);
|
|
|
|
for (i = 0; i < npages; i++) {
|
|
|
|
pgs[i]->flags &= ~(PG_NEEDCOMMIT | PG_RDONLY);
|
|
|
|
}
|
|
|
|
simple_unlock(&uobj->vmobjlock);
|
|
|
|
biodone(bp);
|
|
|
|
return (0);
|
|
|
|
} else if (error == NFSERR_STALEWRITEVERF) {
|
|
|
|
nfs_clearcommit(bp->b_vp->v_mount);
|
|
|
|
}
|
|
|
|
}
|
2000-11-27 11:39:39 +03:00
|
|
|
io.iov_base = bp->b_data;
|
|
|
|
io.iov_len = uiop->uio_resid = bp->b_bcount;
|
|
|
|
uiop->uio_rw = UIO_WRITE;
|
|
|
|
nfsstats.write_bios++;
|
|
|
|
error = nfs_writerpc(vp, uiop, &iomode, &must_commit);
|
2002-01-26 05:52:19 +03:00
|
|
|
if (!error && iomode == NFSV3WRITE_UNSTABLE) {
|
|
|
|
lockmgr(&np->n_commitlock, LK_EXCLUSIVE, NULL);
|
|
|
|
nfs_add_tobecommitted_range(vp, off, cnt);
|
|
|
|
simple_lock(&uobj->vmobjlock);
|
|
|
|
for (i = 0; i < npages; i++) {
|
|
|
|
pgs[i]->flags &= ~PG_CLEAN;
|
|
|
|
}
|
|
|
|
simple_unlock(&uobj->vmobjlock);
|
|
|
|
if (np->n_pushhi - np->n_pushlo > nfs_commitsize) {
|
|
|
|
off = np->n_pushlo;
|
|
|
|
cnt = nfs_commitsize >> 1;
|
|
|
|
error = nfs_commit(vp, off, cnt, bp->b_proc);
|
|
|
|
if (!error) {
|
|
|
|
nfs_add_committed_range(vp, off, cnt);
|
|
|
|
nfs_del_tobecommitted_range(vp, off, cnt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
lockmgr(&np->n_commitlock, LK_RELEASE, NULL);
|
|
|
|
} else if (!error && needcommit) {
|
|
|
|
lockmgr(&np->n_commitlock, LK_EXCLUSIVE, NULL);
|
|
|
|
nfs_del_committed_range(vp, off, cnt);
|
|
|
|
lockmgr(&np->n_commitlock, LK_RELEASE, NULL);
|
|
|
|
simple_lock(&uobj->vmobjlock);
|
|
|
|
for (i = 0; i < npages; i++) {
|
|
|
|
pgs[i]->flags &= ~(PG_NEEDCOMMIT | PG_RDONLY);
|
|
|
|
}
|
|
|
|
simple_unlock(&uobj->vmobjlock);
|
|
|
|
}
|
2000-11-27 11:39:39 +03:00
|
|
|
}
|
|
|
|
bp->b_resid = uiop->uio_resid;
|
2002-01-26 05:52:19 +03:00
|
|
|
if (must_commit || (error == NFSERR_STALEWRITEVERF)) {
|
2000-11-27 11:39:39 +03:00
|
|
|
nfs_clearcommit(vp->v_mount);
|
2002-01-26 05:52:19 +03:00
|
|
|
}
|
2000-11-27 11:39:39 +03:00
|
|
|
biodone(bp);
|
|
|
|
return (error);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Vnode op for VM getpages.
|
|
|
|
*/
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
|
2000-11-27 11:39:39 +03:00
|
|
|
int
|
|
|
|
nfs_getpages(v)
|
|
|
|
void *v;
|
|
|
|
{
|
|
|
|
struct vop_getpages_args /* {
|
|
|
|
struct vnode *a_vp;
|
|
|
|
voff_t a_offset;
|
2001-05-27 01:27:10 +04:00
|
|
|
struct vm_page **a_m;
|
2000-11-27 11:39:39 +03:00
|
|
|
int *a_count;
|
|
|
|
int a_centeridx;
|
|
|
|
vm_prot_t a_access_type;
|
|
|
|
int a_advice;
|
|
|
|
int a_flags;
|
|
|
|
} */ *ap = v;
|
|
|
|
|
|
|
|
struct vnode *vp = ap->a_vp;
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
struct uvm_object *uobj = &vp->v_uobj;
|
2000-11-27 11:39:39 +03:00
|
|
|
struct nfsnode *np = VTONFS(vp);
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
struct vm_page *pg, **pgs;
|
2002-01-26 05:52:19 +03:00
|
|
|
off_t origoffset, len;
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
int i, error, npages;
|
2000-11-27 11:39:39 +03:00
|
|
|
boolean_t v3 = NFS_ISV3(vp);
|
|
|
|
boolean_t write = (ap->a_access_type & VM_PROT_WRITE) != 0;
|
2001-12-31 10:16:47 +03:00
|
|
|
boolean_t locked = (ap->a_flags & PGO_LOCKED) != 0;
|
2000-11-27 11:39:39 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* update the cached read creds for this node.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (np->n_rcred) {
|
|
|
|
crfree(np->n_rcred);
|
|
|
|
}
|
|
|
|
np->n_rcred = curproc->p_ucred;
|
|
|
|
crhold(np->n_rcred);
|
|
|
|
|
|
|
|
/*
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
* call the genfs code to get the pages.
|
2000-11-27 11:39:39 +03:00
|
|
|
*/
|
|
|
|
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
npages = *ap->a_count;
|
|
|
|
error = genfs_getpages(v);
|
|
|
|
if (error || !write || !v3) {
|
|
|
|
return error;
|
2000-11-27 11:39:39 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
* this is a write fault, update the commit info.
|
2000-11-27 11:39:39 +03:00
|
|
|
*/
|
|
|
|
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
pgs = ap->a_m;
|
2002-01-26 05:52:19 +03:00
|
|
|
origoffset = ap->a_offset;
|
|
|
|
len = npages << PAGE_SHIFT;
|
2000-11-27 11:39:39 +03:00
|
|
|
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
lockmgr(&np->n_commitlock, LK_EXCLUSIVE, NULL);
|
2002-01-26 05:52:19 +03:00
|
|
|
nfs_del_committed_range(vp, origoffset, len);
|
|
|
|
nfs_del_tobecommitted_range(vp, origoffset, len);
|
2001-12-31 10:16:47 +03:00
|
|
|
if (!locked) {
|
|
|
|
simple_lock(&uobj->vmobjlock);
|
|
|
|
}
|
2000-11-27 11:39:39 +03:00
|
|
|
for (i = 0; i < npages; i++) {
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
pg = pgs[i];
|
|
|
|
if (pg == NULL || pg == PGO_DONTCARE) {
|
2000-11-27 11:39:39 +03:00
|
|
|
continue;
|
|
|
|
}
|
2002-01-26 05:52:19 +03:00
|
|
|
pg->flags &= ~(PG_NEEDCOMMIT | PG_RDONLY);
|
2000-11-27 11:39:39 +03:00
|
|
|
}
|
2001-12-31 10:16:47 +03:00
|
|
|
if (!locked) {
|
|
|
|
simple_unlock(&uobj->vmobjlock);
|
|
|
|
}
|
a whole bunch of changes to improve performance and robustness under load:
- remove special treatment of pager_map mappings in pmaps. this is
required now, since I've removed the globals that expose the address range.
pager_map now uses pmap_kenter_pa() instead of pmap_enter(), so there's
no longer any need to special-case it.
- eliminate struct uvm_vnode by moving its fields into struct vnode.
- rewrite the pageout path. the pager is now responsible for handling the
high-level requests instead of only getting control after a bunch of work
has already been done on its behalf. this will allow us to UBCify LFS,
which needs tighter control over its pages than other filesystems do.
writing a page to disk no longer requires making it read-only, which
allows us to write wired pages without causing all kinds of havoc.
- use a new PG_PAGEOUT flag to indicate that a page should be freed
on behalf of the pagedaemon when it's unlocked. this flag is very similar
to PG_RELEASED, but unlike PG_RELEASED, PG_PAGEOUT can be cleared if the
pageout fails due to eg. an indirect-block buffer being locked.
this allows us to remove the "version" field from struct vm_page,
and together with shrinking "loan_count" from 32 bits to 16,
struct vm_page is now 4 bytes smaller.
- no longer use PG_RELEASED for swap-backed pages. if the page is busy
because it's being paged out, we can't release the swap slot to be
reallocated until that write is complete, but unlike with vnodes we
don't keep a count of in-progress writes so there's no good way to
know when the write is done. instead, when we need to free a busy
swap-backed page, just sleep until we can get it busy ourselves.
- implement a fast-path for extending writes which allows us to avoid
zeroing new pages. this substantially reduces cpu usage.
- encapsulate the data used by the genfs code in a struct genfs_node,
which must be the first element of the filesystem-specific vnode data
for filesystems which use genfs_{get,put}pages().
- eliminate many of the UVM pagerops, since they aren't needed anymore
now that the pager "put" operation is a higher-level operation.
- enhance the genfs code to allow NFS to use the genfs_{get,put}pages
instead of a modified copy.
- clean up struct vnode by removing all the fields that used to be used by
the vfs_cluster.c code (which we don't use anymore with UBC).
- remove kmem_object and mb_object since they were useless.
instead of allocating pages to these objects, we now just allocate
pages with no object. such pages are mapped in the kernel until they
are freed, so we can use the mapping to find the page to free it.
this allows us to remove splvm() protection in several places.
The sum of all these changes improves write throughput on my
decstation 5000/200 to within 1% of the rate of NetBSD 1.5
and reduces the elapsed time for "make release" of a NetBSD 1.5
source tree on my 128MB pc to 10% less than a 1.5 kernel took.
2001-09-16 00:36:31 +04:00
|
|
|
lockmgr(&np->n_commitlock, LK_RELEASE, NULL);
|
2001-02-05 15:27:18 +03:00
|
|
|
return 0;
|
2000-11-27 11:39:39 +03:00
|
|
|
}
|