From owner-freebsd-fs@FreeBSD.ORG  Sat Oct 30 09:53:01 2010
Return-Path: <owner-freebsd-fs@FreeBSD.ORG>
Delivered-To: freebsd-fs@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 21DC9106566B;
	Sat, 30 Oct 2010 09:53:01 +0000 (UTC) (envelope-from avg@freebsd.org)
Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140])
	by mx1.freebsd.org (Postfix) with ESMTP id 317CA8FC0C;
	Sat, 30 Oct 2010 09:52:59 +0000 (UTC)
Received: from porto.topspin.kiev.ua (porto-e.starpoint.kiev.ua
	[212.40.38.100])
	by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id MAA19288;
	Sat, 30 Oct 2010 12:52:56 +0300 (EEST)
	(envelope-from avg@freebsd.org)
Received: from localhost.topspin.kiev.ua ([127.0.0.1])
	by porto.topspin.kiev.ua with esmtp (Exim 4.34 (FreeBSD))
	id 1PC87M-000JBJ-Dx; Sat, 30 Oct 2010 12:52:56 +0300
Message-ID: <4CCBEAF6.2030408@freebsd.org>
Date: Sat, 30 Oct 2010 12:52:54 +0300
From: Andriy Gapon <avg@freebsd.org>
User-Agent: Mozilla/5.0 (X11; U; FreeBSD amd64; en-US;
	rv:1.9.2.12) Gecko/20101029 Lightning/1.0b2 Thunderbird/3.1.6
MIME-Version: 1.0
To: Artemiev Igor <ai@kliksys.ru>
References: <3D1C350B94A44E5D95BAA1596D1EBF13@vosz.local>	<20101029090417.GA17537@two.kliksys.ru>	<4CCABFC2.3040701@icyb.net.ua>
	<4CCADD37.7000306@icyb.net.ua>	<20101029152602.GA18613@two.kliksys.ru>	<4CCAF0EB.4080001@icyb.net.ua>
	<20101029175105.GB18613@two.kliksys.ru>
	<4CCBD443.7010305@icyb.net.ua> <4CCBD46E.9030200@icyb.net.ua>
	<4CCBD661.3000204@freebsd.org>
In-Reply-To: <4CCBD661.3000204@freebsd.org>
X-Enigmail-Version: 1.1.2
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Cc: freebsd-fs@freebsd.org, freebsd-stable@freebsd.org
Subject: Re: 8.1-STABLE: zfs and sendfile: problem still exists
X-BeenThere: freebsd-fs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Filesystems <freebsd-fs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-fs>
List-Post: <mailto:freebsd-fs@freebsd.org>
List-Help: <mailto:freebsd-fs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-fs>,
	<mailto:freebsd-fs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 30 Oct 2010 09:53:01 -0000


Heh, next try.

Index: sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
===================================================================
--- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	(revision 214318)
+++ sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	(working copy)
@@ -67,6 +67,7 @@
 #include <sys/sf_buf.h>
 #include <sys/sched.h>
 #include <sys/acl.h>
+#include <vm/vm_pageout.h>

 /*
  * Programming rules.
@@ -464,7 +465,7 @@
 				uiomove_fromphys(&m, off, bytes, uio);
 			VM_OBJECT_LOCK(obj);
 			vm_page_wakeup(m);
-		} else if (m != NULL && uio->uio_segflg == UIO_NOCOPY) {
+		} else if (uio->uio_segflg == UIO_NOCOPY) {
 			/*
 			 * The code below is here to make sendfile(2) work
 			 * correctly with ZFS. As pointed out by ups@
@@ -474,9 +475,23 @@
 			 */
 			KASSERT(off == 0,
 			    ("unexpected offset in mappedread for sendfile"));
-			if (vm_page_sleep_if_busy(m, FALSE, "zfsmrb"))
+			if (m != NULL && vm_page_sleep_if_busy(m, FALSE, "zfsmrb"))
 				goto again;
-			vm_page_busy(m);
+			if (m == NULL) {
+				m = vm_page_alloc(obj, OFF_TO_IDX(start),
+				    VM_ALLOC_NOBUSY | VM_ALLOC_NORMAL);
+				if (m == NULL) {
+					VM_OBJECT_UNLOCK(obj);
+					VM_WAIT;
+					VM_OBJECT_LOCK(obj);
+					goto again;
+				}
+			} else {
+				vm_page_lock_queues();
+				vm_page_wire(m);
+				vm_page_unlock_queues();
+			}
+			vm_page_io_start(m);
 			VM_OBJECT_UNLOCK(obj);
 			if (dirbytes > 0) {
 				error = dmu_read_uio(os, zp->z_id, uio,
@@ -494,7 +509,10 @@
 			VM_OBJECT_LOCK(obj);
 			if (error == 0)
 				m->valid = VM_PAGE_BITS_ALL;
-			vm_page_wakeup(m);
+			vm_page_io_finish(m);
+			vm_page_lock_queues();
+			vm_page_unwire(m, 0);
+			vm_page_unlock_queues();
 			if (error == 0) {
 				uio->uio_resid -= bytes;
 				uio->uio_offset += bytes;

-- 
Andriy Gapon