svn commit: r239040 - in head/sys: fs/nfsclient fs/nwfs fs/smbfs
nfsclient vm
Konstantin Belousov
kib at FreeBSD.org
Sat Aug 4 18:16:44 UTC 2012
Author: kib
Date: Sat Aug 4 18:16:43 2012
New Revision: 239040
URL: http://svn.freebsd.org/changeset/base/239040
Log:
Reduce code duplication and exposure of direct access to struct
vm_page oflags by providing helper function
vm_page_readahead_finish(), which handles completed reads for pages
with indexes other then the requested one, for VOP_GETPAGES().
Reviewed by: alc
MFC after: 1 week
Modified:
head/sys/fs/nfsclient/nfs_clbio.c
head/sys/fs/nwfs/nwfs_io.c
head/sys/fs/smbfs/smbfs_io.c
head/sys/nfsclient/nfs_bio.c
head/sys/vm/vm_page.c
head/sys/vm/vm_page.h
head/sys/vm/vnode_pager.c
Modified: head/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clbio.c Sat Aug 4 18:12:54 2012 (r239039)
+++ head/sys/fs/nfsclient/nfs_clbio.c Sat Aug 4 18:16:43 2012 (r239040)
@@ -223,36 +223,8 @@ ncl_getpages(struct vop_getpages_args *a
*/
;
}
- if (i != ap->a_reqpage) {
- /*
- * Whether or not to leave the page activated is up in
- * the air, but we should put the page on a page queue
- * somewhere (it already is in the object). Result:
- * It appears that emperical results show that
- * deactivating pages is best.
- */
-
- /*
- * Just in case someone was asking for this page we
- * now tell them that it is ok to use.
- */
- if (!error) {
- if (m->oflags & VPO_WANTED) {
- vm_page_lock(m);
- vm_page_activate(m);
- vm_page_unlock(m);
- } else {
- vm_page_lock(m);
- vm_page_deactivate(m);
- vm_page_unlock(m);
- }
- vm_page_wakeup(m);
- } else {
- vm_page_lock(m);
- vm_page_free(m);
- vm_page_unlock(m);
- }
- }
+ if (i != ap->a_reqpage)
+ vm_page_readahead_finish(m, error);
}
VM_OBJECT_UNLOCK(object);
return (0);
Modified: head/sys/fs/nwfs/nwfs_io.c
==============================================================================
--- head/sys/fs/nwfs/nwfs_io.c Sat Aug 4 18:12:54 2012 (r239039)
+++ head/sys/fs/nwfs/nwfs_io.c Sat Aug 4 18:16:43 2012 (r239040)
@@ -457,36 +457,8 @@ nwfs_getpages(ap)
("nwfs_getpages: page %p is dirty", m));
}
- if (i != ap->a_reqpage) {
- /*
- * Whether or not to leave the page activated is up in
- * the air, but we should put the page on a page queue
- * somewhere (it already is in the object). Result:
- * It appears that emperical results show that
- * deactivating pages is best.
- */
-
- /*
- * Just in case someone was asking for this page we
- * now tell them that it is ok to use.
- */
- if (!error) {
- if (m->oflags & VPO_WANTED) {
- vm_page_lock(m);
- vm_page_activate(m);
- vm_page_unlock(m);
- } else {
- vm_page_lock(m);
- vm_page_deactivate(m);
- vm_page_unlock(m);
- }
- vm_page_wakeup(m);
- } else {
- vm_page_lock(m);
- vm_page_free(m);
- vm_page_unlock(m);
- }
- }
+ if (i != ap->a_reqpage)
+ vm_page_readahead_finish(m, error);
}
VM_OBJECT_UNLOCK(object);
return 0;
Modified: head/sys/fs/smbfs/smbfs_io.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_io.c Sat Aug 4 18:12:54 2012 (r239039)
+++ head/sys/fs/smbfs/smbfs_io.c Sat Aug 4 18:16:43 2012 (r239040)
@@ -521,36 +521,8 @@ smbfs_getpages(ap)
;
}
- if (i != reqpage) {
- /*
- * Whether or not to leave the page activated is up in
- * the air, but we should put the page on a page queue
- * somewhere (it already is in the object). Result:
- * It appears that emperical results show that
- * deactivating pages is best.
- */
-
- /*
- * Just in case someone was asking for this page we
- * now tell them that it is ok to use.
- */
- if (!error) {
- if (m->oflags & VPO_WANTED) {
- vm_page_lock(m);
- vm_page_activate(m);
- vm_page_unlock(m);
- } else {
- vm_page_lock(m);
- vm_page_deactivate(m);
- vm_page_unlock(m);
- }
- vm_page_wakeup(m);
- } else {
- vm_page_lock(m);
- vm_page_free(m);
- vm_page_unlock(m);
- }
- }
+ if (i != reqpage)
+ vm_page_readahead_finish(m, error);
}
VM_OBJECT_UNLOCK(object);
return 0;
Modified: head/sys/nfsclient/nfs_bio.c
==============================================================================
--- head/sys/nfsclient/nfs_bio.c Sat Aug 4 18:12:54 2012 (r239039)
+++ head/sys/nfsclient/nfs_bio.c Sat Aug 4 18:16:43 2012 (r239040)
@@ -217,36 +217,8 @@ nfs_getpages(struct vop_getpages_args *a
*/
;
}
- if (i != ap->a_reqpage) {
- /*
- * Whether or not to leave the page activated is up in
- * the air, but we should put the page on a page queue
- * somewhere (it already is in the object). Result:
- * It appears that emperical results show that
- * deactivating pages is best.
- */
-
- /*
- * Just in case someone was asking for this page we
- * now tell them that it is ok to use.
- */
- if (!error) {
- if (m->oflags & VPO_WANTED) {
- vm_page_lock(m);
- vm_page_activate(m);
- vm_page_unlock(m);
- } else {
- vm_page_lock(m);
- vm_page_deactivate(m);
- vm_page_unlock(m);
- }
- vm_page_wakeup(m);
- } else {
- vm_page_lock(m);
- vm_page_free(m);
- vm_page_unlock(m);
- }
- }
+ if (i != ap->a_reqpage)
+ vm_page_readahead_finish(m, error);
}
VM_OBJECT_UNLOCK(object);
return (0);
Modified: head/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c Sat Aug 4 18:12:54 2012 (r239039)
+++ head/sys/vm/vm_page.c Sat Aug 4 18:16:43 2012 (r239040)
@@ -695,6 +695,39 @@ vm_page_free_zero(vm_page_t m)
}
/*
+ * Unbusy and handle the page queueing for a page from the VOP_GETPAGES()
+ * array which is not the request page.
+ */
+void
+vm_page_readahead_finish(vm_page_t m, int error)
+{
+
+ if (error == 0) {
+ /*
+ * Since the page is not the requested page, whether
+ * it should be activated or deactivated is not
+ * obvious. Empirical results have shown that
+ * deactivating the page is usually the best choice,
+ * unless the page is wanted by another thread.
+ */
+ if (m->oflags & VPO_WANTED) {
+ vm_page_lock(m);
+ vm_page_activate(m);
+ vm_page_unlock(m);
+ } else {
+ vm_page_lock(m);
+ vm_page_deactivate(m);
+ vm_page_unlock(m);
+ }
+ vm_page_wakeup(m);
+ } else {
+ vm_page_lock(m);
+ vm_page_free(m);
+ vm_page_unlock(m);
+ }
+}
+
+/*
* vm_page_sleep:
*
* Sleep and release the page and page queues locks.
Modified: head/sys/vm/vm_page.h
==============================================================================
--- head/sys/vm/vm_page.h Sat Aug 4 18:12:54 2012 (r239039)
+++ head/sys/vm/vm_page.h Sat Aug 4 18:16:43 2012 (r239040)
@@ -390,6 +390,7 @@ vm_page_t vm_page_next(vm_page_t m);
int vm_page_pa_tryrelock(pmap_t, vm_paddr_t, vm_paddr_t *);
vm_page_t vm_page_prev(vm_page_t m);
void vm_page_putfake(vm_page_t m);
+void vm_page_readahead_finish(vm_page_t m, int error);
void vm_page_reference(vm_page_t m);
void vm_page_remove (vm_page_t);
void vm_page_rename (vm_page_t, vm_object_t, vm_pindex_t);
Modified: head/sys/vm/vnode_pager.c
==============================================================================
--- head/sys/vm/vnode_pager.c Sat Aug 4 18:12:54 2012 (r239039)
+++ head/sys/vm/vnode_pager.c Sat Aug 4 18:16:43 2012 (r239040)
@@ -985,37 +985,8 @@ vnode_pager_generic_getpages(vp, m, byte
mt));
}
- if (i != reqpage) {
-
- /*
- * whether or not to leave the page activated is up in
- * the air, but we should put the page on a page queue
- * somewhere. (it already is in the object). Result:
- * It appears that empirical results show that
- * deactivating pages is best.
- */
-
- /*
- * just in case someone was asking for this page we
- * now tell them that it is ok to use
- */
- if (!error) {
- if (mt->oflags & VPO_WANTED) {
- vm_page_lock(mt);
- vm_page_activate(mt);
- vm_page_unlock(mt);
- } else {
- vm_page_lock(mt);
- vm_page_deactivate(mt);
- vm_page_unlock(mt);
- }
- vm_page_wakeup(mt);
- } else {
- vm_page_lock(mt);
- vm_page_free(mt);
- vm_page_unlock(mt);
- }
- }
+ if (i != reqpage)
+ vm_page_readahead_finish(mt, error);
}
VM_OBJECT_UNLOCK(object);
if (error) {
More information about the svn-src-head
mailing list