[src/trunk]: src/sys/arch/x86/x86 While freeing ptps, remove stale L3 frame e...

[cherry <cherry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3288382810ca
branches:  trunk
changeset: 772575:3288382810ca
user:      cherry <cherry%NetBSD.org@localhost>
date:      Mon Jan 09 04:55:35 2012 +0000

description:
While freeing ptps, remove stale L3 frame entries on all CPUS the pmap is loaded on, not just the current one.

diffstat:

 sys/arch/x86/x86/pmap.c |  28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diffs (50 lines):

diff -r e2881041ce64 -r 3288382810ca sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Mon Jan 09 04:39:14 2012 +0000
+++ b/sys/arch/x86/x86/pmap.c   Mon Jan 09 04:55:35 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.151 2012/01/09 04:39:14 cherry Exp $        */
+/*     $NetBSD: pmap.c,v 1.152 2012/01/09 04:55:35 cherry Exp $        */
 
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.151 2012/01/09 04:39:14 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.152 2012/01/09 04:55:35 cherry Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -1880,16 +1880,22 @@
 #  if defined(__x86_64__)
                /*
                 * If ptp is a L3 currently mapped in kernel space,
-                * clear it before freeing
+                * on any cpu, clear it before freeing
                 */
-               if (pmap_pdirpa(pmap, 0) == curcpu()->ci_xen_current_user_pgd
-                   && level == PTP_LEVELS - 1) {
-                       pmap_pte_set(&pmap_kernel()->pm_pdir[index], 0);
-                       /*
-                        * Update the per-cpu PD on all cpus the current
-                        * pmap is active on 
-                        */ 
-                       xen_kpm_sync(pmap, index);
+               struct cpu_info *ci;
+               CPU_INFO_ITERATOR cii;
+
+               for (CPU_INFO_FOREACH(cii, ci)) {
+                       if (pmap_pdirpa(pmap, 0) == ci->ci_xen_current_user_pgd
+                           && level == PTP_LEVELS - 1) {
+                               pmap_pte_set(&pmap_kernel()->pm_pdir[index], 0);
+                               /*
+                                * Update the per-cpu PD on all cpus the current
+                                * pmap is active on 
+                                */ 
+                               xen_kpm_sync(pmap, index);
+                               break;
+                       }
                }
 #  endif /*__x86_64__ */
                invaladdr = level == 1 ? (vaddr_t)ptes :