From owner-svn-src-all@FreeBSD.ORG  Tue Dec 28 17:02:15 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 603F5106566B;
	Tue, 28 Dec 2010 17:02:15 +0000 (UTC)
	(envelope-from nwhitehorn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F3818FC0A;
	Tue, 28 Dec 2010 17:02:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBSH2Fv5067874;
	Tue, 28 Dec 2010 17:02:15 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBSH2F6l067872;
	Tue, 28 Dec 2010 17:02:15 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201012281702.oBSH2F6l067872@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Tue, 28 Dec 2010 17:02:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216765 - head/sys/powerpc/aim
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Dec 2010 17:02:15 -0000

Author: nwhitehorn
Date: Tue Dec 28 17:02:15 2010
New Revision: 216765
URL: http://svn.freebsd.org/changeset/base/216765

Log:
  Only keep track of PTE validity statistics for pages not locked in the
  table. The 'locked' attribute is used to circumvent the regular page table
  locking for some special pages, with the result that including locked pages
  here causes races when updating the stats.

Modified:
  head/sys/powerpc/aim/moea64_native.c

Modified: head/sys/powerpc/aim/moea64_native.c
==============================================================================
--- head/sys/powerpc/aim/moea64_native.c	Tue Dec 28 16:57:29 2010	(r216764)
+++ head/sys/powerpc/aim/moea64_native.c	Tue Dec 28 17:02:15 2010	(r216765)
@@ -281,7 +281,10 @@ moea64_pte_set_native(struct lpte *pt, s
 	EIEIO();
 	pt->pte_hi = pvo_pt->pte_hi;
 	PTESYNC();
-	moea64_pte_valid++;
+
+	/* Keep statistics for unlocked pages */
+	if (!(pvo_pt->pte_hi & LPTE_LOCKED))
+		moea64_pte_valid++;
 }
 
 static void
@@ -310,7 +313,10 @@ moea64_pte_unset_native(mmu_t mmu, uintp
 	 * Save the reg & chg bits.
 	 */
 	moea64_pte_synch_native(mmu, pt_cookie, pvo_pt);
-	moea64_pte_valid--;
+
+	/* Keep statistics for unlocked pages */
+	if (!(pvo_pt->pte_hi & LPTE_LOCKED))
+		moea64_pte_valid--;
 }
 
 static void