diff options
author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2016-09-03 14:25:28 +0000 |
---|---|---|
committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2016-09-03 14:25:28 +0000 |
commit | 370eb237215cb13bc1125ff54689720ce018e098 (patch) | |
tree | e7abfb850f7773d53f38d571eaf5d8d8369ae2dc | |
parent | a70783600a28e32438b87802494d59ad22051fab (diff) |
Increase the number of mbufs on most architectures. This is based
on a guess how much memory a typical machine has. If the value is
too high, users may run out of kernel memory. Then we will have
to adjust this again.
OK claudio@ deraadt@
-rw-r--r-- | sys/arch/alpha/include/param.h | 4 | ||||
-rw-r--r-- | sys/arch/amd64/include/param.h | 4 | ||||
-rw-r--r-- | sys/arch/arm/include/param.h | 4 | ||||
-rw-r--r-- | sys/arch/hppa/include/param.h | 4 | ||||
-rw-r--r-- | sys/arch/i386/include/param.h | 4 | ||||
-rw-r--r-- | sys/arch/m88k/include/param.h | 4 | ||||
-rw-r--r-- | sys/arch/mips64/include/param.h | 4 | ||||
-rw-r--r-- | sys/arch/powerpc/include/param.h | 4 | ||||
-rw-r--r-- | sys/arch/sh/include/param.h | 4 | ||||
-rw-r--r-- | sys/arch/sparc64/include/param.h | 4 |
10 files changed, 20 insertions, 20 deletions
diff --git a/sys/arch/alpha/include/param.h b/sys/arch/alpha/include/param.h index 83e2b2076da..07f02070545 100644 --- a/sys/arch/alpha/include/param.h +++ b/sys/arch/alpha/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.39 2013/03/26 05:04:08 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.40 2016/09/03 14:25:27 bluhm Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -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 4096 /* map size, max cluster allocation */ +#define NMBCLUSTERS (16 * 1024) /* max cluster allocation */ #ifndef MSGBUFSIZE #define MSGBUFSIZE (2 * PAGE_SIZE) /* default message buffer size */ diff --git a/sys/arch/amd64/include/param.h b/sys/arch/amd64/include/param.h index 29c314fdeee..33dab97093c 100644 --- a/sys/arch/amd64/include/param.h +++ b/sys/arch/amd64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.22 2013/03/26 05:04:10 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.23 2016/09/03 14:25:27 bluhm Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -72,7 +72,7 @@ #define USPACE (UPAGES * PAGE_SIZE) /* total size of u-area */ #define USPACE_ALIGN 0 /* u-area alignment 0-none */ -#define NMBCLUSTERS 6144 /* map size, max cluster allocation */ +#define NMBCLUSTERS (256 * 1024) /* max cluster allocation */ #ifndef MSGBUFSIZE #define MSGBUFSIZE (16 * PAGE_SIZE) /* default message buffer size */ diff --git a/sys/arch/arm/include/param.h b/sys/arch/arm/include/param.h index de0e3864fa3..d61eaf6a9ac 100644 --- a/sys/arch/arm/include/param.h +++ b/sys/arch/arm/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.22 2016/08/20 19:31:01 kettenis Exp $ */ +/* $OpenBSD: param.h,v 1.23 2016/09/03 14:25:27 bluhm 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 4096 /* map size, max cluster allocation */ +#define NMBCLUSTERS (16 * 1024) /* max cluster allocation */ /* * Maximum size of the kernel malloc arena in PAGE_SIZE-sized diff --git a/sys/arch/hppa/include/param.h b/sys/arch/hppa/include/param.h index 8c7d774d3f7..346b5bf7f9c 100644 --- a/sys/arch/hppa/include/param.h +++ b/sys/arch/hppa/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.45 2013/03/26 05:04:10 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.46 2016/09/03 14:25:27 bluhm 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 4096 /* map size, max cluster allocation */ +#define NMBCLUSTERS (4 * 1024) /* max cluster allocation */ #ifndef MSGBUFSIZE #define MSGBUFSIZE (2 * PAGE_SIZE) /* default message buffer size */ diff --git a/sys/arch/i386/include/param.h b/sys/arch/i386/include/param.h index 986016b6b30..af33da94a4c 100644 --- a/sys/arch/i386/include/param.h +++ b/sys/arch/i386/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.47 2013/03/26 05:04:10 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.48 2016/09/03 14:25:27 bluhm Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -67,7 +67,7 @@ #define USPACE (UPAGES * PAGE_SIZE) /* total size of u-area */ #define USPACE_ALIGN 0 /* u-area alignment 0-none */ -#define NMBCLUSTERS 6144 /* map size, max cluster allocation */ +#define NMBCLUSTERS (32 * 1024) /* max cluster allocation */ #ifndef MSGBUFSIZE #define MSGBUFSIZE (4 * PAGE_SIZE) /* default message buffer size */ diff --git a/sys/arch/m88k/include/param.h b/sys/arch/m88k/include/param.h index 3b910ade707..877025d9cc2 100644 --- a/sys/arch/m88k/include/param.h +++ b/sys/arch/m88k/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.19 2013/04/01 12:52:24 miod Exp $ */ +/* $OpenBSD: param.h,v 1.20 2016/09/03 14:25:27 bluhm 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 4096 /* map size, max cluster allocation */ +#define NMBCLUSTERS (4 * 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 d57eb466e03..19363ad1643 100644 --- a/sys/arch/mips64/include/param.h +++ b/sys/arch/mips64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.34 2015/11/02 20:13:45 miod Exp $ */ +/* $OpenBSD: param.h,v 1.35 2016/09/03 14:25:27 bluhm 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 4096 /* map size, max cluster allocation */ +#define NMBCLUSTERS (8 * 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 1d2e589fcb7..e185228aa81 100644 --- a/sys/arch/powerpc/include/param.h +++ b/sys/arch/powerpc/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.36 2013/06/13 11:29:20 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.37 2016/09/03 14:25:27 bluhm 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 4096 /* map size, max cluster allocation */ +#define NMBCLUSTERS (4 * 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 6a2798e652b..18e4fb3e714 100644 --- a/sys/arch/sh/include/param.h +++ b/sys/arch/sh/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.11 2013/03/26 05:04:10 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.12 2016/09/03 14:25:27 bluhm Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved. @@ -80,7 +80,7 @@ #ifdef _KERNEL -#define NMBCLUSTERS 4096 /* map size, max cluster allocation */ +#define NMBCLUSTERS (4 * 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 d90139c3fd3..3380fb2fd2f 100644 --- a/sys/arch/sparc64/include/param.h +++ b/sys/arch/sparc64/include/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.39 2013/03/26 05:04:10 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.40 2016/09/03 14:25:27 bluhm 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 4096 /* map size, max cluster allocation */ +#define NMBCLUSTERS (16 * 1024) /* max cluster allocation */ #ifndef MSGBUFSIZE #define MSGBUFSIZE (1 * PAGE_SIZE) |