From owner-p4-projects@FreeBSD.ORG  Wed Jun 29 21:05:27 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 3BBFA16A420; Wed, 29 Jun 2005 21:05:27 +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 1189816A41C
	for <perforce@freebsd.org>; Wed, 29 Jun 2005 21:05:27 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id DA1FB43D1D
	for <perforce@freebsd.org>; Wed, 29 Jun 2005 21:05:26 +0000 (GMT)
	(envelope-from peter@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 j5TL5QfJ044867
	for <perforce@freebsd.org>; Wed, 29 Jun 2005 21:05:26 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5TL5QI2044864
	for perforce@freebsd.org; Wed, 29 Jun 2005 21:05:26 GMT
	(envelope-from peter@freebsd.org)
Date: Wed, 29 Jun 2005 21:05:26 GMT
Message-Id: <200506292105.j5TL5QI2044864@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79192 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, 29 Jun 2005 21:05:28 -0000

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

Change 79192 by peter@peter_daintree on 2005/06/29 21:04:54

	Bug fix for for PAE case.  I should have read the PAE kernel
	code instead of relying on memory.  The PTD pages are not
	guaranteed to be contiguous.  I'm an idiot.

Affected files ...

.. //depot/projects/hammer/lib/libkvm/kvm_i386.c#7 edit

Differences ...

==== //depot/projects/hammer/lib/libkvm/kvm_i386.c#7 (text+ko) ====

@@ -139,7 +139,6 @@
 
 	if (vm->mmapbase != NULL)
 		munmap(vm->mmapbase, vm->mmapsize);
-
 	if (vm->PTD)
 		free(vm->PTD);
 	free(vm);
@@ -152,9 +151,10 @@
 	struct nlist nlist[2];
 	u_long pa;
 	u_long kernbase;
-	pd_entry_t	*PTD;
+	char		*PTD;
 	Elf_Ehdr	*ehdr;
 	size_t		hdrsz;
+	int		i;
 
 	kd->vmst = (struct vmstate *)_kvm_malloc(kd, sizeof(*kd->vmst));
 	if (kd->vmst == 0) {
@@ -190,17 +190,20 @@
 			_kvm_err(kd, kd->program, "cannot read IdlePDPT");
 			return (-1);
 		}
-
-		if (kvm_read(kd, pa, &pa64, sizeof(pa64)) != sizeof(pa64)) {
-			 _kvm_err(kd, kd->program, "Cannot read PDPT");
-			 return (-1);
-		}
-
 		PTD = _kvm_malloc(kd, 4 * PAGE_SIZE);
-		if (kvm_read(kd, pa64 & PG_FRAME_PAE, PTD, 4 * PAGE_SIZE) !=
-		    (4 * PAGE_SIZE)) {
-			_kvm_err(kd, kd->program, "cannot read PDPT");
-			return (-1);
+		for (i = 0; i < 4; i++) {
+			if (kvm_read(kd, pa + (i * sizeof(pa64)), &pa64,
+			    sizeof(pa64)) != sizeof(pa64)) {
+				_kvm_err(kd, kd->program, "Cannot read PDPT");
+				free(PTD);
+				return (-1);
+			}
+			if (kvm_read(kd, pa64 & PG_FRAME_PAE,
+			    PTD + (i * PAGE_SIZE), PAGE_SIZE) != (PAGE_SIZE)) {
+				_kvm_err(kd, kd->program, "cannot read PDPT");
+				free(PTD);
+				return (-1);
+			}
 		}
 		kd->vmst->PTD = PTD;
 		kd->vmst->pae = 1;
@@ -212,8 +215,8 @@
 			_kvm_err(kd, kd->program, "bad namelist");
 			return (-1);
 		}
-		if (kvm_read(kd, (nlist[0].n_value - kernbase), &pa, sizeof(pa)) !=
-		    sizeof(pa)) {
+		if (kvm_read(kd, (nlist[0].n_value - kernbase), &pa,
+		    sizeof(pa)) != sizeof(pa)) {
 			_kvm_err(kd, kd->program, "cannot read IdlePTD");
 			return (-1);
 		}