svn commit: r248208 - user/attilio/vmobj-readlock/sys/vm

[Attilio Rao]

Author: attilio
Date: Tue Mar 12 13:46:30 2013
New Revision: 248208
URL: http://svnweb.freebsd.org/changeset/base/248208

Log:
  The per-page act_count is almost always protected already by the
  page-lock, hence mark it formally as so, adjusting the only 2 places
  that leave it uncovered, but where the lock was still held nearby.
  
  Sponsored by:	EMC / Isilon storage division

Modified:
  user/attilio/vmobj-readlock/sys/vm/vm_page.h
  user/attilio/vmobj-readlock/sys/vm/vm_pageout.c

Modified: user/attilio/vmobj-readlock/sys/vm/vm_page.h
==============================================================================
--- user/attilio/vmobj-readlock/sys/vm/vm_page.h	Tue Mar 12 13:42:47 2013	(r248207)
+++ user/attilio/vmobj-readlock/sys/vm/vm_page.h	Tue Mar 12 13:46:30 2013	(r248208)
@@ -143,7 +143,7 @@ struct vm_page {
 	uint8_t aflags;			/* access is atomic */
 	uint8_t oflags;			/* page VPO_* flags (O) */
 	uint16_t flags;			/* page PG_* flags (P) */
-	u_char	act_count;		/* page usage count (O) */
+	u_char	act_count;		/* page usage count (P) */
 	u_char	busy;			/* page busy count (O) */
 	/* NOTE that these must support one bit per DEV_BSIZE in a page!!! */
 	/* so, on normal X86 kernels, they must be at least 8 bits wide */

Modified: user/attilio/vmobj-readlock/sys/vm/vm_pageout.c
==============================================================================
--- user/attilio/vmobj-readlock/sys/vm/vm_pageout.c	Tue Mar 12 13:42:47 2013	(r248207)
+++ user/attilio/vmobj-readlock/sys/vm/vm_pageout.c	Tue Mar 12 13:46:30 2013	(r248208)
@@ -1015,9 +1015,9 @@ vm_pageout_scan(int pass)
 		} else if ((m->aflags & PGA_REFERENCED) == 0 &&
 		    (actcount = pmap_ts_referenced(m)) != 0) {
 			vm_page_activate(m);
-			vm_page_unlock(m);
-			m->act_count += actcount + ACT_ADVANCE;
 			VM_OBJECT_WUNLOCK(object);
+			m->act_count += actcount + ACT_ADVANCE;
+			vm_page_unlock(m);
 			goto relock_queues;
 		}
 
@@ -1031,9 +1031,9 @@ vm_pageout_scan(int pass)
 			vm_page_aflag_clear(m, PGA_REFERENCED);
 			actcount = pmap_ts_referenced(m);
 			vm_page_activate(m);
-			vm_page_unlock(m);
-			m->act_count += actcount + ACT_ADVANCE + 1;
 			VM_OBJECT_WUNLOCK(object);
+			m->act_count += actcount + ACT_ADVANCE + 1;
+			vm_page_unlock(m);
 			goto relock_queues;
 		}