Module Name: src
Committed By: riz
Date: Mon Aug 13 19:38:11 UTC 2012
Modified Files:
src/sys/arch/sun2/include [netbsd-6]: param.h
src/sys/arch/sun3/include [netbsd-6]: param.h param3.h param3x.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/arch/sun2/include/param.h
cvs rdiff -u -r1.60 -r1.60.2.1 src/sys/arch/sun3/include/param.h
cvs rdiff -u -r1.54 -r1.54.10.1 src/sys/arch/sun3/include/param3.h
cvs rdiff -u -r1.17 -r1.17.10.1 src/sys/arch/sun3/include/param3x.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sun2/include/param.h
diff -u src/sys/arch/sun2/include/param.h:1.14 src/sys/arch/sun2/include/param.h:1.14.2.1
--- src/sys/arch/sun2/include/param.h:1.14 Fri Feb 10 17:35:48 2012
+++ src/sys/arch/sun2/include/param.h Mon Aug 13 19:38:10 2012
@@ -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)
Index: src/sys/arch/sun3/include/param.h
diff -u src/sys/arch/sun3/include/param.h:1.60 src/sys/arch/sun3/include/param.h:1.60.2.1
--- src/sys/arch/sun3/include/param.h:1.60 Fri Feb 10 17:35:47 2012
+++ src/sys/arch/sun3/include/param.h Mon Aug 13 19:38:10 2012
@@ -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>
Index: src/sys/arch/sun3/include/param3.h
diff -u src/sys/arch/sun3/include/param3.h:1.54 src/sys/arch/sun3/include/param3.h:1.54.10.1
--- src/sys/arch/sun3/include/param3.h:1.54 Tue Feb 8 20:20:25 2011
+++ src/sys/arch/sun3/include/param3.h Mon Aug 13 19:38:10 2012
@@ -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
Index: src/sys/arch/sun3/include/param3x.h
diff -u src/sys/arch/sun3/include/param3x.h:1.17 src/sys/arch/sun3/include/param3x.h:1.17.10.1
--- src/sys/arch/sun3/include/param3x.h:1.17 Tue Feb 8 20:20:25 2011
+++ src/sys/arch/sun3/include/param3x.h Mon Aug 13 19:38:10 2012
@@ -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)
