Fri Dec 9 17:32:51 2011 UTC ()

only use PG_G on leaf PTEs.
go back to tlbflush(), all the global entries
that we create in pmap_bootstrap() are permanent.


(chs)

diff -r1.146 -r1.147 src/sys/arch/x86/x86/pmap.c

--- src/sys/arch/x86/x86/pmap.c 2011/12/08 22:36:42	1.146
+++ src/sys/arch/x86/x86/pmap.c 2011/12/09 17:32:51	1.147

 @@ -1,14 +1,14 @@
-/*	$NetBSD: pmap.c,v 1.146 2011/12/08 22:36:42 rmind Exp $	*/
+/*	$NetBSD: pmap.c,v 1.147 2011/12/09 17:32:51 chs Exp $	*/
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -161,27 +161,27 @@
  *     Hibler/Jolitz pmap, as modified for FreeBSD by John S. Dyson
  *     and David Greenman.
+ *
  * [3] the Mach pmap.   this pmap, from CMU, seems to have migrated
  *     between several processors.   the VAX version was done by
  *     Avadis Tevanian, Jr., and Michael Wayne Young.    the i386
  *     version was done by Lance Berc, Mike Kupfer, Bob Baron,
  *     David Golub, and Richard Draves.    the alpha version was
  *     done by Alessandro Forin (CMU/Mach) and Chris Demetriou
  *     (NetBSD/alpha).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.146 2011/12/08 22:36:42 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.147 2011/12/09 17:32:51 chs Exp $");
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
 #if !defined(__x86_64__)
 #include "opt_kstack_dr0.h"
 #endif /* !defined(__x86_64__) */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
 #include <sys/pool.h>
 @@ -1355,33 +1355,33 @@ pmap_bootstrap(vaddr_t kva_start)
 			pmap_update_pg(tmpva);
 			pde = (pd_entry_t *)(tmpva + (pdp & ~PG_FRAME));
 			*pde = ((paddr_t)i << L2_SHIFT) |
 				PG_RW | PG_V | PG_U | PG_PS | PG_G;
+		}
 		for (i = 0; i < ndmpdp; i++) {
 			pdp = (paddr_t)&(((pd_entry_t *)dmpdp)[i]);
 			*pte = (pdp & PG_FRAME) | PG_V | PG_RW;
 			pmap_update_pg((vaddr_t)tmpva);
 			pde = (pd_entry_t *)(tmpva + (pdp & ~PG_FRAME));
 			*pde = (dmpd + (i << PAGE_SHIFT)) |
-				PG_RW | PG_V | PG_U | PG_G;
+				PG_RW | PG_V | PG_U;
+		}
+	}
 	kpm->pm_pdir[PDIR_SLOT_DIRECT] = dmpdp | PG_KW | PG_V | PG_U;
-	tlbflushg();
+	tlbflush();
 #else
 	if (VM_MIN_KERNEL_ADDRESS != KERNBASE) {
 		/*
 		 * zero_pte is stuck at the end of mapped space for the kernel
 		 * image (disjunct from kva space). This is done so that it
 		 * can safely be used in pmap_growkernel (pmap_get_physpage),
 		 * when it's called for the first time.
 		 * XXXfvdl fix this for MULTIPROCESSOR later.
 		 */
 		early_zerop = (void *)(KERNBASE + NKL2_KIMG_ENTRIES * NBPD_L2);
 		early_zero_pte = PTE_BASE + pl1_i((vaddr_t)early_zerop);