From owner-svn-src-projects@FreeBSD.ORG  Sat Jun 19 19:09:09 2010
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1CACD106564A;
	Sat, 19 Jun 2010 19:09:09 +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 0BA218FC16;
	Sat, 19 Jun 2010 19:09:09 +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 o5JJ986b069185;
	Sat, 19 Jun 2010 19:09:08 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Received: (from nwhitehorn@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5JJ98ML069183;
	Sat, 19 Jun 2010 19:09:08 GMT
	(envelope-from nwhitehorn@svn.freebsd.org)
Message-Id: <201006191909.o5JJ98ML069183@svn.freebsd.org>
From: Nathan Whitehorn <nwhitehorn@FreeBSD.org>
Date: Sat, 19 Jun 2010 19:09:08 +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: r209351 - projects/ppc64/sys/powerpc/aim
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: Sat, 19 Jun 2010 19:09:09 -0000

Author: nwhitehorn
Date: Sat Jun 19 19:09:08 2010
New Revision: 209351
URL: http://svn.freebsd.org/changeset/base/209351

Log:
  Fix a bug where the kernel could panic for large numbers of spilled
  mappings due to looking in the wrong PVO bucket.

Modified:
  projects/ppc64/sys/powerpc/aim/mmu_oea64.c

Modified: projects/ppc64/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/mmu_oea64.c	Sat Jun 19 18:52:37 2010	(r209350)
+++ projects/ppc64/sys/powerpc/aim/mmu_oea64.c	Sat Jun 19 19:09:08 2010	(r209351)
@@ -2784,7 +2784,7 @@ moea64_pte_insert(u_int ptegidx, struct 
 	if (pt->pte_hi & LPTE_HID)
 		pvo_pt->pte_hi |= LPTE_HID;
 
-	LIST_FOREACH(pvo, &moea64_pvo_table[ptegidx], pvo_olink) {
+	LIST_FOREACH(pvo, &moea64_pvo_table[pteg_bktidx], pvo_olink) {
 		if (pvo->pvo_pte.lpte.pte_hi == pt->pte_hi) {
 			moea64_pte_unset(pt, &pvo->pvo_pte.lpte, pvo->pvo_vpn);
 			PVO_PTEGIDX_CLR(pvo);
@@ -2793,6 +2793,19 @@ moea64_pte_insert(u_int ptegidx, struct 
 		}
 	}
 
+	if (pvo->pvo_pte.lpte.pte_hi != pt->pte_hi) {
+		/* It could have landed in the secondary PTEG */
+		pteg_bktidx ^= moea64_pteg_mask;
+		LIST_FOREACH(pvo, &moea64_pvo_table[pteg_bktidx], pvo_olink) {
+			if (pvo->pvo_pte.lpte.pte_hi == pt->pte_hi) {
+				moea64_pte_unset(pt, &pvo->pvo_pte.lpte,
+				    pvo->pvo_vpn);
+				PVO_PTEGIDX_CLR(pvo);
+				moea64_pte_overflow++;
+				break;
+			}
+		}
+	}
 	KASSERT(pvo->pvo_pte.lpte.pte_hi == pt->pte_hi,
 	   ("Unable to find PVO for spilled PTE"));