upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

If filesystem declares that it supports shared locking for writes, use

Browse source 
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
This commit is contained in:
Konstantin Belousov 2013-11-09 20:36:29 +00:00
parent 6272798a3f
commit 1bd7d0b7db
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/kern/vnode_if.src
View file

@ -477,7 +477,7 @@ vop_getpages {
};
%% putpages vp E E E
%% putpages vp L L L
vop_putpages {
IN struct vnode *vp;

10
sys/vm/vm_pageout.c
View file

@ -570,6 +570,7 @@ vm_pageout_launder(struct vm_pagequeue *pq, int tries, vm_paddr_t low,
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 *pq, int tries, vm_paddr_t low,
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, int pass)
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, int pass)
("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;