[src/netbsd-6]: src/sys/arch Pull up following revision(s) (requested by tsut...

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

details:   https://anonhg.NetBSD.org/src/rev/7200eda101d1
branches:  netbsd-6
changeset: 774431:7200eda101d1
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Aug 13 19:38:10 2012 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #487):
        sys/arch/sun3/include/param3.h: revision 1.55
        sys/arch/sun3/include/param3.h: revision 1.56
        sys/arch/sun2/include/param.h: revision 1.15
        sys/arch/sun3/include/param.h: revision 1.61
        sys/arch/sun3/include/param3x.h: revision 1.18
Poor sun3 (but not sun3x) has only 31MB KVM address space,
so reduce NKMEMPAGES_MAX_DEFAULT from 64MB to 16MB.
Fixes "panic: ubc_init: failed to map ubc_object" on
TME emulating 3/120 with >16MB RAM.
Should be pulled up to netbsd-6.
Poor sun2 has only 14MB KVA space so reduce NKMEMPAGES_MIN_DEFAULT and
NKMEMPAGES_MAX_DEFAULT values accordingly.
XXX: netbsd-6 GENERIC still gets "panic: pool_get: kmem-4096: page empty"
Also reduce UBC_NWINS from default 1024 to 512
to avoid possible KVA shortage, otherwise
"panic: ubc_init: failed to map ubc_object"
could still happen on netbsd-6 branch.
Should be pulled up to netbsd-6.

diffstat:

 sys/arch/sun2/include/param.h   |   6 +++---
 sys/arch/sun3/include/param.h   |   9 +--------
 sys/arch/sun3/include/param3.h  |  13 ++++++++++++-
 sys/arch/sun3/include/param3x.h |   9 ++++++++-
 4 files changed, 24 insertions(+), 13 deletions(-)

diffs (87 lines):

diff -r 28930e8b3f14 -r 7200eda101d1 sys/arch/sun2/include/param.h
--- a/sys/arch/sun2/include/param.h     Mon Aug 13 19:34:51 2012 +0000
+++ b/sys/arch/sun2/include/param.h     Mon Aug 13 19:38:10 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.14 2012/02/10 17:35:48 para Exp $  */
+/*     $NetBSD: param.h,v 1.14.2.1 2012/08/13 19:38:10 riz Exp $       */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -90,8 +90,8 @@
  * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
  * logical pages.
  */
-#define        NKMEMPAGES_MIN_DEFAULT  ((8 * 1024 * 1024) >> PAGE_SHIFT)
-#define        NKMEMPAGES_MAX_DEFAULT  ((32 * 1024 * 1024) >> PAGE_SHIFT)
+#define        NKMEMPAGES_MIN_DEFAULT  ((4 * 1024 * 1024) >> PAGE_SHIFT)
+#define        NKMEMPAGES_MAX_DEFAULT  ((8 * 1024 * 1024) >> PAGE_SHIFT)
 
 #if defined(_KERNEL) && !defined(_LOCORE)
 
diff -r 28930e8b3f14 -r 7200eda101d1 sys/arch/sun3/include/param.h
--- a/sys/arch/sun3/include/param.h     Mon Aug 13 19:34:51 2012 +0000
+++ b/sys/arch/sun3/include/param.h     Mon Aug 13 19:38:10 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param.h,v 1.60 2012/02/10 17:35:47 para Exp $  */
+/*     $NetBSD: param.h,v 1.60.2.1 2012/08/13 19:38:10 riz Exp $       */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -75,13 +75,6 @@
 
 #include <m68k/param.h>
 
-/*
- * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
- * logical pages.
- */
-#define        NKMEMPAGES_MIN_DEFAULT  ((8 * 1024 * 1024) >> PAGE_SHIFT)
-#define        NKMEMPAGES_MAX_DEFAULT  ((64 * 1024 * 1024) >> PAGE_SHIFT)
-
 #if defined(_KERNEL) && !defined(_LOCORE)
 
 #include <machine/intr.h>
diff -r 28930e8b3f14 -r 7200eda101d1 sys/arch/sun3/include/param3.h
--- a/sys/arch/sun3/include/param3.h    Mon Aug 13 19:34:51 2012 +0000
+++ b/sys/arch/sun3/include/param3.h    Mon Aug 13 19:38:10 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param3.h,v 1.54 2011/02/08 20:20:25 rmind Exp $        */
+/*     $NetBSD: param3.h,v 1.54.10.1 2012/08/13 19:38:10 riz Exp $     */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,3 +43,14 @@
 
 #define        KERNBASE3       0x0E000000      /* start of kernel virtual */
 #define        KERN_END3       0x0FE00000      /* end of kernel virtual */
+
+/*
+ * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
+ * logical pages.
+ * Note maximum value can't be so large due to limited KVA space as above.
+ */
+#define        NKMEMPAGES_MIN_DEFAULT  ((8 * 1024 * 1024) >> PAGE_SHIFT)
+#define        NKMEMPAGES_MAX_DEFAULT  ((16 * 1024 * 1024) >> PAGE_SHIFT)
+
+/* Use smaller UBC_NWINS to avoid KVA space shortage. */
+#define        UBC_NWINS       512
diff -r 28930e8b3f14 -r 7200eda101d1 sys/arch/sun3/include/param3x.h
--- a/sys/arch/sun3/include/param3x.h   Mon Aug 13 19:34:51 2012 +0000
+++ b/sys/arch/sun3/include/param3x.h   Mon Aug 13 19:38:10 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: param3x.h,v 1.17 2011/02/08 20:20:25 rmind Exp $       */
+/*     $NetBSD: param3x.h,v 1.17.10.1 2012/08/13 19:38:10 riz Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -43,3 +43,10 @@
 
 #define        KERNBASE3X      0xF8000000      /* start of kernel virtual */
 #define        KERN_END3X      0xFE000000      /* end of kernel virtual */
+
+/*
+ * Minimum and maximum sizes of the kernel malloc arena in PAGE_SIZE-sized
+ * logical pages.
+ */
+#define        NKMEMPAGES_MIN_DEFAULT  ((8 * 1024 * 1024) >> PAGE_SHIFT)
+#define        NKMEMPAGES_MAX_DEFAULT  ((64 * 1024 * 1024) >> PAGE_SHIFT)