From owner-svn-src-projects@FreeBSD.ORG  Thu Jul  5 20:21:13 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E1790106564A;
	Thu,  5 Jul 2012 20:21:13 +0000 (UTC)
	(envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CD52E8FC14;
	Thu,  5 Jul 2012 20:21:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q65KLDma016506;
	Thu, 5 Jul 2012 20:21:13 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q65KLDVP016504;
	Thu, 5 Jul 2012 20:21:13 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201207052021.q65KLDVP016504@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Thu, 5 Jul 2012 20:21:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r238147 - projects/amd64_xen_pv/sys/amd64/xen
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jul 2012 20:21:14 -0000

Author: cherry
Date: Thu Jul  5 20:21:13 2012
New Revision: 238147
URL: http://svn.freebsd.org/changeset/base/238147

Log:
   - bzero msgbufp after allocation and before use.
   - fix pmap_kextract_ma() to use the correct pt index offset.
  
  Approved by:	gibbs (implicit)

Modified:
  projects/amd64_xen_pv/sys/amd64/xen/pmap.c

Modified: projects/amd64_xen_pv/sys/amd64/xen/pmap.c
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/xen/pmap.c	Thu Jul  5 20:16:24 2012	(r238146)
+++ projects/amd64_xen_pv/sys/amd64/xen/pmap.c	Thu Jul  5 20:21:13 2012	(r238147)
@@ -548,6 +548,8 @@ pmap_bootstrap(vm_paddr_t *firstaddr)
 	msgbufp = (void *) pmap_map(&virtual_avail,
 				    ptoa(physmem), ptoa(physmem) + round_page(msgbufsize),
 				    VM_PROT_READ | VM_PROT_WRITE);
+
+	bzero(msgbufp, round_page(msgbufsize));
 }
 
 void
@@ -834,6 +836,9 @@ pmap_kextract_ma(vm_offset_t va)
 			 * effectively const.
 			 */
 
+	const uint64_t SIGNMASK = (1UL << 48) - 1;
+	va &= SIGNMASK; /* Remove sign extension */
+
 	mmu_map_t tptr = tbuf;
 
 	struct mmu_map_mbackend mb = {
@@ -849,7 +854,7 @@ pmap_kextract_ma(vm_offset_t va)
 		goto nomapping;
 	}
 
-	ma = mmu_map_pt(tptr)[(~PDRMASK & PAGE_MASK & va) >> PAGE_SHIFT];
+	ma = mmu_map_pt(tptr)[(PDRMASK & va) >> PAGE_SHIFT];
 
 	mmu_map_t_fini(tptr);