Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Make uvm_pagemarkdirty() responsible for putting vnodes onto...
details: https://anonhg.NetBSD.org/src/rev/ef93607814f6
branches: trunk
changeset: 745870:ef93607814f6
user: ad <ad%NetBSD.org@localhost>
date: Sat Mar 14 20:45:23 2020 +0000
description:
Make uvm_pagemarkdirty() responsible for putting vnodes onto the syncer
work list. Proposed on tech-kern@.
diffstat:
external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c | 16 +-----
sys/kern/vfs_subr.c | 12 +---
sys/miscfs/genfs/genfs_io.c | 43 +++--------------
sys/sys/vnode.h | 7 +-
sys/ufs/lfs/lfs_pages.c | 7 +-
sys/uvm/uvm_object.h | 4 +-
sys/uvm/uvm_page_status.c | 13 ++++-
sys/uvm/uvm_pager.h | 5 +-
sys/uvm/uvm_vnode.c | 45 ++++++++++-------
9 files changed, 66 insertions(+), 86 deletions(-)
diffs (truncated from 448 to 300 lines):
diff -r e52dca918642 -r ef93607814f6 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Sat Mar 14 20:25:46 2020 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c Sat Mar 14 20:45:23 2020 +0000
@@ -6028,19 +6028,9 @@
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;
diff -r e52dca918642 -r ef93607814f6 sys/kern/vfs_subr.c
--- a/sys/kern/vfs_subr.c Sat Mar 14 20:25:46 2020 +0000
+++ b/sys/kern/vfs_subr.c Sat Mar 14 20:45:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_subr.c,v 1.483 2020/03/01 21:39:07 ad Exp $ */
+/* $NetBSD: vfs_subr.c,v 1.484 2020/03/14 20:45:23 ad Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2007, 2008, 2019, 2020
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.483 2020/03/01 21:39:07 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_subr.c,v 1.484 2020/03/14 20:45:23 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -422,10 +422,8 @@
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 @@
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) {
diff -r e52dca918642 -r ef93607814f6 sys/miscfs/genfs/genfs_io.c
--- a/sys/miscfs/genfs/genfs_io.c Sat Mar 14 20:25:46 2020 +0000
+++ b/sys/miscfs/genfs/genfs_io.c Sat Mar 14 20:45:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: genfs_io.c,v 1.92 2020/03/14 20:23:51 ad Exp $ */
+/* $NetBSD: genfs_io.c,v 1.93 2020/03/14 20:45:23 ad Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.92 2020/03/14 20:23:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfs_io.c,v 1.93 2020/03/14 20:45:23 ad Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,6 @@
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 @@
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 @@
UVM_PAGE_STATUS_UNKNOWN);
}
}
- genfs_markdirty(vp);
}
goto out_err;
}
@@ -547,9 +529,6 @@
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],
@@ -912,8 +891,6 @@
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.
@@ -921,10 +898,14 @@
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);
}
@@ -1150,7 +1131,6 @@
*/
if (needs_clean) {
- KDASSERT((vp->v_iflag & VI_ONWORKLST));
wasclean = false;
memset(pgs, 0, sizeof(pgs));
pg->flags |= PG_BUSY;
@@ -1320,7 +1300,7 @@
*/
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);
@@ -1334,7 +1314,6 @@
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);
}
@@ -1635,9 +1614,6 @@
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) {
@@ -1691,9 +1667,6 @@
if (error) {
uvm_page_unbusy(pgs, npages);
}
- if (error == 0 && memwrite) {
- genfs_markdirty(vp);
- }
rw_exit(uobj->vmobjlock);
return error;
}
diff -r e52dca918642 -r ef93607814f6 sys/sys/vnode.h
--- a/sys/sys/vnode.h Sat Mar 14 20:25:46 2020 +0000
+++ b/sys/sys/vnode.h Sat Mar 14 20:45:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vnode.h,v 1.292 2020/03/05 15:18:55 riastradh Exp $ */
+/* $NetBSD: vnode.h,v 1.293 2020/03/14 20:45:23 ad Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -210,9 +210,8 @@
#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 @@
#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)
diff -r e52dca918642 -r ef93607814f6 sys/ufs/lfs/lfs_pages.c
--- a/sys/ufs/lfs/lfs_pages.c Sat Mar 14 20:25:46 2020 +0000
+++ b/sys/ufs/lfs/lfs_pages.c Sat Mar 14 20:45:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_pages.c,v 1.23 2020/03/14 20:23:51 ad Exp $ */
+/* $NetBSD: lfs_pages.c,v 1.24 2020/03/14 20:45:23 ad Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2019 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.23 2020/03/14 20:23:51 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_pages.c,v 1.24 2020/03/14 20:45:23 ad Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -455,11 +455,12 @@
* 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);
diff -r e52dca918642 -r ef93607814f6 sys/uvm/uvm_object.h
--- a/sys/uvm/uvm_object.h Sat Mar 14 20:25:46 2020 +0000
+++ b/sys/uvm/uvm_object.h Sat Mar 14 20:45:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_object.h,v 1.37 2020/02/23 15:46:43 ad Exp $ */
+/* $NetBSD: uvm_object.h,v 1.38 2020/03/14 20:45:23 ad Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -114,7 +114,7 @@
*/
#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)
diff -r e52dca918642 -r ef93607814f6 sys/uvm/uvm_page_status.c
--- a/sys/uvm/uvm_page_status.c Sat Mar 14 20:25:46 2020 +0000
+++ b/sys/uvm/uvm_page_status.c Sat Mar 14 20:45:23 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_page_status.c,v 1.3 2020/02/23 15:46:43 ad Exp $ */
+/* $NetBSD: uvm_page_status.c,v 1.4 2020/03/14 20:45:23 ad Exp $ */
/*-
* Copyright (c)2011 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_page_status.c,v 1.3 2020/02/23 15:46:43 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_page_status.c,v 1.4 2020/03/14 20:45:23 ad Exp $");
Home |
Main Index |
Thread Index |
Old Index