From owner-p4-projects@FreeBSD.ORG  Wed Jun 22 01:36:39 2005
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 ED8CC16A422; Wed, 22 Jun 2005 01:36:38 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id A8E1416A41F
	for <perforce@freebsd.org>; Wed, 22 Jun 2005 01:36:38 +0000 (GMT)
	(envelope-from ps@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 97C0743D53
	for <perforce@freebsd.org>; Wed, 22 Jun 2005 01:36:38 +0000 (GMT)
	(envelope-from ps@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5M1acqo091414
	for <perforce@freebsd.org>; Wed, 22 Jun 2005 01:36:38 GMT
	(envelope-from ps@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5M1acB1091411
	for perforce@freebsd.org; Wed, 22 Jun 2005 01:36:38 GMT
	(envelope-from ps@freebsd.org)
Date: Wed, 22 Jun 2005 01:36:38 GMT
Message-Id: <200506220136.j5M1acB1091411@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ps@freebsd.org using -f
From: Paul Saab <ps@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 78791 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: Wed, 22 Jun 2005 01:36:39 -0000

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

Change 78791 by ps@butter.corp on 2005/06/22 01:36:25

	the dumper routines expect a virtual address, not a physical
	one.  Peter, you can clean this up, but it works.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#10 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/dump_machdep.c#10 (text+ko) ====

@@ -149,14 +149,16 @@
 cb_dumpdata(struct md_pa *mdp, int seqnr, void *arg)
 {
 	struct dumperinfo *di = (struct dumperinfo*)arg;
-	vm_offset_t pa;
+	vm_paddr_t a, pa;
+	void *va;
 	uint64_t pgs;
 	size_t counter, sz;
-	int c, error, twiddle;
+	int i, c, error, twiddle;
 
 	error = 0;	/* catch case in which chunk size is 0 */
 	counter = 0;	/* Update twiddle every 16MB */
 	twiddle = 0;
+	va = 0;
 	pgs = (mdp->md_end - mdp->md_start) / PAGE_SIZE;
 	pa = mdp->md_start;
 
@@ -170,7 +172,11 @@
 			printf("%c\b", "|/-\\"[twiddle++ & 3]);
 			counter &= (1<<24) - 1;
 		}
-		error = di->dumper(di->priv, (void*)pa, 0, dumplo, sz);
+		for (i = 0; i < sz >> PAGE_SHIFT; i++) {
+			a = pa + i * PAGE_SIZE;
+			va = pmap_kenter_temporary(trunc_page(a), i);
+		}
+		error = di->dumper(di->priv, (void*)va, 0, dumplo, sz);
 		if (error)
 			break;
 		dumplo += sz;