Index: external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c =================================================================== RCS file: /cvsroot/src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c,v retrieving revision 1.62 diff -u -p -r1.62 zfs_vnops.c --- external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c 23 Feb 2020 15:46:38 -0000 1.62 +++ external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c 8 Mar 2020 18:36:20 -0000 @@ -6028,19 +6028,9 @@ zfs_netbsd_getpages(void *v) pg->flags &= ~(PG_FAKE); } - if (memwrite) { - if (uvm_pagegetdirty(pg) == UVM_PAGE_STATUS_CLEAN) { - /* For write faults, start dirtiness tracking. */ - uvm_pagemarkdirty(pg, UVM_PAGE_STATUS_UNKNOWN); - } - mutex_enter(vp->v_interlock); - if ((vp->v_iflag & VI_ONWORKLST) == 0) { - vn_syncer_add_to_worklist(vp, filedelay); - } - if ((vp->v_iflag & (VI_WRMAP|VI_WRMAPDIRTY)) == VI_WRMAP) { - vp->v_iflag |= VI_WRMAPDIRTY; - } - mutex_exit(vp->v_interlock); + if (memwrite && uvm_pagegetdirty(pg) == UVM_PAGE_STATUS_CLEAN) { + /* For write faults, start dirtiness tracking. */ + uvm_pagemarkdirty(pg, UVM_PAGE_STATUS_UNKNOWN); } rw_exit(rw); ap->a_m[ap->a_centeridx] = pg; Index: sys/kern/vfs_subr.c =================================================================== RCS file: /cvsroot/src/sys/kern/vfs_subr.c,v retrieving revision 1.483 diff -u -p -r1.483 vfs_subr.c --- sys/kern/vfs_subr.c 1 Mar 2020 21:39:07 -0000 1.483 +++ sys/kern/vfs_subr.c 8 Mar 2020 18:36:48 -0000 @@ -422,10 +422,8 @@ brelvp(struct buf *bp) bufremvn(bp); if ((vp->v_iflag & (VI_ONWORKLST | VI_PAGES)) == VI_ONWORKLST && - LIST_FIRST(&vp->v_dirtyblkhd) == NULL) { - KASSERT((vp->v_iflag & VI_WRMAPDIRTY) == 0); + LIST_FIRST(&vp->v_dirtyblkhd) == NULL) vn_syncer_remove_from_worklist(vp); - } bp->b_objlock = &buffer_lock; bp->b_vp = NULL; @@ -463,10 +461,8 @@ reassignbuf(struct buf *bp, struct vnode listheadp = &vp->v_cleanblkhd; if ((vp->v_iflag & (VI_ONWORKLST | VI_PAGES)) == VI_ONWORKLST && - LIST_FIRST(&vp->v_dirtyblkhd) == NULL) { - KASSERT((vp->v_iflag & VI_WRMAPDIRTY) == 0); + LIST_FIRST(&vp->v_dirtyblkhd) == NULL) vn_syncer_remove_from_worklist(vp); - } } else { listheadp = &vp->v_dirtyblkhd; if ((vp->v_iflag & VI_ONWORKLST) == 0) { Index: sys/miscfs/genfs/genfs_io.c =================================================================== RCS file: /cvsroot/src/sys/miscfs/genfs/genfs_io.c,v retrieving revision 1.88 diff -u -p -r1.88 genfs_io.c --- sys/miscfs/genfs/genfs_io.c 27 Feb 2020 22:12:54 -0000 1.88 +++ sys/miscfs/genfs/genfs_io.c 8 Mar 2020 18:36:48 -0000 @@ -61,7 +61,6 @@ static int genfs_getpages_read(struct vn static int genfs_do_io(struct vnode *, off_t, vaddr_t, size_t, int, enum uio_rw, void (*)(struct buf *)); static void genfs_rel_pages(struct vm_page **, unsigned int); -static void genfs_markdirty(struct vnode *); int genfs_maxdio = MAXPHYS; @@ -83,22 +82,6 @@ genfs_rel_pages(struct vm_page **pgs, un uvm_page_unbusy(pgs, npages); } -static void -genfs_markdirty(struct vnode *vp) -{ - - KASSERT(rw_write_held(vp->v_uobj.vmobjlock)); - - mutex_enter(vp->v_interlock); - if ((vp->v_iflag & VI_ONWORKLST) == 0) { - vn_syncer_add_to_worklist(vp, filedelay); - } - if ((vp->v_iflag & (VI_WRMAP|VI_WRMAPDIRTY)) == VI_WRMAP) { - vp->v_iflag |= VI_WRMAPDIRTY; - } - mutex_exit(vp->v_interlock); -} - /* * generic VM getpages routine. * Return PG_BUSY pages for the given range, @@ -278,7 +261,6 @@ startover: UVM_PAGE_STATUS_UNKNOWN); } } - genfs_markdirty(vp); } goto out_err; } @@ -549,9 +529,6 @@ out: uvm_pagemarkdirty(pg, UVM_PAGE_STATUS_UNKNOWN); } } - if (memwrite) { - genfs_markdirty(vp); - } rw_exit(uobj->vmobjlock); if (ap->a_m != NULL) { memcpy(ap->a_m, &pgs[ridx], @@ -915,8 +892,6 @@ genfs_do_putpages(struct vnode *vp, off_ retry: modified = false; flags = origflags; - KASSERT((vp->v_iflag & VI_ONWORKLST) != 0 || - (vp->v_iflag & VI_WRMAPDIRTY) == 0); /* * shortcut if we have no pages to process. @@ -924,10 +899,14 @@ retry: nodirty = radix_tree_empty_tagged_tree_p(&uobj->uo_pages, UVM_PAGE_DIRTY_TAG); +#ifdef DIAGNOSTIC + mutex_enter(vp->v_interlock); + KASSERT((vp->v_iflag & VI_ONWORKLST) != 0 || nodirty); + mutex_exit(vp->v_interlock); +#endif if (uobj->uo_npages == 0 || (dirtyonly && nodirty)) { mutex_enter(vp->v_interlock); if (vp->v_iflag & VI_ONWORKLST) { - vp->v_iflag &= ~VI_WRMAPDIRTY; if (LIST_FIRST(&vp->v_dirtyblkhd) == NULL) vn_syncer_remove_from_worklist(vp); } @@ -1155,7 +1133,6 @@ retry: */ if (needs_clean) { - KDASSERT((vp->v_iflag & VI_ONWORKLST)); wasclean = false; memset(pgs, 0, sizeof(pgs)); pg->flags |= PG_BUSY; @@ -1325,7 +1302,7 @@ retry: */ mutex_enter(vp->v_interlock); - if (modified && (vp->v_iflag & VI_WRMAPDIRTY) != 0 && + if (modified && (vp->v_iflag & VI_WRMAP) != 0 && (vp->v_type != VBLK || (vp->v_mount->mnt_flag & MNT_NODEVMTIME) == 0)) { GOP_MARKUPDATE(vp, GOP_UPDATE_MODIFIED); @@ -1339,7 +1316,6 @@ retry: if ((vp->v_iflag & VI_ONWORKLST) != 0 && radix_tree_empty_tagged_tree_p(&uobj->uo_pages, UVM_PAGE_DIRTY_TAG)) { - vp->v_iflag &= ~VI_WRMAPDIRTY; if (LIST_FIRST(&vp->v_dirtyblkhd) == NULL) vn_syncer_remove_from_worklist(vp); } @@ -1640,9 +1616,6 @@ genfs_compat_getpages(void *v) UFP_NOWAIT|UFP_NOALLOC| (memwrite ? UFP_NORDONLY : 0)); error = ap->a_m[ap->a_centeridx] == NULL ? EBUSY : 0; - if (error == 0 && memwrite) { - genfs_markdirty(vp); - } return error; } if (origoffset + (ap->a_centeridx << PAGE_SHIFT) >= vp->v_size) { @@ -1696,9 +1669,6 @@ genfs_compat_getpages(void *v) if (error) { uvm_page_unbusy(pgs, npages); } - if (error == 0 && memwrite) { - genfs_markdirty(vp); - } rw_exit(uobj->vmobjlock); return error; } Index: sys/sys/vnode.h =================================================================== RCS file: /cvsroot/src/sys/sys/vnode.h,v retrieving revision 1.292 diff -u -p -r1.292 vnode.h --- sys/sys/vnode.h 5 Mar 2020 15:18:55 -0000 1.292 +++ sys/sys/vnode.h 8 Mar 2020 18:36:49 -0000 @@ -210,9 +210,8 @@ typedef struct vnode vnode_t; #define VI_TEXT 0x00000100 /* vnode is a pure text prototype */ #define VI_EXECMAP 0x00000200 /* might have PROT_EXEC mappings */ #define VI_WRMAP 0x00000400 /* might have PROT_WRITE u. mappings */ -#define VI_WRMAPDIRTY 0x00000800 /* might have dirty pages */ +#define VI_PAGES 0x00000800 /* UVM object has >0 pages */ #define VI_ONWORKLST 0x00004000 /* On syncer work-list */ -#define VI_PAGES 0x00008000 /* UVM object has >0 pages */ /* * The third set are locked by the underlying file system. @@ -221,7 +220,7 @@ typedef struct vnode vnode_t; #define VNODE_FLAGBITS \ "\20\1ROOT\2SYSTEM\3ISTTY\4MAPPED\5MPSAFE\6LOCKSWORK\11TEXT\12EXECMAP" \ - "\13WRMAP\14WRMAPDIRTY\17ONWORKLST\31DIROP" + "\13WRMAP\14PAGES\17ONWORKLST\31DIROP" #define VSIZENOTSET ((voff_t)-1) Index: sys/ufs/lfs/lfs_pages.c =================================================================== RCS file: /cvsroot/src/sys/ufs/lfs/lfs_pages.c,v retrieving revision 1.22 diff -u -p -r1.22 lfs_pages.c --- sys/ufs/lfs/lfs_pages.c 23 Feb 2020 15:46:42 -0000 1.22 +++ sys/ufs/lfs/lfs_pages.c 8 Mar 2020 18:36:49 -0000 @@ -456,11 +455,12 @@ retry: * If there are no pages, don't do anything. */ if (vp->v_uobj.uo_npages == 0) { + mutex_enter(vp->v_interlock); if ((vp->v_iflag & VI_ONWORKLST) && LIST_FIRST(&vp->v_dirtyblkhd) == NULL) { - vp->v_iflag &= ~VI_WRMAPDIRTY; vn_syncer_remove_from_worklist(vp); } + mutex_exit(vp->v_interlock); if (trans_mp) fstrans_done(trans_mp); rw_exit(vp->v_uobj.vmobjlock); Index: sys/uvm/uvm_object.h =================================================================== RCS file: /cvsroot/src/sys/uvm/uvm_object.h,v retrieving revision 1.37 diff -u -p -r1.37 uvm_object.h --- sys/uvm/uvm_object.h 23 Feb 2020 15:46:43 -0000 1.37 +++ sys/uvm/uvm_object.h 8 Mar 2020 18:36:49 -0000 @@ -114,7 +114,7 @@ extern const struct uvm_pagerops aobj_pa */ #define UVM_OBJ_NEEDS_WRITEFAULT(uobj) \ - (UVM_OBJ_IS_VNODE(uobj) && uvn_needs_writefault_p(uobj)) + (UVM_OBJ_IS_VNODE(uobj) && uvn_clean_p(uobj)) #define UVM_OBJ_IS_AOBJ(uobj) \ ((uobj)->pgops == &aobj_pager) Index: sys/uvm/uvm_page_status.c =================================================================== RCS file: /cvsroot/src/sys/uvm/uvm_page_status.c,v retrieving revision 1.3 diff -u -p -r1.3 uvm_page_status.c --- sys/uvm/uvm_page_status.c 23 Feb 2020 15:46:43 -0000 1.3 +++ sys/uvm/uvm_page_status.c 8 Mar 2020 18:36:49 -0000 @@ -109,6 +109,15 @@ uvm_pagemarkdirty(struct vm_page *pg, un radix_tree_clear_tag(&uobj->uo_pages, idx, UVM_PAGE_DIRTY_TAG); } else { + /* + * on first dirty page, mark the object dirty. + * for vnodes this inserts to the syncer worklist. + */ + if (radix_tree_empty_tagged_tree_p(&uobj->uo_pages, + UVM_PAGE_DIRTY_TAG) && + uobj->pgops->pgo_markdirty != NULL) { + (*uobj->pgops->pgo_markdirty)(uobj); + } radix_tree_set_tag(&uobj->uo_pages, idx, UVM_PAGE_DIRTY_TAG); } Index: sys/uvm/uvm_pager.h =================================================================== RCS file: /cvsroot/src/sys/uvm/uvm_pager.h,v retrieving revision 1.45 diff -u -p -r1.45 uvm_pager.h --- sys/uvm/uvm_pager.h 9 Dec 2018 20:33:04 -0000 1.45 +++ sys/uvm/uvm_pager.h 8 Mar 2020 18:36:49 -0000 @@ -135,6 +135,9 @@ struct uvm_pagerops { /* put/write pages */ int (*pgo_put)(struct uvm_object *, voff_t, voff_t, int); + + /* mark object dirty */ + void (*pgo_markdirty)(struct uvm_object *); }; /* pager flags [mostly for flush] */ Index: sys/uvm/uvm_vnode.c =================================================================== RCS file: /cvsroot/src/sys/uvm/uvm_vnode.c,v retrieving revision 1.108 diff -u -p -r1.108 uvm_vnode.c --- sys/uvm/uvm_vnode.c 3 Mar 2020 13:32:44 -0000 1.108 +++ sys/uvm/uvm_vnode.c 8 Mar 2020 18:36:49 -0000 @@ -51,6 +51,7 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c, #include "opt_uvmhist.h" #endif +#include #include #include #include @@ -80,6 +81,7 @@ static void uvn_alloc_ractx(struct uvm_o static void uvn_detach(struct uvm_object *); static int uvn_get(struct uvm_object *, voff_t, struct vm_page **, int *, int, vm_prot_t, int, int); +static void uvn_markdirty(struct uvm_object *); static int uvn_put(struct uvm_object *, voff_t, voff_t, int); static void uvn_reference(struct uvm_object *); @@ -96,6 +98,7 @@ const struct uvm_pagerops uvm_vnodeops = .pgo_detach = uvn_detach, .pgo_get = uvn_get, .pgo_put = uvn_put, + .pgo_markdirty = uvn_markdirty, }; /* @@ -153,7 +156,6 @@ uvn_put(struct uvm_object *uobj, voff_t return error; } - /* * uvn_get: get pages (synchronously) from backing store * @@ -194,6 +196,25 @@ uvn_get(struct uvm_object *uobj, voff_t return error; } +/* + * uvn_markdirty: called when the object gains first dirty page + * + * => uobj must be write locked. + */ + +static void +uvn_markdirty(struct uvm_object *uobj) +{ + struct vnode *vp = (struct vnode *)uobj; + + KASSERT(rw_write_held(uobj->vmobjlock)); + + mutex_enter(vp->v_interlock); + if ((vp->v_iflag & VI_ONWORKLST) == 0) { + vn_syncer_add_to_worklist(vp, filedelay); + } + mutex_exit(vp->v_interlock); +} /* * uvn_findpages: @@ -464,12 +483,14 @@ bool uvn_text_p(struct uvm_object *uobj) { struct vnode *vp = (struct vnode *)uobj; + int iflag; /* * v_interlock is not held here, but VI_EXECMAP is only ever changed * with the vmobjlock held too. */ - return (vp->v_iflag & VI_EXECMAP) != 0; + iflag = atomic_load_relaxed(&vp->v_iflag); + return (iflag & VI_EXECMAP) != 0; } bool @@ -480,20 +501,6 @@ uvn_clean_p(struct uvm_object *uobj) UVM_PAGE_DIRTY_TAG); } -bool -uvn_needs_writefault_p(struct uvm_object *uobj) -{ - struct vnode *vp = (struct vnode *)uobj; - - /* - * v_interlock is not held here, but VI_WRMAP and VI_WRMAPDIRTY are - * only ever changed with the vmobjlock held too, or when it's known - * the uvm_object contains no pages (VI_PAGES clear). - */ - return uvn_clean_p(uobj) || - (vp->v_iflag & (VI_WRMAP|VI_WRMAPDIRTY)) == VI_WRMAP; -} - static void uvn_alloc_ractx(struct uvm_object *uobj) {