Unify and bump some of the NMBCLUSTERS defines. Some archs had it set to

4MB which is far too low especially when the platform is able to run MP.
New limits are, amd64 = 256M; arm64, mips64, sparc64 = 64M; alpha, arm,
hppa, i386, powerpc = 32M; m88k, sh = 8M
Still rather conservative numbers but much better than before. At least
some hangs of arm64 build boxes was caused by this.
OK kettenis@, visa@

diff --git a/sys/arch/alpha/include/param.h b/sys/arch/alpha/include/param.h
index ee57f83..3e261d0 100644 (file)
--- a/sys/arch/alpha/include/param.h
+++ b/sys/arch/alpha/include/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.41 2017/06/05 17:49:06 deraadt Exp $ */
+/* $OpenBSD: param.h,v 1.42 2018/09/14 13:58:20 claudio Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -65,7 +65,7 @@
 #define        USPACE          (UPAGES * PAGE_SIZE)    /* total size of u-area */
 #define        USPACE_ALIGN    0                       /* u-area alignment 0-none */
 
-#define        NMBCLUSTERS     (16 * 1024)             /* max cluster allocation */
+#define        NMBCLUSTERS     (32 * 1024)             /* max cluster allocation */
 
 #ifndef        MSGBUFSIZE
 #define        MSGBUFSIZE      (2 * PAGE_SIZE)         /* default message buffer size */

diff --git a/sys/arch/arm/include/param.h b/sys/arch/arm/include/param.h
index d61eaf6..ed06b9e 100644 (file)
--- a/sys/arch/arm/include/param.h
+++ b/sys/arch/arm/include/param.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: param.h,v 1.23 2016/09/03 14:25:27 bluhm Exp $        */
+/*     $OpenBSD: param.h,v 1.24 2018/09/14 13:58:20 claudio Exp $      */
 
 /*
  * Copyright (c) 1994,1995 Mark Brinicombe.
@@ -55,7 +55,7 @@
 #define        USPACE          (UPAGES * PAGE_SIZE)    /* total size of u-area */
 #define        USPACE_ALIGN    0                       /* u-area alignment 0-none */
 
-#define        NMBCLUSTERS     (16 * 1024)             /* max cluster allocation */
+#define        NMBCLUSTERS     (32 * 1024)             /* max cluster allocation */
 
 /*
  * Maximum size of the kernel malloc arena in PAGE_SIZE-sized

diff --git a/sys/arch/arm64/include/param.h b/sys/arch/arm64/include/param.h
index e64007d..06eefde 100644 (file)
--- a/sys/arch/arm64/include/param.h
+++ b/sys/arch/arm64/include/param.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: param.h,v 1.5 2018/09/08 20:12:54 claudio Exp $       */
+/*     $OpenBSD: param.h,v 1.6 2018/09/14 13:58:20 claudio Exp $       */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -63,7 +63,7 @@
 #define        USPACE          (UPAGES * PAGE_SIZE)    /* total size of u-area */
 #define        USPACE_ALIGN    0                       /* u-area alignment 0-none */
 
-#define        NMBCLUSTERS     (256 * 1024)            /* max cluster allocation */
+#define        NMBCLUSTERS     (64 * 1024)             /* max cluster allocation */
 
 #ifndef        MSGBUFSIZE
 #define        MSGBUFSIZE      (16 * PAGE_SIZE)        /* default message buffer size */

diff --git a/sys/arch/hppa/include/param.h b/sys/arch/hppa/include/param.h
index 346b5bf..c53885b 100644 (file)
--- a/sys/arch/hppa/include/param.h
+++ b/sys/arch/hppa/include/param.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: param.h,v 1.46 2016/09/03 14:25:27 bluhm Exp $        */
+/*     $OpenBSD: param.h,v 1.47 2018/09/14 13:58:20 claudio Exp $      */
 
 /*
  * Copyright (c) 1988-1994, The University of Utah and
@@ -51,7 +51,7 @@
 #define        USPACE          (UPAGES * PAGE_SIZE)    /* total size of u-area */
 #define        USPACE_ALIGN    0                       /* u-area alignment 0-none */
 
-#define        NMBCLUSTERS     (4 * 1024)              /* max cluster allocation */
+#define        NMBCLUSTERS     (32 * 1024)             /* max cluster allocation */
 
 #ifndef        MSGBUFSIZE
 #define        MSGBUFSIZE      (2 * PAGE_SIZE)         /* default message buffer size */

