Author: nwhitehorn
Date: Wed Sep 15 13:45:06 2010
New Revision: 212659
URL: http://svn.freebsd.org/changeset/base/212659
Log:
MFC r212363:
Reorder statistics tracking and table lock acquisitions already in place
to avoid race conditions updating the PVO statistics.
Modified:
stable/8/sys/powerpc/aim/mmu_oea64.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/powerpc/aim/mmu_oea64.c
==============================================================================
--- stable/8/sys/powerpc/aim/mmu_oea64.c Wed Sep 15 13:43:43 2010
(r212658)
+++ stable/8/sys/powerpc/aim/mmu_oea64.c Wed Sep 15 13:45:06 2010
(r212659)
@@ -2028,7 +2028,6 @@ moea64_pvo_enter(pmap_t pm, uma_zone_t z
* the bootstrap pool.
*/
- moea64_pvo_enter_calls++;
first = 0;
bootstrap = (flags & PVO_BOOTSTRAP);
@@ -2048,6 +2047,8 @@ moea64_pvo_enter(pmap_t pm, uma_zone_t z
*/
LOCK_TABLE();
+ moea64_pvo_enter_calls++;
+
LIST_FOREACH(pvo, &moea64_pvo_table[ptegidx], pvo_olink) {
if (pvo->pvo_pmap == pm && PVO_VADDR(pvo) == va) {
if ((pvo->pvo_pte.lpte.pte_lo & LPTE_RPGN) == pa &&
@@ -2190,14 +2191,15 @@ moea64_pvo_remove(struct pvo_entry *pvo,
* if we aren't going to reuse it.
*/
LIST_REMOVE(pvo, pvo_olink);
+
+ moea64_pvo_entries--;
+ moea64_pvo_remove_calls++;
+
UNLOCK_TABLE();
if (!(pvo->pvo_vaddr & PVO_BOOTSTRAP))
uma_zfree((pvo->pvo_vaddr & PVO_MANAGED) ? moea64_mpvo_zone :
moea64_upvo_zone, pvo);
-
- moea64_pvo_entries--;
- moea64_pvo_remove_calls++;
}
static __inline int
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
