From owner-svn-src-projects@FreeBSD.ORG Sun Jun 20 23:45:19 2010 Return-Path: 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 8F8D7106564A; Sun, 20 Jun 2010 23:45:19 +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 7EA8B8FC08; Sun, 20 Jun 2010 23:45:19 +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 o5KNjJwP052408; Sun, 20 Jun 2010 23:45:19 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5KNjJkQ052406; Sun, 20 Jun 2010 23:45:19 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201006202345.o5KNjJkQ052406@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 20 Jun 2010 23:45:19 +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: r209378 - 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 " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Jun 2010 23:45:19 -0000 Author: nwhitehorn Date: Sun Jun 20 23:45:19 2010 New Revision: 209378 URL: http://svn.freebsd.org/changeset/base/209378 Log: Fix and optimize the case where a PTE is spilled out of its secondary PTEG and later re-added to its primary one. 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 Sun Jun 20 23:42:14 2010 (r209377) +++ projects/ppc64/sys/powerpc/aim/mmu_oea64.c Sun Jun 20 23:45:19 2010 (r209378) @@ -2785,6 +2785,11 @@ moea64_pte_insert(u_int ptegidx, struct return (-1); } + if (pteg_bktidx == ptegidx) + pvo_pt->pte_hi &= ~LPTE_HID; + else + pvo_pt->pte_hi |= LPTE_HID; + /* * Synchronize the sacrifice PTE with its PVO, then mark both * invalid. The PVO will be reused when/if the VM system comes @@ -2793,7 +2798,7 @@ moea64_pte_insert(u_int ptegidx, struct pt = &moea64_pteg_table[pteg_bktidx].pt[i]; if (pt->pte_hi & LPTE_HID) - pvo_pt->pte_hi |= LPTE_HID; + pteg_bktidx ^= moea64_pteg_mask; /* PTEs indexed by primary */ LIST_FOREACH(pvo, &moea64_pvo_table[pteg_bktidx], pvo_olink) { if (pvo->pvo_pte.lpte.pte_hi == pt->pte_hi) { @@ -2806,21 +2811,6 @@ 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) { - KASSERT(pvo->pvo_pte.lpte.pte_hi & LPTE_VALID, - ("Invalid PVO for valid PTE!")); - 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"));