Module Name: src
Committed By: christos
Date: Tue Jan 28 17:46:01 UTC 2014
Modified Files:
src/sys/arch/i386/include: vmparam.h
Log Message:
only limit bottom-up allocations, put back 3G limit on datasize.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/i386/include/vmparam.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/i386/include/vmparam.h
diff -u src/sys/arch/i386/include/vmparam.h:1.78 src/sys/arch/i386/include/vmparam.h:1.79
--- src/sys/arch/i386/include/vmparam.h:1.78 Mon Jan 27 21:51:34 2014
+++ src/sys/arch/i386/include/vmparam.h Tue Jan 28 12:46:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.78 2014/01/28 02:51:34 christos Exp $ */
+/* $NetBSD: vmparam.h,v 1.79 2014/01/28 17:46:01 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -68,8 +68,12 @@
#define DFLDSIZ (256*1024*1024) /* initial data size limit */
#endif
#ifndef MAXDSIZ
-#define MAXDSIZ (2U*1024*1024*1024 + \
- 1U* 512*1024*1024) /* 2.5G max data size */
+#define MAXDSIZ (3U*1024*1024*1024) /* 3G max data size */
+#endif
+#ifndef MAXDSIZ_BU
+#define MAXDSIZ_BU (2U*1024*1024*1024 + /* 2.5G max data size for */ \
+ 1U* 512*1024*1024) /* bottom-up allocation */ \
+ /* could be a bit more */
#endif
#ifndef DFLSSIZ
#define DFLSSIZ (2*1024*1024) /* initial stack size limit */
@@ -114,7 +118,7 @@
#define VM_DEFAULT_ADDRESS_TOPDOWN(da, sz) \
trunc_page(USRSTACK - MAXSSIZ - (sz))
#define VM_DEFAULT_ADDRESS_BOTTOMUP(da, sz) \
- round_page((vaddr_t)(da) + (vsize_t)maxdmap)
+ round_page((vaddr_t)(da) + (vsize_t)MIN(maxdmap, MAXDSIZ_BU))
/* XXX max. amount of KVM to be used by buffers. */
#ifndef VM_MAX_KERNEL_BUF
