From owner-p4-projects@FreeBSD.ORG  Mon May  7 06:32:41 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9C31E16A409; Mon,  7 May 2007 06:32:41 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 737EF16A402
	for <perforce@freebsd.org>; Mon,  7 May 2007 06:32:41 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 6498F13C46A
	for <perforce@freebsd.org>; Mon,  7 May 2007 06:32:41 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l476WfCt029101
	for <perforce@freebsd.org>; Mon, 7 May 2007 06:32:41 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l476Wfuw029097
	for perforce@freebsd.org; Mon, 7 May 2007 06:32:41 GMT
	(envelope-from kmacy@freebsd.org)
Date: Mon, 7 May 2007 06:32:41 GMT
Message-Id: <200705070632.l476Wfuw029097@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 119399 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: Mon, 07 May 2007 06:32:41 -0000

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

Change 119399 by kmacy@kmacy_vt-x:opentoe_init on 2007/05/07 06:31:40

	add routine to fault in and pin user pages with EXT_MBUF or kva mapping overhead

Affected files ...

.. //depot/projects/opentoe/sys/dev/cxgb/sys/mvec.h#2 edit
.. //depot/projects/opentoe/sys/dev/cxgb/sys/uipc_mvec.c#3 edit

Differences ...

==== //depot/projects/opentoe/sys/dev/cxgb/sys/mvec.h#2 (text+ko) ====

@@ -193,4 +193,6 @@
 #define bus_dmamap_load_mvec_sg bus_dmamap_load_mbuf_sg
 #endif
 
+int vm_user_page_get(vm_offset_t addr, int npages, vm_page_t *m, vm_paddr_t *paddr, int cow);
+
 #endif

==== //depot/projects/opentoe/sys/dev/cxgb/sys/uipc_mvec.c#3 (text+ko) ====

@@ -35,9 +35,11 @@
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/mutex.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/ktr.h>
+#include <sys/proc.h>
 #include <sys/sf_buf.h>
 
 #include <machine/bus.h>
@@ -45,8 +47,12 @@
 #include "opt_zero.h"
 
 #include <vm/vm.h>
+#include <vm/vm_extern.h>
+#include <vm/vm_param.h>
+#include <vm/pmap.h>
+#include <vm/vm_map.h>
 #include <vm/vm_page.h>
-#include <vm/pmap.h>
+#include <vm/vm_object.h>
 
 #ifdef DEBUG
 #define DPRINTF printf
@@ -485,3 +491,44 @@
 	return (error);
 }
 #endif /* !__sparc64__  && !__sun4v__ */
+
+int
+vm_user_page_get(vm_offset_t addr, int npages, vm_page_t *m, vm_paddr_t *paddr, int cow)
+{
+	caddr_t uva;
+	vm_prot_t prot;
+	int i, j;
+	struct pmap *pmap;
+
+	pmap = &curproc->p_vmspace->vm_pmap;
+	uva = (caddr_t)(addr & PG_FRAME);
+	prot = VM_PROT_READ|VM_PROT_WRITE;
+	for (i = 0; i < npages; i++) {
+		if(vm_fault_quick(uva, prot) < 0) {
+			vm_page_lock_queues();
+			for (j = 0; j < i; i++)
+				vm_page_unhold(m[j]);
+			vm_page_unlock_queues();
+			return (EFAULT);
+		}
+		m[i] = pmap_extract_and_hold(pmap, (vm_paddr_t)uva + i*PAGE_SIZE, prot);
+	}
+	
+	vm_page_lock_queues();
+	for (i = 0; i < npages; i++) {
+		if (m[i] == NULL) {
+			paddr[i] = pmap_extract(pmap, (vm_paddr_t)uva + i*PAGE_SIZE);
+			continue;
+		}
+		paddr[i] = VM_PAGE_TO_PHYS(m[i]);
+		if (cow)
+			vm_page_cowsetup(m[i]);
+
+		vm_page_dirty(m[i]);
+		vm_page_wire(m[i]);
+		vm_page_unhold(m[i]);
+	}
+	vm_page_unlock_queues();
+	
+	return(0);
+}