From owner-svn-src-user@FreeBSD.ORG  Mon Apr 19 04:22:45 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD22B1065672;
	Mon, 19 Apr 2010 04:22:45 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ACA938FC1A;
	Mon, 19 Apr 2010 04:22:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3J4MjDq091319;
	Mon, 19 Apr 2010 04:22:45 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3J4MjJx091317;
	Mon, 19 Apr 2010 04:22:45 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <201004190422.o3J4MjJx091317@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 19 Apr 2010 04:22:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206827 -
	user/kmacy/head_page_lock_2/sys/dev/cxgb/ulp/tom
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 19 Apr 2010 04:22:45 -0000

Author: kmacy
Date: Mon Apr 19 04:22:45 2010
New Revision: 206827
URL: http://svn.freebsd.org/changeset/base/206827

Log:
  update cxgb_vm for page lock

Modified:
  user/kmacy/head_page_lock_2/sys/dev/cxgb/ulp/tom/cxgb_vm.c

Modified: user/kmacy/head_page_lock_2/sys/dev/cxgb/ulp/tom/cxgb_vm.c
==============================================================================
--- user/kmacy/head_page_lock_2/sys/dev/cxgb/ulp/tom/cxgb_vm.c	Mon Apr 19 04:09:20 2010	(r206826)
+++ user/kmacy/head_page_lock_2/sys/dev/cxgb/ulp/tom/cxgb_vm.c	Mon Apr 19 04:22:45 2010	(r206827)
@@ -90,7 +90,6 @@ vm_fault_hold_user_pages(vm_map_t map, v
 	 * (and R/W if for write) if so just mark pages as held (and 
 	 * dirty if for write) and return
 	 */
-	vm_page_lock_queues();
 	for (pages = mp, faults = 0, va = addr; va < end;
 	     va += PAGE_SIZE, pages++) {
 		/*
@@ -114,7 +113,6 @@ vm_fault_hold_user_pages(vm_map_t map, v
 			vm_page_dirty(m);
 		
 	}
-	vm_page_unlock_queues();
 	
 	if (faults == 0)
 		return (0);
@@ -141,13 +139,13 @@ vm_fault_hold_user_pages(vm_map_t map, v
 error:	
 	log(LOG_WARNING,
 	    "vm_fault bad return rv=%d va=0x%zx\n", rv, va);
-	vm_page_lock_queues();
 	for (pages = mp, va = addr; va < end; va += PAGE_SIZE, pages++)
 		if (*pages) {
+			vm_page_lock(*pages);
 			vm_page_unhold(*pages);
+			vm_page_unlock(*pages);
 			*pages = NULL;
 		}
-	vm_page_unlock_queues();
 	return (EFAULT);
 }
 
@@ -156,10 +154,10 @@ vm_fault_unhold_pages(vm_page_t *mp, int
 {
 
 	KASSERT(count >= 0, ("negative count %d", count));
-	vm_page_lock_queues();
 	while (count--) {
+		vm_page_lock(*mp);
 		vm_page_unhold(*mp);
+		vm_page_unlock(*mp);
 		mp++;
 	}
-	vm_page_unlock_queues();
 }