diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2012-02-09 00:07:55 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2012-02-09 00:07:55 +0000 |
| commit | 7ef44a64ac1c7e834750e5f7d71cdcc87d816f3a (patch) | |
| tree | fa5ca5dbf7d02d2513cbfabcdcb182c8d91896b6 /usr/src/uts/common/conf | |
| parent | b46afb100080c68476a142e06d4c3a059c27b5c1 (diff) | |
| download | illumos-joyent-7ef44a64ac1c7e834750e5f7d71cdcc87d816f3a.tar.gz | |
OS-939 v.v_proc and maxusers are not scaling on larger memory systems
Diffstat (limited to 'usr/src/uts/common/conf')
| -rw-r--r-- | usr/src/uts/common/conf/param.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/usr/src/uts/common/conf/param.c b/usr/src/uts/common/conf/param.c index 41b400d64c..f00975dcef 100644 --- a/usr/src/uts/common/conf/param.c +++ b/usr/src/uts/common/conf/param.c @@ -20,6 +20,7 @@ */ /* * Copyright (c) 1983, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, Joyent, Inc. All rights reserved. */ #include <sys/types.h> @@ -564,8 +565,8 @@ char *isa_list = architecture; static pgcnt_t original_physmem = 0; #define MIN_DEFAULT_MAXUSERS 8u -#define MAX_DEFAULT_MAXUSERS 2048u -#define MAX_MAXUSERS 4096u +#define MAX_DEFAULT_MAXUSERS 10000u +#define MAX_MAXUSERS 20000u void param_preset(void) @@ -577,7 +578,7 @@ void param_calc(int platform_max_nprocs) { /* - * Default to about one "user" per megabyte, taking into + * Default to about one "user" per 8MB, taking into * account both physical and virtual constraints. * Note: 2^20 is a meg; shifting right by (20 - PAGESHIFT) * converts pages to megs without integer overflow. @@ -591,8 +592,9 @@ param_calc(int platform_max_nprocs) if (maxusers == 0) { pgcnt_t physmegs = physmem >> (20 - PAGESHIFT); pgcnt_t virtmegs = vmem_size(heap_arena, VMEM_FREE) >> 20; - maxusers = MIN(MAX(MIN(physmegs, virtmegs), - MIN_DEFAULT_MAXUSERS), MAX_DEFAULT_MAXUSERS); + maxusers = MIN(physmegs, virtmegs) >> 3; /* divide by 8 */ + maxusers = MAX(maxusers, MIN_DEFAULT_MAXUSERS); + maxusers = MIN(maxusers, MAX_DEFAULT_MAXUSERS); } if (maxusers > MAX_MAXUSERS) { maxusers = MAX_MAXUSERS; |