Author: kib
Date: Sat Nov 9 20:36:29 2013
New Revision: 257899
URL: http://svnweb.freebsd.org/changeset/base/257899
Log:
If filesystem declares that it supports shared locking for writes, use
shared vnode lock for VOP_PUTPAGES() as well. The only such
filesystem in the tree is ZFS, and it uses
vnode_pager_generic_putpages(), which performs the pageout with
VOP_WRITE().
Reviewed by: alc
Discussed with: avg
Tested by: pho
Sponsored by: The FreeBSD Foundation
MFC after: 2 weeks
Modified:
head/sys/kern/vnode_if.src
head/sys/vm/vm_pageout.c
Modified: head/sys/kern/vnode_if.src
==============================================================================
--- head/sys/kern/vnode_if.src Sat Nov 9 20:30:13 2013 (r257898)
+++ head/sys/kern/vnode_if.src Sat Nov 9 20:36:29 2013 (r257899)
@@ -477,7 +477,7 @@ vop_getpages {
};
-%% putpages vp E E E
+%% putpages vp L L L
vop_putpages {
IN struct vnode *vp;
Modified: head/sys/vm/vm_pageout.c
==============================================================================
--- head/sys/vm/vm_pageout.c Sat Nov 9 20:30:13 2013 (r257898)
+++ head/sys/vm/vm_pageout.c Sat Nov 9 20:36:29 2013 (r257899)
@@ -570,6 +570,7 @@ vm_pageout_launder(struct vm_pagequeue *
vm_object_t object;
vm_paddr_t pa;
vm_page_t m, m_tmp, next;
+ int lockmode;
vm_pagequeue_lock(pq);
TAILQ_FOREACH_SAFE(m, &pq->pq_pl, plinks.q, next) {
@@ -605,7 +606,9 @@ vm_pageout_launder(struct vm_pagequeue *
vm_object_reference_locked(object);
VM_OBJECT_WUNLOCK(object);
(void)vn_start_write(vp, &mp, V_WAIT);
- vn_lock(vp, LK_EXCLUSIVE | LK_RETRY);
+ lockmode = MNT_SHARED_WRITES(vp->v_mount) ?
+ LK_SHARED : LK_EXCLUSIVE;
+ vn_lock(vp, lockmode | LK_RETRY);
VM_OBJECT_WLOCK(object);
vm_object_page_clean(object, 0, 0, OBJPC_SYNC);
VM_OBJECT_WUNLOCK(object);
@@ -902,6 +905,7 @@ vm_pageout_scan(struct vm_domain *vmd, i
int act_delta;
int vnodes_skipped = 0;
int maxlaunder;
+ int lockmode;
boolean_t queues_locked;
/*
@@ -1193,7 +1197,9 @@ vm_pageout_scan(struct vm_domain *vmd, i
("vp %p with NULL v_mount", vp));
vm_object_reference_locked(object);
VM_OBJECT_WUNLOCK(object);
- if (vget(vp, LK_EXCLUSIVE | LK_TIMELOCK,
+ lockmode = MNT_SHARED_WRITES(vp->v_mount) ?
+ LK_SHARED : LK_EXCLUSIVE;
+ if (vget(vp, lockmode | LK_TIMELOCK,
curthread)) {
VM_OBJECT_WLOCK(object);
++pageout_lock_miss;
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
