[src/trunk]: src/sys increase PAGER_MAP_SIZE to 16MB and move it to uvm_pager.h

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

details:   https://anonhg.NetBSD.org/src/rev/3d4d5ad70d29
branches:  trunk
changeset: 499626:3d4d5ad70d29
user:      chs <chs%NetBSD.org@localhost>
date:      Fri Nov 24 22:41:38 2000 +0000

description:
increase PAGER_MAP_SIZE to 16MB and move it to uvm_pager.h
since the alpha and mips pmaps use it.

diffstat:

 sys/arch/alpha/alpha/pmap.c |   8 +++-----
 sys/arch/mips/mips/pmap.c   |   8 +++-----
 sys/uvm/uvm_pager.c         |   3 +--
 sys/uvm/uvm_pager.h         |  10 +++++++++-
 4 files changed, 16 insertions(+), 13 deletions(-)

diffs (105 lines):

diff -r 49353aa35797 -r 3d4d5ad70d29 sys/arch/alpha/alpha/pmap.c
--- a/sys/arch/alpha/alpha/pmap.c       Fri Nov 24 22:15:09 2000 +0000
+++ b/sys/arch/alpha/alpha/pmap.c       Fri Nov 24 22:41:38 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.150 2000/11/22 08:39:49 thorpej Exp $ */
+/* $NetBSD: pmap.c,v 1.151 2000/11/24 22:41:38 chs Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -156,7 +156,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.150 2000/11/22 08:39:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.151 2000/11/24 22:41:38 chs Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -804,12 +804,10 @@
 
        /*
         * Figure out how many PTE's are necessary to map the kernel.
-        * The '512' comes from PAGER_MAP_SIZE in vm_pager_init().
-        * This should be kept in sync.
         * We also reserve space for kmem_alloc_pageable() for vm_fork().
         */
        lev3mapsize = (VM_PHYS_SIZE +
-               nbuf * MAXBSIZE + 16 * NCARGS) / NBPG + 512 +
+               nbuf * MAXBSIZE + 16 * NCARGS + PAGER_MAP_SIZE) / NBPG +
                (maxproc * UPAGES) + nkmempages;
 
 #ifdef SYSVSHM
diff -r 49353aa35797 -r 3d4d5ad70d29 sys/arch/mips/mips/pmap.c
--- a/sys/arch/mips/mips/pmap.c Fri Nov 24 22:15:09 2000 +0000
+++ b/sys/arch/mips/mips/pmap.c Fri Nov 24 22:41:38 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.113 2000/10/31 23:39:25 jeffs Exp $ */
+/*     $NetBSD: pmap.c,v 1.114 2000/11/24 22:41:39 chs Exp $   */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -78,7 +78,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.113 2000/10/31 23:39:25 jeffs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.114 2000/11/24 22:41:39 chs Exp $");
 
 /*
  *     Manages physical address maps.
@@ -265,12 +265,10 @@
 
        /*
         * Figure out how many PTE's are necessary to map the kernel.
-        * The '2048' comes from PAGER_MAP_SIZE in vm_pager_init().
-        * This should be kept in sync.
         * We also reserve space for kmem_alloc_pageable() for vm_fork().
         */
        Sysmapsize = (VM_PHYS_SIZE +
-               nbuf * MAXBSIZE + 16 * NCARGS) / NBPG + 2048 +
+               nbuf * MAXBSIZE + 16 * NCARGS + PAGER_MAP_SIZE) / NBPG +
                (maxproc * UPAGES) + nkmempages;
 
 #ifdef SYSVSHM
diff -r 49353aa35797 -r 3d4d5ad70d29 sys/uvm/uvm_pager.c
--- a/sys/uvm/uvm_pager.c       Fri Nov 24 22:15:09 2000 +0000
+++ b/sys/uvm/uvm_pager.c       Fri Nov 24 22:41:38 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_pager.c,v 1.33 2000/09/13 15:00:25 thorpej Exp $   */
+/*     $NetBSD: uvm_pager.c,v 1.34 2000/11/24 22:41:39 chs Exp $       */
 
 /*
  *
@@ -65,7 +65,6 @@
  * the pager map: provides KVA for I/O
  */
 
-#define PAGER_MAP_SIZE       (4 * 1024 * 1024)
 vm_map_t pager_map;            /* XXX */
 simple_lock_data_t pager_map_wanted_lock;
 boolean_t pager_map_wanted;    /* locked by pager map */
diff -r 49353aa35797 -r 3d4d5ad70d29 sys/uvm/uvm_pager.h
--- a/sys/uvm/uvm_pager.h       Fri Nov 24 22:15:09 2000 +0000
+++ b/sys/uvm/uvm_pager.h       Fri Nov 24 22:41:38 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_pager.h,v 1.17 2000/11/24 20:34:01 chs Exp $       */
+/*     $NetBSD: uvm_pager.h,v 1.18 2000/11/24 22:41:39 chs Exp $       */
 
 /*
  *
@@ -208,6 +208,14 @@
 #define VM_PAGER_UNLOCK                6
 #define VM_PAGER_REFAULT       7
 
+/*
+ * XXX
+ * this is needed until the device strategy interface
+ * is changed to do physically-addressed i/o.
+ */
+
+#define PAGER_MAP_SIZE       (16 * 1024 * 1024)
+
 #endif /* _KERNEL */
 
 #endif /* _UVM_UVM_PAGER_H_ */