From: claudio Date: Fri, 14 Sep 2018 13:58:20 +0000 (+0000) Subject: Unify and bump some of the NMBCLUSTERS defines. Some archs had it set to X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=965127f80578c0400be53e4188190c636e97095a;p=openbsd 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 ee57f83f50c..3e261d0e6d0 100644 --- 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 d61eaf6a9ac..ed06b9e5a88 100644 --- 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 e64007d2ee7..06eefdee8ec 100644 --- 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 346b5bf7f9c..c53885bb7c4 100644 --- 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 877025d9cc2..c940a9ce5b6 100644 --- 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 19363ad1643..b789d9c0007 100644 --- 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 e185228aa81..1ba71bd0037 100644 --- 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 18e4fb3e714..90832ee2499 100644 --- 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 3380fb2fd2f..545fb43551b 100644 --- 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)