[src/trunk]: src/sys/arch/xen/x86 Force pae l3 page allocation for new vcpus ...

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

details:   https://anonhg.NetBSD.org/src/rev/5db4e6e9599b
branches:  trunk
changeset: 772350:5db4e6e9599b
user:      cherry <cherry%NetBSD.org@localhost>
date:      Fri Dec 30 18:01:20 2011 +0000

description:
Force pae l3 page allocation for new vcpus to be < 4G, so they fit in 32bits

diffstat:

 sys/arch/xen/x86/cpu.c |  24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

diffs (48 lines):

diff -r 7e867cc2e285 -r 5db4e6e9599b sys/arch/xen/x86/cpu.c
--- a/sys/arch/xen/x86/cpu.c    Fri Dec 30 17:57:49 2011 +0000
+++ b/sys/arch/xen/x86/cpu.c    Fri Dec 30 18:01:20 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.72 2011/12/30 16:55:21 cherry Exp $  */
+/*     $NetBSD: cpu.c,v 1.73 2011/12/30 18:01:20 cherry Exp $  */
 /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp  */
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.72 2011/12/30 16:55:21 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.73 2011/12/30 18:01:20 cherry Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -1271,23 +1271,15 @@
        KASSERT(ci != NULL);
 
 #if defined(PAE)
-       ci->ci_pae_l3_pdir = (paddr_t *)uvm_km_alloc(kernel_map, PAGE_SIZE, 0,
-           UVM_KMF_WIRED | UVM_KMF_ZERO | UVM_KMF_NOWAIT);
-
-       if (ci->ci_pae_l3_pdir == NULL) {
-               panic("%s: failed to allocate L3 per-cpu PD for CPU %d\n",
-                     __func__, cpu_index(ci));
-       }
-       ci->ci_pae_l3_pdirpa = vtophys((vaddr_t) ci->ci_pae_l3_pdir);
+       cpu_alloc_l3_page(ci);
        KASSERT(ci->ci_pae_l3_pdirpa != 0);
 
        /* Initialise L2 entries 0 - 2: Point them to pmap_kernel() */
-       ci->ci_pae_l3_pdir[0] =
-           xpmap_ptom_masked(pmap_kernel()->pm_pdirpa[0]) | PG_V;
-       ci->ci_pae_l3_pdir[1] =
-           xpmap_ptom_masked(pmap_kernel()->pm_pdirpa[1]) | PG_V;
-       ci->ci_pae_l3_pdir[2] =
-           xpmap_ptom_masked(pmap_kernel()->pm_pdirpa[2]) | PG_V;
+       int i;
+       for (i = 0; i < PTP_LEVELS - 1; i++ ) {
+               ci->ci_pae_l3_pdir[i] =
+                   xpmap_ptom_masked(pmap_kernel()->pm_pdirpa[i]) | PG_V;
+       }
 #endif /* PAE */
 
        ci->ci_kpm_pdir = (pd_entry_t *)uvm_km_alloc(kernel_map, PAGE_SIZE, 0,