d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make nfs pageout coherent with the dirty state of the buffers.

Browse Source 
Write out the dirty pages using VOP_WRITE() instead of directly
calling ncl_writerpc(). The state of the buffers now reflects the
write, fixing some hard to diagnose consistency and write order
issues.  The change also allowed to remove remapping of paged out
pages into kernel space and related allocation of the phys buffer.

Reviewed by:	markj, rmacklem
Tested by:	pho
Sponsored by:	The FreeBSD Foundation
MFC after:	2 weeks
Differential revision:	https://reviews.freebsd.org/D10241
This commit is contained in:
Konstantin Belousov 2017-04-05 17:26:20 +00:00
parent b73cd4d344
commit ea52525928
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=316532
1 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/fs/nfsclient/nfs_clbio.c
View File

@ -266,9 +266,7 @@ ncl_putpages(struct vop_putpages_args *ap)
{ {
struct uio uio; struct uio uio;
struct iovec iov; struct iovec iov;
vm_offset_t kva; int i, error, npages, count;
struct buf *bp;
int iomode, must_commit, i, error, npages, count;
off_t offset; off_t offset;
int *rtvals; int *rtvals;
struct vnode *vp; struct vnode *vp;
@ -322,44 +320,26 @@ ncl_putpages(struct vop_putpages_args *ap)
} }
mtx_unlock(&np->n_mtx); mtx_unlock(&np->n_mtx);
/*
* We use only the kva address for the buffer, but this is extremely
* convenient and fast.
*/
bp = getpbuf(&ncl_pbuf_freecnt);
kva = (vm_offset_t) bp->b_data;
pmap_qenter(kva, pages, npages);
PCPU_INC(cnt.v_vnodeout); PCPU_INC(cnt.v_vnodeout);
PCPU_ADD(cnt.v_vnodepgsout, count); PCPU_ADD(cnt.v_vnodepgsout, count);
iov.iov_base = (caddr_t) kva; iov.iov_base = unmapped_buf;
iov.iov_len = count; iov.iov_len = count;
uio.uio_iov = &iov; uio.uio_iov = &iov;
uio.uio_iovcnt = 1; uio.uio_iovcnt = 1;
uio.uio_offset = offset; uio.uio_offset = offset;
uio.uio_resid = count; uio.uio_resid = count;
uio.uio_segflg = UIO_SYSSPACE; uio.uio_segflg = UIO_NOCOPY;
uio.uio_rw = UIO_WRITE; uio.uio_rw = UIO_WRITE;
uio.uio_td = td; uio.uio_td = td;
if ((ap->a_sync & VM_PAGER_PUT_SYNC) == 0) error = VOP_WRITE(vp, &uio, vnode_pager_putpages_ioflags(ap->a_sync),
iomode = NFSWRITE_UNSTABLE; cred);
else
iomode = NFSWRITE_FILESYNC;
error = ncl_writerpc(vp, &uio, cred, &iomode, &must_commit, 0);
crfree(cred); crfree(cred);
pmap_qremove(kva, npages); if (error == 0 || !nfs_keep_dirty_on_error)
relpbuf(bp, &ncl_pbuf_freecnt);
if (error == 0 || !nfs_keep_dirty_on_error) {
vnode_pager_undirty_pages(pages, rtvals, count - uio.uio_resid); vnode_pager_undirty_pages(pages, rtvals, count - uio.uio_resid);
if (must_commit) return (rtvals[0]);
ncl_clearcommit(vp->v_mount);
}
return rtvals[0];
} }
/* /*
@ -1385,7 +1365,8 @@ ncl_vinvalbuf(struct vnode *vp, int flags, struct thread *td, int intrflg)
/* /*
* Now, flush as required. * Now, flush as required.
*/ */
if ((flags & V_SAVE) && (vp->v_bufobj.bo_object != NULL)) { if ((flags & (V_SAVE | V_VMIO)) == V_SAVE &&
vp->v_bufobj.bo_object != NULL) {
VM_OBJECT_WLOCK(vp->v_bufobj.bo_object); VM_OBJECT_WLOCK(vp->v_bufobj.bo_object);
vm_object_page_clean(vp->v_bufobj.bo_object, 0, 0, OBJPC_SYNC); vm_object_page_clean(vp->v_bufobj.bo_object, 0, 0, OBJPC_SYNC);
VM_OBJECT_WUNLOCK(vp->v_bufobj.bo_object); VM_OBJECT_WUNLOCK(vp->v_bufobj.bo_object);