From owner-svn-src-projects@FreeBSD.ORG  Sat Apr 20 18:45:29 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 575BFC57;
 Sat, 20 Apr 2013 18:45:29 +0000 (UTC)
 (envelope-from cherry@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 4A8A79F7;
 Sat, 20 Apr 2013 18:45:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3KIjT1s019695;
 Sat, 20 Apr 2013 18:45:29 GMT (envelope-from cherry@svn.freebsd.org)
Received: (from cherry@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3KIjT5x019693;
 Sat, 20 Apr 2013 18:45:29 GMT (envelope-from cherry@svn.freebsd.org)
Message-Id: <201304201845.r3KIjT5x019693@svn.freebsd.org>
From: "Cherry G. Mathew" <cherry@FreeBSD.org>
Date: Sat, 20 Apr 2013 18:45:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r249708 - projects/amd64_xen_pv/sys/amd64/xen
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
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/options/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: Sat, 20 Apr 2013 18:45:29 -0000

Author: cherry
Date: Sat Apr 20 18:45:28 2013
New Revision: 249708
URL: http://svnweb.freebsd.org/changeset/base/249708

Log:
  When holding or inspecting the mmu state, reset various MD pointers first.
  
  Approved by: gibbs(implicit)

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

Modified: projects/amd64_xen_pv/sys/amd64/xen/mmu_map.c
==============================================================================
--- projects/amd64_xen_pv/sys/amd64/xen/mmu_map.c	Sat Apr 20 17:53:39 2013	(r249707)
+++ projects/amd64_xen_pv/sys/amd64/xen/mmu_map.c	Sat Apr 20 18:45:28 2013	(r249708)
@@ -279,6 +279,9 @@ mmu_map_inspect_va(struct pmap *pm, void
 	struct mmu_map_index *pti = addr;
 	KASSERT(pti->sanity == SANE, ("%s: Uninitialised index cookie used", __func__));
 
+	/* Reset pti */
+	pti->pml4t = pti->pdpt = pti->pdt = pti->pt = 0;
+
 	vm_paddr_t pt;
 
 	pti->pml4t = pmap_get_pml4t(pm);
@@ -318,6 +321,9 @@ mmu_map_hold_va(struct pmap *pm, void *a
 	struct mmu_map_index *pti = addr;
 	KASSERT(pti->sanity == SANE, ("%s: Uninitialised index cookie used", __func__));
 
+	/* Reset pti */
+	pti->pml4t = pti->pdpt = pti->pdt = pti->pt = 0;
+
 	bool alloced = false; /* Did we have to alloc backing pages ? */
 	vm_paddr_t pt;