diff --git a/sys/arch/m88k/include/param.h b/sys/arch/m88k/include/param.h
index 877025d..c940a9c 100644 (file)
--- a/sys/arch/m88k/include/param.h
+++ b/sys/arch/m88k/include/param.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: param.h,v 1.20 2016/09/03 14:25:27 bluhm Exp $ */
+/*     $OpenBSD: param.h,v 1.21 2018/09/14 13:58:20 claudio Exp $ */
 
 /*
  * Copyright (c) 1999 Steve Murphree, Jr.
@@ -64,7 +64,7 @@
 #define        USPACE          (UPAGES * PAGE_SIZE)    /* total size of u-area */
 #define        USPACE_ALIGN    0                       /* u-area alignment 0-none */
 
-#define        NMBCLUSTERS     (4 * 1024)              /* max cluster allocation */
+#define        NMBCLUSTERS     (8 * 1024)              /* max cluster allocation */
 
 #ifndef MSGBUFSIZE
 #define        MSGBUFSIZE      PAGE_SIZE

diff --git a/sys/arch/mips64/include/param.h b/sys/arch/mips64/include/param.h
index 19363ad..b789d9c 100644 (file)
--- a/sys/arch/mips64/include/param.h
+++ b/sys/arch/mips64/include/param.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: param.h,v 1.35 2016/09/03 14:25:27 bluhm Exp $ */
+/*      $OpenBSD: param.h,v 1.36 2018/09/14 13:58:20 claudio Exp $ */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -62,7 +62,7 @@
 #define        USPACE_ALIGN    (2 * PAGE_SIZE) /* align to an even TLB boundary */
 #endif
 
-#define        NMBCLUSTERS     (8 * 1024)              /* max cluster allocation */
+#define        NMBCLUSTERS     (64 * 1024)             /* max cluster allocation */
 
 #ifndef MSGBUFSIZE
 #if PAGE_SHIFT > 12

diff --git a/sys/arch/powerpc/include/param.h b/sys/arch/powerpc/include/param.h
index e185228..1ba71bd 100644 (file)
--- a/sys/arch/powerpc/include/param.h
+++ b/sys/arch/powerpc/include/param.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: param.h,v 1.37 2016/09/03 14:25:27 bluhm Exp $        */
+/*     $OpenBSD: param.h,v 1.38 2018/09/14 13:58:20 claudio Exp $      */
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -58,7 +58,7 @@
 #define        USPACE          (UPAGES * PAGE_SIZE)    /* total size of u-area */
 #define        USPACE_ALIGN    0                       /* u-area alignment 0-none */
 
-#define        NMBCLUSTERS     (4 * 1024)              /* max cluster allocation */
+#define        NMBCLUSTERS     (32 * 1024)             /* max cluster allocation */
 
 /*
  * Maximum size of the kernel malloc arena in PAGE_SIZE-sized

diff --git a/sys/arch/sh/include/param.h b/sys/arch/sh/include/param.h
index 18e4fb3..90832ee 100644 (file)
--- a/sys/arch/sh/include/param.h
+++ b/sys/arch/sh/include/param.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: param.h,v 1.12 2016/09/03 14:25:27 bluhm Exp $        */
+/*     $OpenBSD: param.h,v 1.13 2018/09/14 13:58:20 claudio Exp $      */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -80,7 +80,7 @@
 
 #ifdef _KERNEL
 
-#define        NMBCLUSTERS     (4 * 1024)              /* max cluster allocation */
+#define        NMBCLUSTERS     (8 * 1024)              /* max cluster allocation */
 
 #ifndef MSGBUFSIZE
 #define        MSGBUFSIZE      PAGE_SIZE               /* default message buffer size */

diff --git a/sys/arch/sparc64/include/param.h b/sys/arch/sparc64/include/param.h
index 3380fb2..545fb43 100644 (file)
--- a/sys/arch/sparc64/include/param.h
+++ b/sys/arch/sparc64/include/param.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: param.h,v 1.40 2016/09/03 14:25:27 bluhm Exp $        */
+/*     $OpenBSD: param.h,v 1.41 2018/09/14 13:58:20 claudio Exp $      */
 
 /*
  * Copyright (c) 1992, 1993
@@ -135,7 +135,7 @@
 #define        USPACE          (UPAGES * PAGE_SIZE)    /* total size of u-area */
 #define        USPACE_ALIGN    0                       /* u-area alignment 0-none */
 
-#define        NMBCLUSTERS     (16 * 1024)             /* max cluster allocation */
+#define        NMBCLUSTERS     (64 * 1024)             /* max cluster allocation */
 
 #ifndef        MSGBUFSIZE
 #define        MSGBUFSIZE      (1 * PAGE_SIZE)