From owner-p4-projects@FreeBSD.ORG  Sat Feb  2 05:28:22 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 59BC916A41A; Sat,  2 Feb 2008 05:28:22 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1EBC416A419
	for <perforce@freebsd.org>; Sat,  2 Feb 2008 05:28:22 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E00F13C455
	for <perforce@freebsd.org>; Sat,  2 Feb 2008 05:28:22 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m125SLIZ066388
	for <perforce@freebsd.org>; Sat, 2 Feb 2008 05:28:21 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m125SLqw066385
	for perforce@freebsd.org; Sat, 2 Feb 2008 05:28:21 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sat, 2 Feb 2008 05:28:21 GMT
Message-Id: <200802020528.m125SLqw066385@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 134630 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 02 Feb 2008 05:28:22 -0000

http://perforce.freebsd.org/chv.cgi?CH=134630

Change 134630 by kmacy@kmacy:storage:toehead on 2008/02/02 05:27:57

	fix prot
	remove tracing
	add error logging

Affected files ...

.. //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_vm.c#4 edit

Differences ...

==== //depot/projects/toehead/sys/dev/cxgb/ulp/tom/cxgb_vm.c#4 (text+ko) ====

@@ -46,6 +46,7 @@
 	pmap_t pmap;
 	vm_page_t m, *pages;
 	vm_prot_t prot;
+	
 
 	/*
 	 * Check that virtual address range is legal
@@ -54,16 +55,18 @@
 	 * architectures define it
 	 */
 	end = addr + (count * PAGE_SIZE);
-	if (end > VM_MAXUSER_ADDRESS)
+	if (end > VM_MAXUSER_ADDRESS) {
+		printf("bad address passed\n");
 		return (EFAULT);
+	}
 
-	TRACE_ENTER;
 	td = curthread;
 	map = &td->td_proc->p_vmspace->vm_map;
 	pmap = &td->td_proc->p_vmspace->vm_pmap;
 	pages = mp;
 
-	prot = (flags & VM_HOLD_WRITEABLE) ? VM_PROT_WRITE : VM_PROT_READ;
+	prot = VM_PROT_READ;
+	prot |= (flags & VM_HOLD_WRITEABLE) ? VM_PROT_WRITE : 0;
 	bzero(pages, sizeof(vm_page_t *) * count);
 retry:
 
@@ -97,7 +100,6 @@
 	vm_page_unlock_queues();
 	
 	if (faults == 0) {
-		TRACE_EXIT;	
 		return (0);
 	}
 	
@@ -117,9 +119,13 @@
 				rv = vm_fault(map, va, VM_PROT_WRITE, VM_FAULT_DIRTY);
 		} else if (m == NULL)
 			rv = vm_fault(map, va, VM_PROT_READ, VM_FAULT_NORMAL);
-		if (rv)
+		if (rv) {
+			printf("vm_fault bad return rv=%d va=0x%jx\n", rv, va);
+			
 			goto error;
-	} 
+		} 
+	}
+	
 	goto retry;
 
 error:	
@@ -128,7 +134,6 @@
 		if (*pages)
 			vm_page_unhold(*pages);
 	vm_page_unlock_queues();
-	TRACE_EXIT;
 	return (EFAULT);
 }