svn commit: r258555 - stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs

[Andriy Gapon]

Author: avg
Date: Mon Nov 25 15:39:50 2013
New Revision: 258555
URL: http://svnweb.freebsd.org/changeset/base/258555

Log:
  MFC r258353: zfs page_busy: fix the boundaries of the cleared range
  
  This is a fix for a regression introduced in r246293.
  
  vm_page_clear_dirty expects the range to have DEV_BSIZE aligned boundaries,
  otherwise it extends them.  Thus it can happen that the whole page is
  marked clean while actually having some small dirty region(s).
  This commit makes the range properly aligned and ensures that only
  the clean data is marked as such.
  
  It would interesting to evaluate how much benefit clearing with DEV_BSIZE
  granularity produces.  Perhaps instead we should clear the whole page
  when it is completely overwritten and don't bother clearing any bits
  if only a portion a page is written.

Modified:
  stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)

Modified: stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Mon Nov 25 15:34:57 2013	(r258554)
+++ stable/9/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Mon Nov 25 15:39:50 2013	(r258555)
@@ -326,6 +326,20 @@ page_busy(vnode_t *vp, int64_t start, in
 {
 	vm_object_t obj;
 	vm_page_t pp;
+	int64_t end;
+
+	/*
+	 * At present vm_page_clear_dirty extends the cleared range to DEV_BSIZE
+	 * aligned boundaries, if the range is not aligned.  As a result a
+	 * DEV_BSIZE subrange with partially dirty data may get marked as clean.
+	 * It may happen that all DEV_BSIZE subranges are marked clean and thus
+	 * the whole page would be considred clean despite have some dirty data.
+	 * For this reason we should shrink the range to DEV_BSIZE aligned
+	 * boundaries before calling vm_page_clear_dirty.
+	 */
+	end = rounddown2(off + nbytes, DEV_BSIZE);
+	off = roundup2(off, DEV_BSIZE);
+	nbytes = end - off;
 
 	obj = vp->v_object;
 	VM_OBJECT_LOCK_ASSERT(obj, MA_OWNED);
@@ -357,7 +371,8 @@ page_busy(vnode_t *vp, int64_t start, in
 			vm_object_pip_add(obj, 1);
 			vm_page_io_start(pp);
 			pmap_remove_write(pp);
-			vm_page_clear_dirty(pp, off, nbytes);
+			if (nbytes != 0)
+				vm_page_clear_dirty(pp, off, nbytes);
 		}
 		break;
 	}